diff --git a/Makefile b/Makefile
index a4d560a90..fd8c29d1c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,6 @@ export VERSION_SO_MAJOR VERSION_SO_MINOR
 #
 #MAKEFLAGS := -r -R
 
-include Makefile.inc
-include Makefile.config
-
 #
 # Common definitions
 #
@@ -114,6 +111,8 @@ export CC MAKE CFLAGS LIBS ARCH DEFINES MAKEFLAGS CRIU-SO
 export SRC_DIR SYSCALL-LIB SH RM ARCH_DIR OBJCOPY LDARCH LD
 export cflags-y
 
+include Makefile.inc
+include Makefile.config
 include scripts/Makefile.version
 include scripts/Makefile.rules
 
diff --git a/include/sk-packet.h b/include/sk-packet.h
index 4c740c0b9..607e7a912 100644
--- a/include/sk-packet.h
+++ b/include/sk-packet.h
@@ -22,7 +22,9 @@ extern int packet_receive_one(struct nlmsghdr *h, void *arg);
 
 #ifndef PACKET_FANOUT
 #define PACKET_FANOUT	18
+#endif
 
+#ifndef TPACKET3_HDRLEN
 struct tpacket_req3 {
 	unsigned int tp_block_size;
 	unsigned int tp_block_nr;