diff --git a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt
index 3f7c9783..1149cdab 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt
+++ b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt
@@ -7,19 +7,37 @@ find_package(OpenAL REQUIRED)
 
 option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
 
-# TODO: are there any other build types which are useful for us?
-add_definitions(-DBUILD_TYPE_LIVE)
+#TODO: Don't hard code this
+add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
 
 if(EXTERNAL_RELEASE)
 	add_definitions(-DPLASMA_EXTERNAL_RELEASE)
 endif(EXTERNAL_RELEASE)
 
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	add_definitions(-D_DEBUG)
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+set(PLASMA_TARGETS Client
+    CACHE STRING "Which set of plasma targets to build and use")
+set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS
+             "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs")
+
+if(PLASMA_TARGETS STREQUAL "Patcher")
+	add_definitions(-DPATCHER)
+endif(PLASMA_TARGETS STREQUAL "Patcher")
+
+if(PLASMA_TARGETS STREQUAL "Server")
+	add_definitions(-DSERVER)
+endif(PLASMA_TARGETS STREQUAL "Server")
+
+if(PLASMA_TARGETS STREQUAL "NoAvMsgs")
+	add_definitions(-DNO_AV_MSGS)
+endif(PLASMA_TARGETS STREQUAL "NoAvMsgs")
+
+if(PLASMA_TARGETS STREQUAL "Ethereal")
+	add_definitions(-DSTREAM_LOGGER)
+endif(PLASMA_TARGETS STREQUAL "Ethereal")
 
 if(MSVC)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 endif(MSVC)
 
 add_subdirectory(Sources/Plasma)
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h
index 5f608bf4..0acfb0fe 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h
@@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PL_CHECKSUM_H
 
 #include "hsTypes.h"
-#include "openssl/md5.h"
+#include <openssl/md5.h>
 
 class plChecksum
 {