--- gvpe/src/conf.C	2003/10/14 03:22:09	1.16
+++ gvpe/src/conf.C	2003/10/16 02:41:21	1.18
@@ -1,10 +1,6 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Robert van der Meulen
-                  1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
-		  2000 Cris van Pelt <tribbel@arise.dhs.org>
-                  2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,17 +29,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef ENABLE_ICMP
-# ifdef HAVE_NETINET_IN_SYSTM_H
-#  include <netinet/in_systm.h>
-# endif
-# ifdef HAVE_NETINET_IP_H
-#  include <netinet/ip.h>
-# endif
-# include <netinet/ip_icmp.h>
-#endif
+#include "netcompat.h"
 
 #include <openssl/err.h>
 #include <openssl/pem.h>