diff --git a/build/lol-build b/build/lol-build
index 5d5e93ea..bd92cf7a 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -16,6 +16,7 @@
 #  - linux-i386
 #  - linux-amd64
 #  - ios-arm
+#  - osx-amd64
 #  - android-arm
 #  - ps3-ppu
 #  - windows-i386
diff --git a/src/image/codec/android-image.cpp b/src/image/codec/android-image.cpp
index 200d969a..7c4e8bea 100644
--- a/src/image/codec/android-image.cpp
+++ b/src/image/codec/android-image.cpp
@@ -20,7 +20,7 @@
 #include <android/log.h>
 
 #include "core.h"
-#include "image-private.h"
+#include "image/image-private.h"
 
 using namespace std;
 
diff --git a/src/image/codec/ios-image.cpp b/src/image/codec/ios-image.cpp
index 70b1985e..ad5eda35 100644
--- a/src/image/codec/ios-image.cpp
+++ b/src/image/codec/ios-image.cpp
@@ -18,6 +18,7 @@
 #import <UIKit/UIKit.h>
 
 #include "core.h"
+#include "image/image-private.h"
 
 using namespace std;
 
diff --git a/src/image/codec/ps3-image.cpp b/src/image/codec/ps3-image.cpp
index db992dc2..d0ad69b9 100644
--- a/src/image/codec/ps3-image.cpp
+++ b/src/image/codec/ps3-image.cpp
@@ -20,6 +20,7 @@
 #include <cell/codec/pngdec.h>
 
 #include "core.h"
+#include "image/image-private.h"
 
 using namespace std;
 
diff --git a/test/benchsuite.cpp b/test/benchsuite.cpp
index 6a396a79..1d5a6199 100644
--- a/test/benchsuite.cpp
+++ b/test/benchsuite.cpp
@@ -14,7 +14,7 @@
 
 #include <cstdio>
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/debug/quad.cpp b/test/debug/quad.cpp
index 0999f65a..9e2c6b05 100644
--- a/test/debug/quad.cpp
+++ b/test/debug/quad.cpp
@@ -28,7 +28,7 @@ using namespace lol;
 #   include "platform/sdl/sdlinput.h"
 #endif
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/debug/sandbox.cpp b/test/debug/sandbox.cpp
index 16d4817c..a1d0c4f6 100644
--- a/test/debug/sandbox.cpp
+++ b/test/debug/sandbox.cpp
@@ -12,7 +12,7 @@
 #   include "config.h"
 #endif
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/testsuite.cpp b/test/testsuite.cpp
index 4a6d3ac1..16e1677b 100644
--- a/test/testsuite.cpp
+++ b/test/testsuite.cpp
@@ -15,7 +15,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif