diff --git a/include/udp.h b/include/udp.h
index 128c976..bde0bb1 100644
--- a/include/udp.h
+++ b/include/udp.h
@@ -1,9 +1,10 @@
-/* $Id: udp.h,v 1.3 2009/12/18 09:21:40 stpohle Exp $
+/* $Id: udp.h,v 1.4 2009/12/18 11:05:37 stpohle Exp $
  * UDP Network */
 
 #ifndef _UDP_H
 #define _UDP_H
 
+#define UDP_LEN_HOSTNAME 128
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/udp.c b/src/udp.c
index 1113970..c8cba09 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -1,33 +1,9 @@
-/* $Id: udp.c,v 1.17 2009/11/28 13:11:51 stpohle Exp $ */
+/* $Id: udp.c,v 1.18 2009/12/18 11:05:37 stpohle Exp $ */
 /* udp.c code for the network
 	File Version 0.2
 */
 
-#define UDP_LEN_HOSTNAME 128
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <time.h>
-#include <sys/time.h>
-#ifdef _WIN32
-	#include <winsock.h>
-	#include <io.h>
-#else
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <netdb.h>
-	#include <arpa/inet.h>
-	#include <unistd.h>
-	#include <sys/time.h>
-#endif
-
-#ifdef _WIN32
-	#define _sockaddr sockaddr
-#else
-	#define _sockaddr sockaddr_in6
-#endif
+#include "udp.h"
 
 extern char *dns_net_getip (char *host);
 extern int dns_filladdr (char *host, int hostlen, char *port, int portlen, int ai_family,