diff --git a/address-db.c b/address-db.c
index 762f5a3..bd25358 100644
--- a/address-db.c
+++ b/address-db.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/approve.c b/approve.c
index 782d179..c5ef3ad 100644
--- a/approve.c
+++ b/approve.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/archive.c b/archive.c
index 4680b6a..b2fc5c7 100644
--- a/archive.c
+++ b/archive.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/authen.c b/authen.c
index 97ce41f..9880579 100644
--- a/authen.c
+++ b/authen.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <ctype.h>
 
diff --git a/config-files.c b/config-files.c
index 21eec8c..68127fc 100644
--- a/config-files.c
+++ b/config-files.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/filter.c b/filter.c
index 3c65d4e..60a7879 100644
--- a/filter.c
+++ b/filter.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <signal.h>
diff --git a/generate-cookie.c b/generate-cookie.c
index e6e967a..2d5d0c4 100644
--- a/generate-cookie.c
+++ b/generate-cookie.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include "petidomo.h"
 #include "md5.h"
 #include <string.h>
diff --git a/handleacl.c b/handleacl.c
index 1a111fa..0a99272 100644
--- a/handleacl.c
+++ b/handleacl.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include "petidomo.h"
 
diff --git a/help.c b/help.c
index 2b6a85d..99a7caa 100644
--- a/help.c
+++ b/help.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include "libtext/text.h"
 #include "petidomo.h"
 
diff --git a/hermes.c b/hermes.c
index 1e5f040..8f677f1 100644
--- a/hermes.c
+++ b/hermes.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
diff --git a/index.c b/index.c
index baf3a5a..a823b51 100644
--- a/index.c
+++ b/index.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/io.c b/io.c
index b9d4f76..fc4139f 100644
--- a/io.c
+++ b/io.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/libargv/argv.c b/libargv/argv.c
index 459b1a7..b952204 100644
--- a/libargv/argv.c
+++ b/libargv/argv.c
@@ -14,6 +14,8 @@
  * without express or implied warranty.
  */
 
+#include <config.h>
+
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libargv/test.c b/libargv/test.c
index cb2a82f..c9eb55d 100644
--- a/libargv/test.c
+++ b/libargv/test.c
@@ -14,6 +14,8 @@
  * without express or implied warranty.
  */
 
+#include <config.h>
+
 #include <progname.h>
 #include "argv.h"
 
diff --git a/libconfigfile/config.c b/libconfigfile/config.c
index d7270c2..b9af137 100644
--- a/libconfigfile/config.c
+++ b/libconfigfile/config.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/liblists/lists.c b/liblists/lists.c
index 51f2952..60f9376 100644
--- a/liblists/lists.c
+++ b/liblists/lists.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "lists.h"
 
 /* Routines to access the elements of the structures transparently. */
diff --git a/libmpools/mpools.c b/libmpools/mpools.c
index fdd394c..57db324 100644
--- a/libmpools/mpools.c
+++ b/libmpools/mpools.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/librfc822/address_sep.c b/librfc822/address_sep.c
index f1dc2d8..0b97af5 100644
--- a/librfc822/address_sep.c
+++ b/librfc822/address_sep.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/librfc822/decomment.c b/librfc822/decomment.c
index 8e6eea0..f0f40b5 100644
--- a/librfc822/decomment.c
+++ b/librfc822/decomment.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/librfc822/parse_address.c b/librfc822/parse_address.c
index 297517f..a778597 100644
--- a/librfc822/parse_address.c
+++ b/librfc822/parse_address.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <assert.h>
 #ifdef DEBUG_DMALLOC
diff --git a/librfc822/test.c b/librfc822/test.c
index 933d9d0..946695a 100644
--- a/librfc822/test.c
+++ b/librfc822/test.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef DEBUG_DMALLOC
diff --git a/libtext/easy_pattern_match.c b/libtext/easy_pattern_match.c
index 11c2e09..6be332e 100644
--- a/libtext/easy_pattern_match.c
+++ b/libtext/easy_pattern_match.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <regex.h>
 #include "text.h"
diff --git a/libtext/easy_sprintf.c b/libtext/easy_sprintf.c
index bef0c8e..9632be0 100644
--- a/libtext/easy_sprintf.c
+++ b/libtext/easy_sprintf.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdarg.h>
 #include <string.h>
 #include "text.h"
diff --git a/libtext/find_next_line.c b/libtext/find_next_line.c
index 020e162..29955e0 100644
--- a/libtext/find_next_line.c
+++ b/libtext/find_next_line.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "text.h"
 
 /* Find the next text line.
diff --git a/libtext/find_string.c b/libtext/find_string.c
index c3b89c3..ce85769 100644
--- a/libtext/find_string.c
+++ b/libtext/find_string.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include "text.h"
 
diff --git a/libtext/transform_text.c b/libtext/transform_text.c
index 771394e..2919c8f 100644
--- a/libtext/transform_text.c
+++ b/libtext/transform_text.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <regex.h>
 #include "text.h"
diff --git a/libtext/wordwrap.c b/libtext/wordwrap.c
index a7df7dd..875eda9 100644
--- a/libtext/wordwrap.c
+++ b/libtext/wordwrap.c
@@ -17,6 +17,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <ctype.h>
 #include "text.h"
 
diff --git a/listserv.c b/listserv.c
index a8b00eb..9fcb88c 100644
--- a/listserv.c
+++ b/listserv.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <ctype.h>
 
diff --git a/mailer.c b/mailer.c
index 612fcd5..49301e6 100644
--- a/mailer.c
+++ b/mailer.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <limits.h>
diff --git a/main.c b/main.c
index bbd3ec0..a646aa9 100644
--- a/main.c
+++ b/main.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/members.c b/members.c
index 0d351f3..0e1dac3 100644
--- a/members.c
+++ b/members.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
diff --git a/parsearray.c b/parsearray.c
index 75af1d8..2850cb3 100644
--- a/parsearray.c
+++ b/parsearray.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include "petidomo.h"
 
 struct Parse ParseArray[] = {
diff --git a/password.c b/password.c
index 9d8121a..7fe574b 100644
--- a/password.c
+++ b/password.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <ctype.h>
 #include <string.h>
 #include "petidomo.h"
diff --git a/petidomo.h b/petidomo.h
index bc5c54e..bd9c1ba 100644
--- a/petidomo.h
+++ b/petidomo.h
@@ -20,7 +20,7 @@
 #ifndef __PETIDOMO_H__
 #define __PETIDOMO_H__ 1
 
-#include "config.h"
+#include <config.h>
 
 /********** Useful defines and declarations **********/
 
diff --git a/queue-command.c b/queue-command.c
index 540e1ab..3e871a7 100644
--- a/queue-command.c
+++ b/queue-command.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/queue-posting.c b/queue-posting.c
index 97bbfab..3a662d2 100644
--- a/queue-posting.c
+++ b/queue-posting.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/rfcparse.c b/rfcparse.c
index f80f87a..c0c55ad 100644
--- a/rfcparse.c
+++ b/rfcparse.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/subscribe.c b/subscribe.c
index ff304a1..38bf34f 100644
--- a/subscribe.c
+++ b/subscribe.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <errno.h>
 
diff --git a/tool.c b/tool.c
index c3c00a6..d5d21fd 100644
--- a/tool.c
+++ b/tool.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
diff --git a/unsubscribe.c b/unsubscribe.c
index b3537f3..da364c6 100644
--- a/unsubscribe.c
+++ b/unsubscribe.c
@@ -17,6 +17,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <errno.h>