diff --git a/src/Logger.c b/src/Logger.c
index 331fa0b82..a7fde7f45 100644
--- a/src/Logger.c
+++ b/src/Logger.c
@@ -20,18 +20,20 @@
 
 /* POSIX can be shared between unix-ish systems */
 #ifdef CC_BUILD_POSIX
-#include <execinfo.h>
-#include <signal.h>
 #if defined CC_BUILD_OPENBSD
+#include <signal.h>
 /* OpenBSD doesn't provide ucontext.h */
 #elif defined CC_BUILD_LINUX
 /* Need to define this to get REG_ constants */
 #define __USE_GNU
 #include <ucontext.h>
 #undef  __USE_GNU
+#include <signal.h>
 #else
+#include <signal.h>
 #include <ucontext.h>
 #endif
+#include <stdlib.h>
 #endif
 
 
@@ -333,6 +335,7 @@ void Logger_Backtrace(String* trace, void* ctx) {
 	}
 }
 #elif defined CC_BUILD_POSIX
+#include <execinfo.h>
 void Logger_Backtrace(String* trace, void* ctx) {
 	String str; char strBuffer[384];
 	void* addrs[40];
@@ -549,7 +552,6 @@ static void Logger_DumpRegisters(void* ctx) {
 
 /* OS specific stuff */
 #if defined CC_BUILD_LINUX || defined CC_BUILD_SOLARIS
-#include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/src/Platform.c b/src/Platform.c
index 475118fdd..af1747f87 100644
--- a/src/Platform.c
+++ b/src/Platform.c
@@ -58,7 +58,6 @@ const ReturnCode ReturnCode_SocketWouldBlock = WSAEWOULDBLOCK;
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <utime.h>
-#include <poll.h>
 #include <signal.h>
 
 #define Platform_DecodeString(dst, src, len) String_AppendUtf8(dst, (uint8_t*)(src), len)
@@ -1517,6 +1516,7 @@ ReturnCode Socket_Poll(SocketHandle socket, int mode, bool* success) {
 	*success = FD_ISSET(socket, &set); return 0;
 }
 #else
+#include <poll.h>
 ReturnCode Socket_Poll(SocketHandle socket, int mode, bool* success) {
 	struct pollfd pfd;
 	int flags;