diff --git a/Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp b/Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp
index 1010458f..03f0f172 100644
--- a/Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp
+++ b/Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp
@@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <float.h>
 #include <math.h>
 
-#ifdef _MSC_VER
+#ifdef HS_BUILD_FOR_WIN32
 #define isnan _isnan
 #endif
 
diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp b/Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp
index 266b56da..61817a24 100644
--- a/Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp
+++ b/Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp
@@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <float.h>
 #include <math.h>
 
-#ifdef _MSC_VER
+#ifdef HS_BUILD_FOR_WIN32
 #define isnan _isnan
 #endif
 
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
index 784b2fe0..59da9b9c 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
@@ -49,9 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plNetCommMsgs_inc
 
 
-#include "pnUtils/pnUtArray.h"
+#include "pnUtils/pnUtils.h"
 #include "pnNetBase/pnNetBase.h"
 #include "pnMessage/plMessage.h"
+#include "pnNetProtocol/pnNetProtocol.h"
 
 class plNetCommReplyMsg : public plMessage {
 public: