diff --git a/src/libiptc/ipt_conntrack.h b/src/libiptc/ipt_conntrack.h
index cccf761..32ea342 100644
--- a/src/libiptc/ipt_conntrack.h
+++ b/src/libiptc/ipt_conntrack.h
@@ -5,12 +5,7 @@
 #ifndef _IPT_CONNTRACK_H
 #define _IPT_CONNTRACK_H
 
-#if 0
-#include <linux/netfilter_ipv4/ip_conntrack.h>
-#else
-#include <linux/netfilter/nf_conntrack_common.h>
-#include <linux/netfilter/nf_conntrack_tuple_common.h>
-#endif
+#include <linux/netfilter_ipv4/ipt_conntrack.h>
 
 /* backwards compatibility crap. only exists in userspace - HW */
 #include <linux/version.h>
@@ -27,6 +22,10 @@
 #define IP_CT_DIR_MAX		2
 #endif
 
+#ifndef IP_CT_DIR_MAX
+#define IP_CT_DIR_MAX 2
+#endif
+
 #define IPT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
 #define IPT_CONNTRACK_STATE_INVALID (1 << 0)
 
diff --git a/src/libiptc/libiptc.c b/src/libiptc/libiptc.c
index 04dd7bc..ce9612b 100644
--- a/src/libiptc/libiptc.c
+++ b/src/libiptc/libiptc.c
@@ -59,14 +59,12 @@ static const char *hooknames[]
 #endif
 };
 
-#if 0
 /* Convenience structures */
 struct ipt_error_target
 {
 	STRUCT_ENTRY_TARGET t;
 	char error[TABLE_MAXNAMELEN];
 };
-#endif
 
 struct chain_head;
 struct rule_head;
diff --git a/src/mark.h b/src/mark.h
index bb4ce22..46c3e02 100644
--- a/src/mark.h
+++ b/src/mark.h
@@ -1,11 +1,37 @@
 #ifndef MARK_H
 #define MARK_H
 
+/* Original inclusions from netsukuku 0.0.9b */
+#if 0
 #include "libiptc/libiptc.h"
-#include <linux/netfilter/nf_conntrack_common.h>
+#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
 #include "libiptc/ipt_conntrack.h"
 #include "libiptc/ipt_connmark.h"
 #include "libiptc/ipt_CONNMARK.h"
+#endif
+
+#if 1
+#include "libiptc/libiptc.h"
+#if 1
+#include <linux/netfilter/nf_conntrack_common.h>
+#endif
+#if 0
+#include <linux/netfilter_ipv4/ipt_conntrack_tuple.h>
+#endif
+#include "libiptc/ipt_conntrack.h"
+#include "libiptc/ipt_connmark.h"
+#include "libiptc/ipt_CONNMARK.h"
+#endif 
+
+/* 2010 fixes for debian package */
+#if 0
+#include "libiptc/libiptc.h"
+#include <linux/netfilter/nf_conntrack_common.h>
+#include <linux/netfilter_ipv4/ipt_conntrack.h>
+#include <linux/netfilter_ipv4/ipt_connmark.h>
+#include <linux/netfilter_ipv4/ipt_CONNMARK.h>
+#endif
 
 #define MANGLE_TABLE		"mangle"
 #define FILTER_TABLE		"filter"
diff --git a/src/ntkresolv.c b/src/ntkresolv.c
index beb708f..f126915 100644
--- a/src/ntkresolv.c
+++ b/src/ntkresolv.c
@@ -1,5 +1,3 @@
-#include <netinet/in.h>
-
 #include "includes.h"
 
 #include "ntkresolv.h"