diff --git a/Source/Glide64/3dmath.cpp b/Source/Glide64/3dmath.cpp
index 46bf717d0..04974f30b 100644
--- a/Source/Glide64/3dmath.cpp
+++ b/Source/Glide64/3dmath.cpp
@@ -38,6 +38,13 @@
 //****************************************************************
 
 #include "Gfx #1.3.h"
+extern "C" {
+#ifndef NOSSE
+#include <xmmintrin.h>
+#endif
+}
+
+#include <math.h>
 #include "3dmath.h"
 
 void calc_light (VERTEX *v)
diff --git a/Source/Glide64/Debugger.cpp b/Source/Glide64/Debugger.cpp
index 46a9091e4..15cd6a9f3 100644
--- a/Source/Glide64/Debugger.cpp
+++ b/Source/Glide64/Debugger.cpp
@@ -70,7 +70,7 @@ int  grid = 0;
 static const char *tri_type[4] = { "TRIANGLE", "TEXRECT", "FILLRECT", "BACKGROUND" };
 
 //Platform-specific stuff
-#ifndef __WINDOWS__
+#ifndef WIN32
 typedef struct dbgPOINT {
    int x;
    int y;
diff --git a/Source/Glide64/Gfx #1.3.h b/Source/Glide64/Gfx #1.3.h
index cf5da999e..60e58d131 100644
--- a/Source/Glide64/Gfx #1.3.h	
+++ b/Source/Glide64/Gfx #1.3.h	
@@ -105,7 +105,7 @@ typedef unsigned char boolean;
 #define GLIDE64_CATCH catch (...)
 #endif
 
-#ifndef __WINDOWS__
+#ifndef WIN32
 typedef void* HWND;
 #endif