diff --git a/Sources/Plasma/CoreLib/HeadSpin.h b/Sources/Plasma/CoreLib/HeadSpin.h
index 0405e223..8c91e1dd 100644
--- a/Sources/Plasma/CoreLib/HeadSpin.h
+++ b/Sources/Plasma/CoreLib/HeadSpin.h
@@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 // Internal Headers
 // These are only ever included here :)
-#include "hsWindows.h"
 #include "hsTypes.h"
+#include "hsWindows.h"
 #include "hsUtils.h"
 
 #endif
diff --git a/Sources/Plasma/CoreLib/hsTypes.h b/Sources/Plasma/CoreLib/hsTypes.h
index 961cdd28..ed2ec9f9 100644
--- a/Sources/Plasma/CoreLib/hsTypes.h
+++ b/Sources/Plasma/CoreLib/hsTypes.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <cstdlib>
 #include <cstdio>
 #include <cstddef>
+#include <math.h>
 
 
 /************************** Basic Macros *****************************/
diff --git a/Sources/Plasma/CoreLib/hsUtils.h b/Sources/Plasma/CoreLib/hsUtils.h
index 000e010e..f230762a 100644
--- a/Sources/Plasma/CoreLib/hsUtils.h
+++ b/Sources/Plasma/CoreLib/hsUtils.h
@@ -46,7 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define   _HSUTILS_H
 
 #include "HeadSpin.h"
-#include <ctype.h>
+#include <cctype>
+#include <cstring>
 #include <stdarg.h>
 
 int     hsStrlen(const char src[]);