diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32e72045..1b4c51da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,4 +86,4 @@ endif(MSVC)
 include_directories(${OPENSSL_INCLUDE_DIR})
 
 add_subdirectory(Sources/Plasma)
-add_subdirectory(Sources/Tools)
+add_subdirectory(Sources/Tools)
\ No newline at end of file
diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
index d5784c0e..02afb0b1 100644
--- a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <stdio.h>
 #include "plWavFile.h"
 
-#ifdef MAXPLUGINCODE
+#ifdef BUILDING_MAXPLUGIN
 
 #ifdef DX_OLD_SDK
     #include <dxerr9.h>
@@ -1094,4 +1094,4 @@ public:
 
 #endif
 
-#endif //MAXPLUGINCODE
+#endif // BUILDING_MAXPLUGIN
diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h
index ea772668..f88d81fb 100644
--- a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h
@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plWavFile_H
 #define plWavFile_H
 
-#ifdef MAXPLUGINCODE
+#ifdef BUILDING_MAXPLUGIN
 #define WAVEFILE_READ   1
 #define WAVEFILE_WRITE  2
 
@@ -111,6 +111,6 @@ protected:
     HRESULT WriteMMIO( WAVEFORMATEX *pwfxDest );
     HRESULT IClose();
 };
-#endif //MAXPLUGINCODE
+#endif // BUILDING_MAXPLUGIN
 
 #endif // plWavFile_H
diff --git a/Sources/Tools/CMakeLists.txt b/Sources/Tools/CMakeLists.txt
index 40049d08..b7581384 100644
--- a/Sources/Tools/CMakeLists.txt
+++ b/Sources/Tools/CMakeLists.txt
@@ -4,8 +4,6 @@
 #add_subdirectory(plResBrowser)
 
 # Max Stuff goes below here...
-option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF)
-
 if(3dsm_BUILD_PLUGIN)
     add_definitions(-DMAXPLUGINCODE)
     
diff --git a/cmake/FindMaxSDK.cmake b/cmake/FindMaxSDK.cmake
index 90ebdff5..3a059d06 100644
--- a/cmake/FindMaxSDK.cmake
+++ b/cmake/FindMaxSDK.cmake
@@ -87,4 +87,9 @@ if (3dsm_FOUND)
     if(NOT 3dsm_FIND_QUIETLY)
         message(STATUS "Found 3ds Max SDK: ${3dsm_PATH}")
     endif()
+    
+    option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF)
+    if (3dsm_BUILD_PLUGIN)
+        add_definitions(-DBUILDING_MAXPLUGIN)
+    endif()
 endif()
\ No newline at end of file