diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
index d9d34dfe..d624d87c 100644
--- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
+++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
@@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 
 #include "plAgeLoader/plAgeLoader.h"
-#include "plNetClient/plNetObjectDebugger.h"
+#include "plNetCommon/plNetObjectDebugger.h"
 #include "plNetClient/plNetClientMgr.h"
 #include "plNetClient/plNetLinkingMgr.h"
 #include "plAgeLoader/plResPatcher.h"
diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp
index ba65e3a0..c6af1fc2 100644
--- a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp
+++ b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp
@@ -46,10 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnSceneObject/plSceneObject.h"
 #include "pnMessage/plSDLModifierMsg.h"
 
+#include "plNetCommon/plNetObjectDebugger.h"
 #include "plNetMessage/plNetMessage.h"
 #include "plSDL/plSDL.h"
-#include "plNetClient/plNetClientMgr.h"
-#include "plNetClient/plNetObjectDebugger.h"
 
 plSDLModifier::plSDLModifier() : fStateCache(nil), fSentOrRecvdState(false)
 {
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt
index e7904cc0..78b8cb60 100644
--- a/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt
@@ -19,7 +19,6 @@ set(plNetClient_SOURCES
     plNetClientMsgHandler.cpp
     plNetClientMsgScreener.cpp
     plNetLinkingMgr.cpp
-    plNetObjectDebugger.cpp
     plNetVoiceList.cpp
 )
 
@@ -33,7 +32,6 @@ set(plNetClient_HEADERS
     plNetClientMsgHandler.h
     plNetClientMsgScreener.h
     plNetLinkingMgr.h
-    plNetObjectDebugger.h
     plNetVoiceList.h
 )
 
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
index 486d2021..a0eee4e9 100644
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
@@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetCliAgeJoiner.h"
 #include "plNetClientMgr.h"
 #include "plNetLinkingMgr.h"
-#include "plNetObjectDebugger.h"
+#include "plNetCommon/plNetObjectDebugger.h"
 
 #include "pnSceneObject/plSceneObject.h"
 #include "pnSceneObject/plCoordinateInterface.h"
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
index 388ceebb..63509817 100644
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
@@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPhysical.h"
 #include "plNetClientMsgHandler.h"
 #include "plNetLinkingMgr.h"
-#include "plNetObjectDebugger.h"
+#include "plNetCommon/plNetObjectDebugger.h"
 
 #include "pnUtils/pnUtils.h"
 #include "plProduct.h"
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
index e81b1e48..2ff72f57 100644
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsResMgr.h"
 #include "plNetClientMgr.h"
 #include "plCreatableIndex.h"   
-#include "plNetObjectDebugger.h"
+#include "plNetCommon/plNetObjectDebugger.h"
 
 #include "pnNetCommon/plSynchedObject.h"
 #include "pnNetCommon/plSDLTypes.h"
diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt
index 4d561c3d..44d3eaba 100644
--- a/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt
@@ -10,6 +10,7 @@ set(plNetCommon_SOURCES
     plNetCommonHelpers.cpp
     plNetMember.cpp
     plNetMsgScreener.cpp
+    plNetObjectDebugger.cpp
     plNetServerSessionInfo.cpp
     plSpawnPointInfo.cpp
 )
@@ -23,6 +24,7 @@ set(plNetCommon_HEADERS
     plNetMember.h
     plNetMsgHandler.h
     plNetMsgScreener.h
+    plNetObjectDebugger.h
     plNetServerSessionInfo.h
     plSpawnPointInfo.h
 )
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.cpp
similarity index 97%
rename from Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp
rename to Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.cpp
index 0231cc54..5f0a1582 100644
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.cpp
@@ -51,10 +51,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetClient/plNetClientMgr.h"
 #include "plAgeLoader/plAgeLoader.h"
 
-plNetObjectDebugger::DebugObject::DebugObject(const char* objName, plLocation& loc, uint32_t flags) : 
-fLoc(loc), 
+plNetObjectDebugger::DebugObject::DebugObject(const char* objName, plLocation& loc, uint32_t flags) :
+fLoc(loc),
 fFlags(flags)
-{ 
+{
     std::string tmp = objName;
     hsStrLower((char*)tmp.c_str());
     fObjName = tmp;
@@ -102,7 +102,7 @@ bool plNetObjectDebugger::DebugObject::StringMatches(const char* str) const
 // if both objName and pageName are provided, and this object has page info,
 //      return true if object matches both string and location.
 // else just return true if object matches string
-// 
+//
 bool plNetObjectDebugger::DebugObject::ObjectMatches(const char* objName, const char* pageName)
 {
     if (!objName)
@@ -143,9 +143,9 @@ plNetObjectDebugger::plNetObjectDebugger() : fStatusLog(nil), fDebugging(false)
 {
 }
 
-plNetObjectDebugger::~plNetObjectDebugger() 
-{ 
-    ClearAllDebugObjects(); 
+plNetObjectDebugger::~plNetObjectDebugger()
+{
+    ClearAllDebugObjects();
     delete fStatusLog;
 }
 
@@ -155,8 +155,8 @@ plNetObjectDebugger::~plNetObjectDebugger()
 plNetObjectDebugger* plNetObjectDebugger::GetInstance()
 {
     static plNetObjectDebugger gNetObjectDebugger;
-    
-    if (plNetObjectDebuggerBase::GetInstance()==nil)
+
+    if (plNetObjectDebuggerBase::GetInstance() == nullptr)
         plNetObjectDebuggerBase::SetInstance(&gNetObjectDebugger);
 
     return &gNetObjectDebugger;
@@ -169,7 +169,7 @@ void plNetObjectDebugger::ICreateStatusLog() const
 {
     if (!fStatusLog)
     {
-        fStatusLog = plStatusLogMgr::GetInstance().CreateStatusLog(40, "NetObject.log", 
+        fStatusLog = plStatusLogMgr::GetInstance().CreateStatusLog(40, "NetObject.log",
             plStatusLog::kFilledBackground | plStatusLog::kAlignToTop | plStatusLog::kTimestamp );
     }
 }
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.h
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h
rename to Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.h
diff --git a/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp b/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp
index 1eebd9ee..2d59262b 100644
--- a/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp
+++ b/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp
@@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plClientUnifiedTime.h"
 
 #if 0
-#include "plNetClient/plNetObjectDebugger.h"
+#include "plNetCommon/plNetObjectDebugger.h"
 #include "plNetClient/plNetClientMgr.h"
 #endif