diff --git a/AerofoilX/GpFileSystem_X.cpp b/AerofoilX/GpFileSystem_X.cpp
index 592a67e..a07f016 100644
--- a/AerofoilX/GpFileSystem_X.cpp
+++ b/AerofoilX/GpFileSystem_X.cpp
@@ -27,7 +27,7 @@
 
 #include "UTF8.h"
 
-#if defined(__CYGWIN__) || defined(__MACOS__)
+#if defined(__CYGWIN__) || defined(__MACOS__) || defined(__linux)
 typedef off_t off64_t;
 #define fstat64 fstat
 #define fseek64 fseek
diff --git a/AerofoilX/GpMain_SDL_X.cpp b/AerofoilX/GpMain_SDL_X.cpp
index e5e84f3..310c1ae 100644
--- a/AerofoilX/GpMain_SDL_X.cpp
+++ b/AerofoilX/GpMain_SDL_X.cpp
@@ -30,7 +30,7 @@ IGpDisplayDriver *GpDriver_CreateDisplayDriver_SDL_GL2(const GpDisplayDriverProp
 IGpAudioDriver *GpDriver_CreateAudioDriver_SDL(const GpAudioDriverProperties &properties);
 IGpInputDriver *GpDriver_CreateInputDriver_SDL2_Gamepad(const GpInputDriverProperties &properties);
 
-#ifdef __MACOS__
+#ifndef _WIN32
 int main(int argc, char *argv[])
 #else
 SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[])
diff --git a/AerofoilX/GpSystemServices_X.cpp b/AerofoilX/GpSystemServices_X.cpp
index fbcb8d9..8d229de 100644
--- a/AerofoilX/GpSystemServices_X.cpp
+++ b/AerofoilX/GpSystemServices_X.cpp
@@ -3,13 +3,8 @@
 #include "IGpClipboardContents.h"
 #include "IGpThreadEvent.h"
 
-#ifdef __MACOS__
 #include <SDL.h>
 #include <pthread.h>
-#else
-#include "SDL2/SDL.h"
-#endif
-
 #include <time.h>
 #include <unistd.h>
 #include <string>