diff --git a/include/netlink/route/cls/basic.h b/include/netlink/route/cls/basic.h
index 8b58c1e..603fa88 100644
--- a/include/netlink/route/cls/basic.h
+++ b/include/netlink/route/cls/basic.h
@@ -13,6 +13,8 @@
 #define NETLINK_BASIC_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/classifier.h>
+#include <netlink/route/cls/ematch.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/cgroup.h b/include/netlink/route/cls/cgroup.h
index 20346ff..9cd4845 100644
--- a/include/netlink/route/cls/cgroup.h
+++ b/include/netlink/route/cls/cgroup.h
@@ -14,6 +14,8 @@
 
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
+#include <netlink/route/classifier.h>
+#include <netlink/route/cls/ematch.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/fw.h b/include/netlink/route/cls/fw.h
index 39878de..d1f1b75 100644
--- a/include/netlink/route/cls/fw.h
+++ b/include/netlink/route/cls/fw.h
@@ -15,6 +15,7 @@
 #define NETLINK_FW_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/classifier.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/u32.h b/include/netlink/route/cls/u32.h
index 62c5386..2789b19 100644
--- a/include/netlink/route/cls/u32.h
+++ b/include/netlink/route/cls/u32.h
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
+#include <netlink/route/classifier.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/dsmark.h b/include/netlink/route/qdisc/dsmark.h
index d7a6d22..06bd9d3 100644
--- a/include/netlink/route/qdisc/dsmark.h
+++ b/include/netlink/route/qdisc/dsmark.h
@@ -13,6 +13,8 @@
 #define NETLINK_DSMARK_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/qdisc.h>
+#include <netlink/route/class.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/fifo.h b/include/netlink/route/qdisc/fifo.h
index c18dd79..c033427 100644
--- a/include/netlink/route/qdisc/fifo.h
+++ b/include/netlink/route/qdisc/fifo.h
@@ -13,6 +13,7 @@
 #define NETLINK_FIFO_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/qdisc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/htb.h b/include/netlink/route/qdisc/htb.h
index af0287d..c909f84 100644
--- a/include/netlink/route/qdisc/htb.h
+++ b/include/netlink/route/qdisc/htb.h
@@ -16,6 +16,8 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/tc.h>
+#include <netlink/route/qdisc.h>
+#include <netlink/route/class.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/netem.h b/include/netlink/route/qdisc/netem.h
index ce56ee7..4b071bf 100644
--- a/include/netlink/route/qdisc/netem.h
+++ b/include/netlink/route/qdisc/netem.h
@@ -13,6 +13,7 @@
 #define NETLINK_NETEM_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/qdisc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/plug.h b/include/netlink/route/qdisc/plug.h
index ffb1a04..40f7e53 100644
--- a/include/netlink/route/qdisc/plug.h
+++ b/include/netlink/route/qdisc/plug.h
@@ -13,6 +13,7 @@
 #define NETLINK_PLUG_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/qdisc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/prio.h b/include/netlink/route/qdisc/prio.h
index f6fdc86..636a8f9 100644
--- a/include/netlink/route/qdisc/prio.h
+++ b/include/netlink/route/qdisc/prio.h
@@ -13,6 +13,7 @@
 #define NETLINK_PRIO_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/qdisc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/sfq.h b/include/netlink/route/qdisc/sfq.h
index 7cc0b3e..77d2e29 100644
--- a/include/netlink/route/qdisc/sfq.h
+++ b/include/netlink/route/qdisc/sfq.h
@@ -13,6 +13,7 @@
 #define NETLINK_SFQ_H_
 
 #include <netlink/netlink.h>
+#include <netlink/route/qdisc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/qdisc/tbf.h b/include/netlink/route/qdisc/tbf.h
index 8a2144a..ce31c54 100644
--- a/include/netlink/route/qdisc/tbf.h
+++ b/include/netlink/route/qdisc/tbf.h
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/tc.h>
+#include <netlink/route/qdisc.h>
 
 #ifdef __cplusplus
 extern "C" {