include headers with prototypes to make sure prototypes match
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c
index 3ca579c..5cbe79e 100644
--- a/networking/udhcp/clientpacket.c
+++ b/networking/udhcp/clientpacket.c
@@ -39,6 +39,7 @@
 
 
 #include "dhcpd.h"
+#include "clientpacket.h"
 #include "options.h"
 #include "dhcpc.h"
 #include "common.h"
diff --git a/networking/udhcp/clientpacket.h b/networking/udhcp/clientpacket.h
index 2a6facb..8e5441b 100644
--- a/networking/udhcp/clientpacket.h
+++ b/networking/udhcp/clientpacket.h
@@ -1,6 +1,8 @@
 #ifndef _CLIENTPACKET_H
 #define _CLIENTPACKET_H
 
+#include "packet.h"
+
 unsigned long random_xid(void);
 int send_discover(unsigned long xid, unsigned long requested);
 int send_selecting(unsigned long xid, unsigned long server, unsigned long requested);
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index 0b6b409..341abab 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -12,6 +12,7 @@
 #include "dhcpd.h"
 #include "files.h"
 #include "options.h"
+#include "leases.h"
 #include "arpping.h"
 #include "common.h"
 
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 0f2a3bc..32b4894 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -14,6 +14,7 @@
 #endif
 #include <errno.h>
 
+#include "packet.h"
 #include "dhcpd.h"
 #include "options.h"
 #include "common.h"
diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c
index 0f2a21c..9c766a2 100644
--- a/networking/udhcp/script.c
+++ b/networking/udhcp/script.c
@@ -32,7 +32,7 @@
 #include "options.h"
 #include "dhcpd.h"
 #include "dhcpc.h"
-#include "options.h"
+#include "script.h"
 #include "common.h"
 
 /* get a rough idea of how long an option will be (rounding up...) */
diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c
index 0968244..32d3c80 100644
--- a/networking/udhcp/serverpacket.c
+++ b/networking/udhcp/serverpacket.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "serverpacket.h"
 #include "dhcpd.h"
 #include "options.h"
 #include "common.h"
diff --git a/networking/udhcp/serverpacket.h b/networking/udhcp/serverpacket.h
index 5a4fb27..233d449 100644
--- a/networking/udhcp/serverpacket.h
+++ b/networking/udhcp/serverpacket.h
@@ -1,6 +1,7 @@
 #ifndef _SERVERPACKET_H
 #define _SERVERPACKET_H
 
+#include "packet.h"
 
 int sendOffer(struct dhcpMessage *oldpacket);
 int sendNAK(struct dhcpMessage *oldpacket);
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index df00e69..60190a0 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -41,6 +41,7 @@
 #include <linux/if_ether.h>
 #endif
 
+#include "socket.h"
 #include "common.h"
 
 int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char *arp)