diff --git a/Source/cmDebugServer.cxx b/Source/cmDebugServer.cxx
index 98a53b674d8..9e168f73298 100644
--- a/Source/cmDebugServer.cxx
+++ b/Source/cmDebugServer.cxx
@@ -1,7 +1,5 @@
-//
-// Created by justin on 2/3/17.
-//
-
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmDebugServer.h"
 #include "cmDebugServerConsole.h"
 #include "cmMakefile.h"
diff --git a/Source/cmDebugServer.h b/Source/cmDebugServer.h
index af82a2f64c9..1a3ebae2608 100644
--- a/Source/cmDebugServer.h
+++ b/Source/cmDebugServer.h
@@ -1,7 +1,5 @@
-//
-// Created by justin on 2/3/17.
-//
-
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+file Copyright.txt or https://cmake.org/licensing for details.  */
 #pragma once
 
 #include "cmDebugger.h"
diff --git a/Source/cmDebugServerConsole.cxx b/Source/cmDebugServerConsole.cxx
index e6a937687e6..ce6432adafe 100644
--- a/Source/cmDebugServerConsole.cxx
+++ b/Source/cmDebugServerConsole.cxx
@@ -1,7 +1,5 @@
-//
-// Created by J on 1/29/2017.
-//
-
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmDebugServerConsole.h"
 #include "cmConnection.h"
 #include "cmMakefile.h"
diff --git a/Source/cmDebugServerConsole.h b/Source/cmDebugServerConsole.h
index a95e7cb8fe5..711194d2a4f 100644
--- a/Source/cmDebugServerConsole.h
+++ b/Source/cmDebugServerConsole.h
@@ -1,3 +1,5 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+file Copyright.txt or https://cmake.org/licensing for details.  */
 #ifndef CMAKE_CMDEBUGSERVERSIMPLE_H
 #define CMAKE_CMDEBUGSERVERSIMPLE_H
 
diff --git a/Source/cmDebugServerJson.cxx b/Source/cmDebugServerJson.cxx
index 0c13d43578a..27bd63ffc80 100644
--- a/Source/cmDebugServerJson.cxx
+++ b/Source/cmDebugServerJson.cxx
@@ -1,7 +1,11 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmDebugServerJson.h"
 #include "cmMakefile.h"
 #include <cmyajl/include/yajl/yajl_parse.h>
-#include <zconf.h>
+#include "cmsys/SystemInformation.hxx"
+
+static cmsys::SystemInformation info;
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include "cm_jsoncpp_reader.h"
@@ -173,7 +177,9 @@ void cmDebugServerJson::SendStateUpdate(cmConnection* connection)
 
   std::string state = "";
   Json::Value value;
-  value["PID"] = ::getpid();
+
+  value["PID"] = info.GetProcessId();
+
   switch (Debugger.CurrentState()) {
     case cmDebugger::State::Running:
       value["State"] = "Running";
diff --git a/Source/cmDebugServerJson.h b/Source/cmDebugServerJson.h
index ab575f10f94..57d77ff8e77 100644
--- a/Source/cmDebugServerJson.h
+++ b/Source/cmDebugServerJson.h
@@ -1,3 +1,5 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+file Copyright.txt or https://cmake.org/licensing for details.  */
 #pragma once
 
 #include "cmDebugServer.h"
diff --git a/Source/cmDebugger.cxx b/Source/cmDebugger.cxx
index e0a8191f512..26d231a07d7 100644
--- a/Source/cmDebugger.cxx
+++ b/Source/cmDebugger.cxx
@@ -1,7 +1,5 @@
-//
-// Created by J on 1/28/2017.
-//
-
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmDebugger.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"