diff --git a/source/lib/mmgr.cpp b/source/lib/mmgr.cpp
index 99abdd2a1b..158b4efce9 100644
--- a/source/lib/mmgr.cpp
+++ b/source/lib/mmgr.cpp
@@ -44,7 +44,7 @@ AT_STARTUP(\
 #include <new>
 
 #include "lib.h"
-#include "posix.h"
+#include "posix/posix.h"
 #include "debug.h"
 
 // remove macro hooks (we need to use the actual malloc/new etc. routines)
diff --git a/source/lib/self_test.cpp b/source/lib/self_test.cpp
index af499f3c9e..cebc849567 100644
--- a/source/lib/self_test.cpp
+++ b/source/lib/self_test.cpp
@@ -21,12 +21,12 @@
  */
 
 #include "precompiled.h"
-#include "self_test.h"
-
-#include "timer.h"
 
 #if 0
 
+#include "self_test.h"
+#include "timer.h"
+
 // checked by debug_assert_failed; disables asserts if true (see above).
 // set/cleared by self_test_run.
 bool self_test_active = false;
diff --git a/source/network/SocketBase.cpp b/source/network/SocketBase.cpp
index 3912697054..c43f5666b9 100644
--- a/source/network/SocketBase.cpp
+++ b/source/network/SocketBase.cpp
@@ -14,6 +14,11 @@
 #include "ps/CLogger.h"
 #include "NetLog.h"
 
+#if !OS_WIN
+# include <fcntl.h>
+# include <sys/ioctl.h>
+#endif
+
 // Record global transfer statistics (sent/recvd bytes). This will put a lock
 // /unlock pair in all read and write operations.
 #define RECORD_GLOBAL_STATS 1