--- a/src/sm-archive.cpp	Fri Mar 10 12:55:07 2006 -0800
+++ b/src/sm-archive.cpp	Wed Jan 03 22:28:27 2007 -0800
@@ -23,16 +23,6 @@
 #include <sysexits.h>
 #include <unistd.h>
 
-// needed for socket io
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
 // needed for thread
 #include <pthread.h>
 
@@ -41,11 +31,6 @@
 #include <map>
 #include <list>
 
-// for the dns resolver
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
 // misc stuff needed here
 #include <ctype.h>
 #include <syslog.h>
@@ -55,11 +40,16 @@
 
 #include "includes.h"
 
+#ifndef HAVE_DAEMON
+	#include "daemon.h"
+	#include "daemon.c"
+#endif
+
 static char* smarchive_version="$Id$";
 
 
 extern "C" {
-	#include "libmilter/mfapi.h"
+	#include <libmilter/mfapi.h>
 	sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);
 	sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv);
 	sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv);