diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6a057d3153..71c8e6f7c7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -135,7 +135,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/netsock.h"
 #include "asterisk/localtime.h"
 #include "asterisk/abstract_jb.h"
-#include "asterisk/compiler.h"
 #include "asterisk/threadstorage.h"
 #include "asterisk/translate.h"
 #include "asterisk/version.h"
diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h
index 1d257ed7aa..cca463f425 100644
--- a/include/asterisk/astobj.h
+++ b/include/asterisk/astobj.h
@@ -24,7 +24,6 @@
 #define _ASTERISK_ASTOBJ_H
 
 #include "asterisk/lock.h"
-#include "asterisk/compiler.h"
 
 /*! \file
  * \brief A set of macros implementing objects and containers.
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 327096d558..b950883d58 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -142,7 +142,6 @@ extern "C" {
 #define MAX_LANGUAGE		20	/*!< Max length of the language setting */
 #define MAX_MUSICCLASS		80	/*!< Max length of the music class setting */
 
-#include "asterisk/compat.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
 #include "asterisk/chanvars.h"
@@ -152,7 +151,6 @@ extern "C" {
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/stringfields.h"
-#include "asterisk/compiler.h"
 #include <limits.h>
 
 #define DATASTORE_INHERIT_FOREVER	INT_MAX
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 7e019e0641..f70dcea163 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -15,6 +15,8 @@
  * especially those related to header files.
  */
 
+#include "asterisk/compiler.h"
+
 #ifndef _COMPAT_H
 #define _COMPAT_H
 
diff --git a/include/asterisk/endian.h b/include/asterisk/endian.h
index 98bff15a24..2d8e9d4f39 100644
--- a/include/asterisk/endian.h
+++ b/include/asterisk/endian.h
@@ -27,8 +27,6 @@
  * Autodetect system endianess
  */
 
-#include "asterisk/compat.h"
-
 #ifndef __BYTE_ORDER
 #ifdef __linux__
 #include <endian.h>
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index e51f6e6385..07072d1351 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -32,7 +32,6 @@ extern "C" {
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include "asterisk/compiler.h"
 #include "asterisk/endian.h"
 #include "asterisk/linkedlists.h"
 
diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h
index 214935ac0c..65f1b53f99 100644
--- a/include/asterisk/stringfields.h
+++ b/include/asterisk/stringfields.h
@@ -103,8 +103,6 @@
 #define _ASTERISK_STRINGFIELDS_H
 
 #include "asterisk/inline_api.h"
-#include "asterisk/compiler.h"
-#include "asterisk/compat.h"
 
 /*!
   \internal
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 2efe02c2a4..dc5f8e18a1 100644
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -24,8 +24,6 @@
 #define _ASTERISK_STRINGS_H
 
 #include "asterisk/inline_api.h"
-#include "asterisk/compiler.h"
-#include "asterisk/compat.h"
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
 
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 7d0b560894..c1b61ba2b1 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -23,8 +23,6 @@
 #ifndef _ASTERISK_UTILS_H
 #define _ASTERISK_UTILS_H
 
-#include "asterisk/compat.h"
-
 #include <netinet/in.h>
 #include <arpa/inet.h>	/* we want to override inet_ntoa */
 #include <netdb.h>
@@ -34,7 +32,6 @@
 #include "asterisk/lock.h"
 #include "asterisk/time.h"
 #include "asterisk/logger.h"
-#include "asterisk/compiler.h"
 #include "asterisk/localtime.h"
 
 /*! 
diff --git a/utils/extconf.c b/utils/extconf.c
index fa31102eb3..0028e82aef 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -24,12 +24,8 @@
  *
  */
 
-#include "asterisk/autoconfig.h"
+#include "asterisk/compat.h"
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <time.h>
 #include <sys/stat.h>
@@ -67,8 +63,6 @@ struct ast_channel
 
 
 #include "asterisk/inline_api.h"
-#include "asterisk/compat.h"
-#include "asterisk/compiler.h"
 #include "asterisk/endian.h"
 #include "asterisk/ast_expr.h"
 #include "asterisk/ael_structs.h"