diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/CMakeLists.txt
index e5916895..38036bf0 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/CMakeLists.txt
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/CMakeLists.txt
@@ -29,6 +29,6 @@ add_subdirectory(pnProduct)
 add_subdirectory(pnSceneObject)
 add_subdirectory(pnSimpleNet)
 #add_subdirectory(pnSqlLib)             # Not being used in any current sln
-#add_subdirectory(pnTimer)
-#add_subdirectory(pnUtils)
-#add_subdirectory(pnUtilsExe)
+add_subdirectory(pnTimer)
+add_subdirectory(pnUtils)
+add_subdirectory(pnUtilsExe)
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt
new file mode 100644
index 00000000..cdd84c0b
--- /dev/null
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt
@@ -0,0 +1,23 @@
+include_directories("../../CoreLib")
+include_directories("../../NucleusLib")
+include_directories("../../NucleusLib/inc")
+
+set(pnTimer_HEADERS
+	plTimedValue.h
+	plTimerCallbackManager.h
+	pnBuildDates.h
+	pnTimerCreatable.h
+)
+
+set(pnTimer_SOURCES
+	hsTimer.cpp
+	plTimedValue.cpp
+	plTimerCallbackManager.cpp
+	pnBranchDate.cpp
+	pnBuildDates.cpp
+)
+
+add_library(pnTimer STATIC ${pnTimer_HEADERS} ${pnTimer_SOURCES})
+
+source_group("Header Files" FILES ${pnTimer_HEADERS})
+source_group("Source Files" FILES ${pnTimer_SOURCES})
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp
index 3b877cd6..8e40e4aa 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp
@@ -26,9 +26,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTypes.h"
 #include "plTimerCallbackManager.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
 #include "plgDispatch.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
 #include "hsTimer.h"
 
 plTimerCallbackManager::plTimerCallbackManager() 
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h
index 7a3e1929..18e67f3a 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h
@@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plTimerCallbackManager_Defined
 
 #include "hsScalar.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 #include "hsTemplates.h"
 
 class plMessage;
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp
index 4f57425b..93cd8907 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp
@@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //////////////////////////////////////////////////////////////////////////////
 
 #include "hsWindows.h"
-#include "../pnTimer/pnBuildDates.h"
+#include "pnTimer/pnBuildDates.h"
 
 char	pnBuildDates::fBuildDate[ 128 ] = __DATE__;
 char	pnBuildDates::fBuildTime[ 128 ] = __TIME__;
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h
index dfdc3af4..05ac6586 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h
@@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pnTimerCreatable_inc
 #define pnTimerCreatable_inc
 
