diff --git a/agi/eagi-test.c b/agi/eagi-test.c
index ed725fcc3..704fd7b22 100644
--- a/agi/eagi-test.c
+++ b/agi/eagi-test.c
@@ -5,17 +5,8 @@
  * with no warranty of any kind
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/select.h>
-
 #include "asterisk.h"
 
-#include "asterisk/compat.h"
-
 #define AUDIO_FILENO (STDERR_FILENO + 1)
 
 /*! \file
diff --git a/main/minimime/mm.h b/main/minimime/mm.h
index 93bd5f0fc..449cd8f72 100644
--- a/main/minimime/mm.h
+++ b/main/minimime/mm.h
@@ -35,13 +35,10 @@
 #ifndef _MM_H_INCLUDED
 #define _MM_H_INCLUDED
 
-#include <sys/types.h>
-#include <assert.h>
+#include "asterisk.h"
 #include "mm_queue.h"
 #include "mm_mem.h"
 
-#include "asterisk/compat.h"
-
 #define MM_MIME_LINELEN 998
 #define MM_BASE64_LINELEN 76
 
diff --git a/main/sha1.c b/main/sha1.c
index 3a6f7cc6b..4226ecf63 100644
--- a/main/sha1.c
+++ b/main/sha1.c
@@ -60,7 +60,7 @@
  *
  */
 
-#include "asterisk/compat.h"
+#include "asterisk.h"
 #include "asterisk/sha1.h"
 
 /*! Define the SHA1 circular left shift macro */
diff --git a/utils/check_expr.c b/utils/check_expr.c
index df3b19b58..1675caca0 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -16,19 +16,9 @@
  * at the top of the source tree.
  */
 
-#include <stdio.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
+#include "asterisk.h"
 
-struct ast_channel 
-{
-	char x; /* basically empty! */
-};
-
-#include "../include/asterisk/compat.h"
-#include "../include/asterisk/ast_expr.h"
+#include "asterisk/ast_expr.h"
 
 #define AST_API_MODULE 1
 #include "asterisk/inline_api.h"
@@ -145,9 +135,8 @@ void ast_log(int level, const char *file, int line, const char *function, const
 	fflush(stdout);
 	va_end(vars);
 }
-void ast_add_profile(void);
-void ast_register_file_version(const char *file, const char *version);
-void ast_unregister_file_version(const char *file);
+//void ast_register_file_version(const char *file, const char *version);
+//void ast_unregister_file_version(const char *file);
 
 char *find_var(const char *varname);
 void set_var(const char *varname, const char *varval);
@@ -155,13 +144,7 @@ unsigned int check_expr(char* buffer, char* error_report);
 int check_eval(char *buffer, char *error_report);
 void parse_file(const char *fname);
 
-void ast_add_profile(void)
-{
-}
-
-void ast_register_file_version(const char *file, const char *version)
-{
-}
+void ast_register_file_version(const char *file, const char *version) { }
 
 void ast_unregister_file_version(const char *file)
 {
diff --git a/utils/hashtest2.c b/utils/hashtest2.c
index a2a629a1d..0fe10ab75 100644
--- a/utils/hashtest2.c
+++ b/utils/hashtest2.c
@@ -35,9 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <pthread.h>
 #include <sys/stat.h>
 #include <signal.h>
-#include <errno.h>
 
-#include "asterisk/compat.h"
 #include "asterisk/lock.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/channel.h"
diff --git a/utils/smsq.c b/utils/smsq.c
index f6baf0ad1..af8238c84 100644
--- a/utils/smsq.c
+++ b/utils/smsq.c
@@ -17,19 +17,15 @@
  * at the top of the source tree.
  */
 
-#include <stdio.h>
+#include "asterisk.h"
+
 #include <popt.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
 
-#include <asterisk/compat.h>
 #ifdef SOLARIS
 #define     POPT_ARGFLAG_SHOW_DEFAULT 0x00800000
 #endif