diff --git a/include/linux/types.h b/include/linux/types.h
index 8b483c8..108a3a6 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,6 +1,9 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
+/* TODO: remove this file and use our uapi headers instead. */
+#define __aligned_u64 __u64 __attribute__((aligned(8)))
+
 #include <asm/types.h>
 
 #ifndef __ASSEMBLY__
diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c
index 0b6d5e3..4fff5a6 100644
--- a/libiptc/libiptc.c
+++ b/libiptc/libiptc.c
@@ -67,6 +67,7 @@
 };
 
 /* Convenience structures */
+#undef ipt_error_target /* uapi includes this already. */
 struct ipt_error_target
 {
 	STRUCT_ENTRY_TARGET t;