-#include "../pnFactory/plCreator.h"
+#include "pnFactory/plCreator.h"
 
 
 #include "plTimerCallbackManager.h"
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
new file mode 100644
index 00000000..18186675
--- /dev/null
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
@@ -0,0 +1,93 @@
+include_directories("../../CoreLib")
+include_directories("../../NucleusLib")
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+set(pnUtils_HEADERS
+	Intern.h
+	Pch.h
+	pnUtils.h
+)
+
+set(pnUtils_PRIVATE
+	Private/pnUtAddr.h
+	Private/pnUtAddr.cpp
+	Private/pnUtAllIncludes.h
+	Private/pnUtArray.h
+	Private/pnUtArray.cpp
+	Private/pnUtBase64.h
+	Private/pnUtBase64.cpp
+	Private/pnUtBigNum.h
+	Private/pnUtBigNum.cpp
+	Private/pnUtCmd.h
+	Private/pnUtCmd.cpp
+	Private/pnUtCoreLib.h
+	Private/pnUtCrypt.h
+	Private/pnUtCrypt.cpp
+	Private/pnUtEndian.h
+	Private/pnUtEndian.cpp
+	Private/pnUtHash.h
+	Private/pnUtHash.cpp
+	Private/pnUtList.h
+	Private/pnUtList.cpp
+	Private/pnUtMath.h
+	Private/pnUtMath.cpp
+	Private/pnUtMisc.h
+	Private/pnUtMisc.cpp
+	Private/pnUtPath.h
+	Private/pnUtPath.cpp
+	Private/pnUtPragma.h
+	Private/pnUtPriQ.h
+	Private/pnUtRand.h
+	Private/pnUtRand.cpp
+	Private/pnUtRef.h
+	Private/pnUtSkipList.h
+	Private/pnUtSort.h
+	Private/pnUtSpareList.h
+	Private/pnUtSpareList.cpp
+	Private/pnUtStr.h
+	Private/pnUtStr.cpp
+	Private/pnUtSubst.h
+	Private/pnUtSubst.cpp
+	Private/pnUtSync.h
+	Private/pnUtTime.h
+	Private/pnUtTime.cpp
+	Private/pnUtTls.h
+	Private/pnUtTls.cpp
+	Private/pnUtUuid.h
+	Private/pnUtUuid.cpp
+)
+
+set(pnUtils_SOURCES
+	pnUtils.cpp
+)
+
+if(WIN32)
+	set(pnUtils_WIN32
+		Private/Win32/pnUtW32Addr.cpp
+		Private/Win32/pnUtW32Misc.cpp
+		Private/Win32/pnUtW32Path.cpp
+		Private/Win32/pnUtW32Str.cpp
+		Private/Win32/pnUtW32Sync.cpp
+		Private/Win32/pnUtW32Time.cpp
+		Private/Win32/pnUtW32Uuid.cpp
+	)
+else()
+	set(pnUtils_UNIX
+		Private/Unix/pnUteUxStr.cpp
+		Private/Unix/pnUteUxSync.cpp
+		Private/Unix/pnUteUxUuid.cpp
+	)
+endif()
+
+add_library(pnUtils STATIC ${pnUtils_HEADERS} ${pnUtils_PRIVATE} ${pnUtils_SOURCES}
+                           ${pnUtils_UNIX} ${pnUtils_WIN32})
+
+source_group("Header Files" FILES ${pnUtils_HEADERS})
+source_group("Source Files" FILES ${pnUtils_SOURCES})
+source_group("Private" FILES ${pnUtils_PRIVATE})
+if(WIN32)
+	source_group("Private\\Win32" FILES ${pnUtils_WIN32})
+else()
+	source_group("Private\\Unix" FILES ${pnUtils_UNIX})
+endif()
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp
index aa189b77..81265288 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp
@@ -32,13 +32,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../Pch.h"
 #pragma hdrstop
 
-#include "openssl/md5.h"
-#include "openssl/sha.h"
+#include <openssl/md5.h>
+#include <openssl/sha.h>
 
 // OpenSSL's RC4 algorithm has bugs and randomly corrupts data
 //#define OPENSSL_RC4
 #ifdef OPENSSL_RC4
-#include "openssl/rc4.h"
+#include <openssl/rc4.h>
 #endif
 
 /*****************************************************************************
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtilsExe/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtilsExe/CMakeLists.txt
new file mode 100644
index 00000000..f90379c1
--- /dev/null
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtilsExe/CMakeLists.txt
@@ -0,0 +1,33 @@
+include_directories("../../CoreLib")
+include_directories("../../NucleusLib")
+
+set(pnUtilsExe_HEADERS
+	Intern.h
+	Pch.h
+)
+
+set(pnUtilsExe_PRIVATE
+	Private/pnUteTime.cpp
+	Private/pnUteTls.cpp
+)
+
+if(WIN32)
+	set(pnUtilsExe_WIN32
+		Private/Win32/pnUteW32Time.cpp
+	)
+else()
+	set(pnUtilsExe_UNIX
+		Private/Unix/pnUteUxTime.cpp
+	)
+endif()
+
+add_library(pnUtilsExe STATIC ${pnUtilsExe_HEADERS} ${pnUtilsExe_PRIVATE}
+                              ${pnUtilsExe_UNIX} ${pnUtilsExe_WIN32})
+
+source_group("Header Files" FILES ${pnUtilsExe_HEADERS})
+source_group("Private" FILES ${pnUtilsExe_PRIVATE})
+if(WIN32)
+	source_group("Private\\Win32" FILES ${pnUtilsExe_WIN32})
+else()
+	source_group("Private\\Unix" FILES ${pnUtilsExe_UNIX})
+endif()
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h
index ab1c8a7c..ef02d8f9 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h
@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILSEXE_PCH_H
 
 
-#include "../pnUtils/Pch.h"
+#include "pnUtils/Pch.h"
 #include "Intern.h"
 
 #include <malloc.h>