diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90101ddb..f763e040 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,10 +20,6 @@ set(PLASMA_TARGETS Client
 set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS
              "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs")
 
-if(PLASMA_TARGETS STREQUAL "Client")
-	add_definitions(-DCLIENT)
-endif(PLASMA_TARGETS STREQUAL "Client")
-
 if(PLASMA_TARGETS STREQUAL "Patcher")
 	add_definitions(-DPATCHER)
 endif(PLASMA_TARGETS STREQUAL "Patcher")
diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt
index 0ea09368..d17fd048 100644
--- a/Sources/Plasma/NucleusLib/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_definitions(-D_LIB)
+
 add_subdirectory(pnAddrInfo)
 add_subdirectory(pnAsyncCore)
 add_subdirectory(pnAsyncCoreExe)
diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt
index 492111ff..829c4b5d 100644
--- a/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt
@@ -3,10 +3,10 @@ include_directories(../../NucleusLib)
 
 set(pnAsyncCore_HEADERS
     Pch.h
+    pnAsyncCore.h
 )
 
 set(pnAsyncCore_PRIVATE
-    pnAsyncCore.h
     Private/pnAcAllIncludes.h
     Private/pnAcCore.h
     Private/pnAcIo.h
@@ -19,4 +19,4 @@ set(pnAsyncCore_PRIVATE
 add_library(pnAsyncCore STATIC ${pnAsyncCore_PRIVATE} ${pnAsyncCore_HEADERS})
 
 source_group("Header Files" FILES ${pnAsyncCore_HEADERS})
-source_group("Private" FILES ${pnAsyncCore_PRIVATE})
\ No newline at end of file
+source_group("Private" FILES ${pnAsyncCore_PRIVATE})