diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/res/plClient.rc b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/res/plClient.rc
index 42305219..99a2df21 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/res/plClient.rc
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/res/plClient.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <afxres.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include <afxres.h>\r\n"
     "\0"
 END
 
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
index c8f3a9b3..4cde1637 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
@@ -9,10 +9,6 @@ include_directories(${PYTHON_INCLUDE_DIR})
 include_directories(${OPENAL_INCLUDE_DIR})
 include_directories(${OPENSSL_INCLUDE_DIR})
 
-if(WIN32)
-	add_definitions(-DWIN32)
-endif(WIN32)
-
 set(pfPython_SOURCES
 	cyAccountManagement.cpp
 	cyAnimation.cpp
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt
index 381d8318..7e8eaf6e 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories(../../CoreLib)
 include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
+include_directories("../../PubUtilLib")
 
 set(pnDispatch_SOURCES
     plDispatch.cpp
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt
index c80a51a5..11ebd1fa 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories("../../CoreLib")
 include_directories("../../NucleusLib")
 include_directories("../../NucleusLib/inc")
+include_directories("../../PubUtilLib")
 
 set(pnKeyedObject_HEADERS
 	hsKeyedObject.h
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt
index 6be8190e..c93d2bd1 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories("../../CoreLib")
 include_directories("../../NucleusLib")
 include_directories("../../NucleusLib/inc")
+include_directories("../../PubUtilLib")
 
 set(pnSceneObject_HEADERS
 	plAudioInterface.h