diff --git a/apps/app_url.c b/apps/app_url.c
index 44c3909fe9f24fba60007ad293d7946778f3dfb7..169511689ea2ff0f8032aabf6d3e301113d9e334 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -29,13 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/image.h"
 #include "asterisk/app.h"
 
 static char *app = "SendURL";
diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index bf5a7d669bfaadda907eab790fe84281c94d5192..2a2fa78c798355b07afe53fa2843ed39f875a59d 100644
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -30,14 +30,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/image.h"
-#include "asterisk/callerid.h"
+#include "asterisk/channel.h"
 #include "asterisk/astdb.h"
 
 static int blacklist_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
diff --git a/funcs/func_global.c b/funcs/func_global.c
index d3a22ebb8670cef6f123ed9408eaeb221000fccc..1f0053d94ef71a4cfa53ef30c443aa51b8b47432 100644
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -32,9 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.h>
 
 #include "asterisk/module.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/utils.h"
 
 static int global_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
 {
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index 8d4cf7e87387afafb4e91c2ba64fe3ef88094c81..b376e8ae34266ac025a681086e02fe893a6e2732 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -31,10 +31,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/module.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/utils.h"
-#include "asterisk/app.h"
 
 static int md5(struct ast_channel *chan, const char *cmd, char *data,
 	       char *buf, size_t len)
diff --git a/funcs/func_module.c b/funcs/func_module.c
index 3f64a4941cfd2ae03d87273e8edead3437b00439..8b23263861a3a5c9e7e7cbe726b64c6477894291 100644
--- a/funcs/func_module.c
+++ b/funcs/func_module.c
@@ -25,13 +25,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/stat.h>
-
 #include "asterisk/module.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/utils.h"
-#include "asterisk/app.h"
 
 static int ifmodule_read(struct ast_channel *chan, const char *cmd, char *data,
 		    char *buf, size_t len)
diff --git a/funcs/func_sha1.c b/funcs/func_sha1.c
index 96a8c771b5151f7bdccbd1d0d79596cb25a2ee2b..6474140dd59699d4ed4e3a498691e864542d2c0b 100644
--- a/funcs/func_sha1.c
+++ b/funcs/func_sha1.c
@@ -29,10 +29,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/module.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/utils.h"
-#include "asterisk/app.h"
 
 static int sha1(struct ast_channel *chan, const char *cmd, char *data,
 		char *buf, size_t len)