diff --git a/Documentation/Makefile b/Documentation/Makefile
index 77c42816e..b1d7c7948 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,6 +1,6 @@
 __nmk_dir ?= ../scripts/nmk/scripts/
-include $(__nmk_dir)/include.mk
-include $(__nmk_dir)/macro.mk
+include $(__nmk_dir)include.mk
+include $(__nmk_dir)macro.mk
 
 ASCIIDOC	:= asciidoc
 A2X		:= a2x
diff --git a/Makefile b/Makefile
index 32c3ddc53..d2a8b4c31 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 __nmk_dir=$(CURDIR)/scripts/nmk/scripts/
 export __nmk_dir
 
-include $(__nmk_dir)/include.mk
-include $(__nmk_dir)/macro.mk
+include $(__nmk_dir)include.mk
+include $(__nmk_dir)macro.mk
 
 #
 # To build host helpers.
diff --git a/criu/Makefile b/criu/Makefile
index a21e3250d..79b5b0519 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -35,7 +35,7 @@ ifneq ($(filter ia32 x86 ppc64,$(ARCH)),)
 endif
 
 # msg-* printing
-include $(__nmk_dir)/msg.mk
+include $(__nmk_dir)msg.mk
 
 #
 # Needed libraries checks
diff --git a/criu/Makefile.config b/criu/Makefile.config
index f531b3b3c..849da3e35 100644
--- a/criu/Makefile.config
+++ b/criu/Makefile.config
@@ -1,4 +1,4 @@
-include $(__nmk_dir)/utils.mk
+include $(__nmk_dir)utils.mk
 include $(__nmk_dir)msg.mk
 include $(SRC_DIR)/scripts/feature-tests.mak
 
diff --git a/lib/Makefile b/lib/Makefile
index f1c0821fd..d036893b4 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,4 @@
-include $(__nmk_dir)/include.mk
-include $(__nmk_dir)/macro.mk
+include $(__nmk_dir)include.mk
 
 CRIU_SO			:= libcriu.so
 UAPI_HEADERS		:= c/criu.h ../images/rpc.proto