--- modules/src/pop3server/popserver.c.orig	2007-05-19 09:49:10.000000000 +1000
+++ modules/src/pop3server/popserver.c	2007-05-19 09:49:25.000000000 +1000
@@ -34,9 +34,7 @@
 #include "popstate.h"
 #include "threads.h"
 
-#ifdef HAVE_CONFIG_H
-	#include "config.h"
-#endif
+#include "config.h"
 
 #include "log.h"
 #define LOG_ZONE "POPSERVER"
--- ./src/engine.c.orig	2007-05-19 09:53:52.000000000 +1000
+++ ./src/engine.c	2007-05-19 09:54:16.000000000 +1000
@@ -17,9 +17,7 @@
 #include <stdlib.h>
 #include <math.h>
  
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
+#include "config.h"
 
 #include "popserver.h"
 #include "popstate.h"
--- ./src/freepops.c.orig	2007-05-19 09:56:20.000000000 +1000
+++ ./src/freepops.c	2007-05-19 09:56:38.000000000 +1000
@@ -47,9 +47,7 @@
 	#include <getopt.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
+#include "config.h"
 
 #if CRYPTO_IMPLEMENTATION == 1
 	#include <pthread.h>