diff --git a/apps/app_db.c b/apps/app_db.c
index 777d20150c47103c5631da7bb3cf9cdab7f368d4..811390829769f7b7a404ae07b674d4b6f4e6b1ce 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/astdb.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 
 /*! \todo XXX Remove this application after 1.4 is relased */
 static char *d_descrip =
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 0750a2dab985cbed870a334343b0e0935df370de..5f279960f98a00857588943d7708e832eaa20bce 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
-#include "asterisk.h"
 
 #define DATE_FORMAT "%Y-%m-%d %T"
 
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 2c72c78d4a9e194d5b26b3f660a2ca00c8ce5be6..5ebc5853c8219890a406c1f0a498e6445d566cdf 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -52,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 457a8a94ff5555dad2cd2fd4b0c7a6cd326ca6da..7e1bb06779dadef343c92509453bde81a1bbb9f7 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -76,7 +76,6 @@ extern "C" {
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 48e1c5e03677522b96d0c2aabe80b6676b40cfcc..6f52731ebb79c4cb377d0af895188a4f8470cafa 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -54,7 +54,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
diff --git a/channels/chan_local.c b/channels/chan_local.c
index b6062cd66fff0cfa89c64412daa7f0039f642b1c..8a93e2584a147558bd87606797a9d38684d125ce 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 3984ae978073ea2ef006cb149695114b622e494e..7bc1c26d5aeac2b4706700127da80f4cab5a25fa 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 02a8559b810f58957f6d19b15eb0911cb0f4f18f..75b9a2e1a8aa4cf06e1582018f79e91e33ada734 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -61,8 +61,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/dsp.h"
-#include "asterisk/translate.h"
-#include "asterisk/config.h"
 #include "asterisk/file.h"
 #include "asterisk/callerid.h"
 #include "asterisk/indications.h"
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 105e6ce071117f8ce2b21f994a41570719d1dd9c..d8d269416938663c057c1374aaf91a6674ffcaee 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -50,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 4cc0b9eb9a35d05812982f6a4c8ca6a6dc39ca51..c39bcd22b9fedba6fff619b2d3ecb6369cce6580 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -58,7 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
-#include "asterisk/lock.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index f47f62fcf8413f66f0c63f21ee8f83ddff6baaef..bb06c1560332affb99468dd8d7c0b4a360af6060 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
-#include "asterisk/pbx.h"
 #include "asterisk/options.h"
 #include "asterisk/enum.h"
 #include "asterisk/app.h"
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 18869f61ae2c3e8478c202651db483b0ce65651e..5a0fc334c4d685a69ab465f4f866f90548108f31 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/res_odbc.h"
 #include "asterisk/app.h"
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 0e82e2b010b707a3d0c3ad333d8649acf3b54694..d6bb6aa8e43975727c32add7488069cf2195f3c1 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -7,7 +7,6 @@
 #include "asterisk/compat.h"
 #include "asterisk/channel.h"
 #include "asterisk/ast_expr.h"
-#include "asterisk/ast_expr.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/ael_structs.h"