diff --git a/pmc.c b/pmc.c
index 791c0ad..fe614ac 100644
--- a/pmc.c
+++ b/pmc.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "ds.h"
 #include "msg.h"
 #include "print.h"
 #include "tlv.h"
diff --git a/tlv.c b/tlv.c
index c2e827c..9552dd1 100644
--- a/tlv.c
+++ b/tlv.c
@@ -19,6 +19,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 
+#include "port.h"
 #include "tlv.h"
 
 uint8_t ieee8021_id[3] = { IEEE_802_1_COMMITTEE };
diff --git a/tlv.h b/tlv.h
index 375b821..e9cb25d 100644
--- a/tlv.h
+++ b/tlv.h
@@ -22,7 +22,6 @@
 
 #include "ddt.h"
 #include "msg.h"
-#include "port.h"
 
 /* TLV types */
 #define TLV_MANAGEMENT					0x0001