diff --git a/ndhc/arp.c b/ndhc/arp.c
index 174f792..e3c6a21 100644
--- a/ndhc/arp.c
+++ b/ndhc/arp.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include "arp.h"
 #include "state.h"
-#include "packet.h"
+#include "dhcp.h"
 #include "sys.h"
 #include "ifchange.h"
 #include "leasefile.h"
diff --git a/ndhc/arp.h b/ndhc/arp.h
index 5197321..9934b53 100644
--- a/ndhc/arp.h
+++ b/ndhc/arp.h
@@ -28,7 +28,7 @@
 #include <net/if_arp.h>
 
 #include "config.h"
-#include "packet.h"
+#include "dhcp.h"
 
 struct arpMsg {
     /* Ethernet header */
diff --git a/ndhc/packet.c b/ndhc/dhcp.c
similarity index 99%
rename from ndhc/packet.c
rename to ndhc/dhcp.c
index e8f45e2..979a212 100644
--- a/ndhc/packet.c
+++ b/ndhc/dhcp.c
@@ -35,7 +35,7 @@
 #include <time.h>
 #include <errno.h>
 
-#include "packet.h"
+#include "dhcp.h"
 #include "state.h"
 #include "arp.h"
 #include "ifchange.h"
diff --git a/ndhc/packet.h b/ndhc/dhcp.h
similarity index 100%
rename from ndhc/packet.h
rename to ndhc/dhcp.h
diff --git a/ndhc/ifchange.c b/ndhc/ifchange.c
index a2d9603..f6a262c 100644
--- a/ndhc/ifchange.c
+++ b/ndhc/ifchange.c
@@ -32,7 +32,7 @@
 
 #include "options.h"
 #include "config.h"
-#include "packet.h"
+#include "dhcp.h"
 #include "options.h"
 #include "arp.h"
 #include "log.h"
diff --git a/ndhc/ifchange.h b/ndhc/ifchange.h
index 795a9d7..5745b87 100644
--- a/ndhc/ifchange.h
+++ b/ndhc/ifchange.h
@@ -21,7 +21,7 @@
 #ifndef IFCHANGE_H_
 #define IFCHANGE_H_
 
-#include "packet.h"
+#include "dhcp.h"
 
 enum {
     IFCHANGE_DECONFIG = 0,
diff --git a/ndhc/ndhc.c b/ndhc/ndhc.c
index b70883b..6a9798f 100644
--- a/ndhc/ndhc.c
+++ b/ndhc/ndhc.c
@@ -42,7 +42,7 @@
 #include "config.h"
 #include "state.h"
 #include "options.h"
-#include "packet.h"
+#include "dhcp.h"
 #include "sys.h"
 #include "ifchange.h"
 #include "arp.h"
diff --git a/ndhc/options.h b/ndhc/options.h
index a9815d6..61651e1 100644
--- a/ndhc/options.h
+++ b/ndhc/options.h
@@ -20,7 +20,7 @@
 #ifndef OPTIONS_H_
 #define OPTIONS_H_
 
-#include "packet.h"
+#include "dhcp.h"
 
 /* DHCP option codes (partial list) */
 #define DHCP_PADDING            0x00
diff --git a/ndhc/state.h b/ndhc/state.h
index 3f5dc61..0396e74 100644
--- a/ndhc/state.h
+++ b/ndhc/state.h
@@ -2,7 +2,7 @@
 #define NDHC_STATE_H_
 
 #include "config.h"
-#include "packet.h"
+#include "dhcp.h"
 
 typedef enum {
     DS_SELECTING = 0,