diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index 9e922f93a9..d2427359f3 100644
--- a/build_tools/menuselect.c
+++ b/build_tools/menuselect.c
@@ -24,13 +24,13 @@
  * \brief A menu-driven system for Asterisk module selection
  */
 
+#include "asterisk.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "asterisk.h"
-
 #include "mxml/mxml.h"
 #include "menuselect.h"
 
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index cb36784499..8c2c6c4e68 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -16,6 +16,9 @@
 #ifndef _COMPAT_H
 #define _COMPAT_H
 
+#include <inttypes.h>
+#include <sys/types.h>
+
 #ifndef HAVE_STRSEP
 char* strsep(char** str, const char* delims);
 #endif
@@ -81,18 +84,6 @@ typedef unsigned int	u_int32_t;
 #endif
 #endif /* __CYGWIN__ */
 
-#ifdef __linux__
-#include <inttypes.h>
-#endif
-
-#ifdef __Darwin__
-#include <inttypes.h>
-#endif
-
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#endif
-
 #ifdef __CYGWIN__
 typedef unsigned long long uint64_t;
 #endif