diff --git a/Makefile b/Makefile
index 673618e2f..8d7f82f2d 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ ifeq ($(GMON),1)
 export GMON GMONLDOPT
 endif
 
-CFLAGS			+= $(WARNINGS) $(DEFINES) -iquote include/common
+CFLAGS			+= $(WARNINGS) $(DEFINES) -iquote include/
 
 # Default target
 all: criu lib
diff --git a/include/common/asm-generic/bitops.h b/include/common/asm-generic/bitops.h
index 190e1ab63..cb449fbf8 100644
--- a/include/common/asm-generic/bitops.h
+++ b/include/common/asm-generic/bitops.h
@@ -8,7 +8,7 @@
 #ifndef __CR_GENERIC_BITOPS_H__
 #define __CR_GENERIC_BITOPS_H__
 
-#include "asm/bitsperlong.h"
+#include "common/asm/bitsperlong.h"
 
 #define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
 #define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)