diff --git a/src/eepp/window/platform/osx/osximpl.cpp b/src/eepp/window/platform/osx/osximpl.cpp
index 3c84a3542..d1fc3026e 100644
--- a/src/eepp/window/platform/osx/osximpl.cpp
+++ b/src/eepp/window/platform/osx/osximpl.cpp
@@ -1,9 +1,11 @@
-#include <eepp/window/platform/osx/osximpl.hpp>
+#include <eepp/config.hpp>
 
 #if EE_PLATFORM == EE_PLATFORM_MACOSX
 
 #include <AGL/agl.h>
 
+#include <eepp/window/platform/osx/osximpl.hpp>
+
 namespace EE { namespace Window { namespace Platform {
 
 cOSXImpl::cOSXImpl( EE::Window::Window * window ) :
diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp
index 1fab63ca7..2f812c257 100644
--- a/src/test/eetest.cpp
+++ b/src/test/eetest.cpp
@@ -909,7 +909,7 @@ void EETest::LoadTextures() {
 	CursorManager * CurMan = mWindow->GetCursorManager();
 	CurMan->Visible( false );
 	CurMan->Visible( true );
-	CurMan->Set( Window::SYS_CURSOR_HAND );
+	CurMan->Set( EE::Window::SYS_CURSOR_HAND );
 	CurMan->SetGlobalCursor( EE_CURSOR_ARROW, CurMan->Add( CurMan->Create( CursorP[0], Vector2i( 1, 1 ), "cursor_special" ) ) );
 	CurMan->Set( EE_CURSOR_ARROW );
 
diff --git a/src/test/eetest.hpp b/src/test/eetest.hpp
index 88d9cc83f..32ace4a2e 100644
--- a/src/test/eetest.hpp
+++ b/src/test/eetest.hpp
@@ -92,7 +92,7 @@ class EETest : private Thread {
 		EE::Window::Window * mWindow;
 		TextureFactory* TF;
 		System::Log* Log;
-		Window::Input* KM;
+		EE::Window::Input* KM;
 		InputTextBuffer InBuf;
 
 		bool side, aside;