diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 93a5215351..29475d8a62 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -477,6 +477,7 @@ clean:	semi-clean
 			$(TOAST) $(TCAT) $(UNTOAST)	\
 			$(ROOT)/gsm-1.0.tar.Z
 		rm -rf lib
+		rm -f .*.d
 
 # Two tools that helped me generate gsm_encode.c and gsm_decode.c,
 # but aren't generally needed to port this.
diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile
index 3c4668ba8d..3864f31fbd 100644
--- a/codecs/ilbc/Makefile
+++ b/codecs/ilbc/Makefile
@@ -17,4 +17,4 @@ $(LIB): $(OBJS)
 	$(CMD_PREFIX) $(RANLIB) $@
 
 clean:
-	rm -f $(LIB) *.o
+	rm -f $(LIB) *.o .*.d
diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile
index 5594bb86bf..e3308913ab 100644
--- a/codecs/lpc10/Makefile
+++ b/codecs/lpc10/Makefile
@@ -74,4 +74,4 @@ $(LIB): $(OBJ)
 	$(CMD_PREFIX) $(RANLIB) $@
 
 clean:
-	rm -f *.o $(LIB)
+	rm -f *.o $(LIB) .*.d
diff --git a/main/Makefile b/main/Makefile
index 4d1bb08609..e35df85b2a 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -140,6 +140,7 @@ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 
 clean::
 	rm -f asterisk
+	rm -f db1-ast/.*.d
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 606ac8d6a6..e589dc9671 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -1,5 +1,3 @@
-#include "asterisk/autoconfig.h"
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/utils/astman.c b/utils/astman.c
index f58aa6b18d..b473714971 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -22,8 +22,6 @@
  *
  */
  
-#include "asterisk/autoconfig.h"
-
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>
diff --git a/utils/smsq.c b/utils/smsq.c
index 64be371810..bacae9ef31 100644
--- a/utils/smsq.c
+++ b/utils/smsq.c
@@ -17,8 +17,6 @@
  * at the top of the source tree.
  */
 
-#include "asterisk/autoconfig.h"
-
 #include <stdio.h>
 #include <popt.h>
 #include <sys/types.h>