diff --git a/Makefile b/Makefile
index 7c883c41741..b16e046d5e8 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ sinclude user-def.mk
 # export NAN_NO_OPENAL=true
 
 export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
@@ -50,7 +50,7 @@ else
     DIRS ?= extern intern source po
 endif
 
-include source/nan_subdirs.mk
+include build_files/make/nan_subdirs.mk
 
 .PHONY: release
 release:
diff --git a/source/nan_compile.mk b/build_files/make/nan_compile.mk
similarity index 100%
rename from source/nan_compile.mk
rename to build_files/make/nan_compile.mk
diff --git a/source/nan_definitions.mk b/build_files/make/nan_definitions.mk
similarity index 99%
rename from source/nan_definitions.mk
rename to build_files/make/nan_definitions.mk
index 37df7b05467..d14bdb0a13c 100644
--- a/source/nan_definitions.mk
+++ b/build_files/make/nan_definitions.mk
@@ -31,7 +31,7 @@
 # set some defaults when these are not overruled (?=) by environment variables
 #
 
-sinclude ../user-def.mk
+sinclude ../../user-def.mk
 
 # This warning only takes place once in source/
 ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))
diff --git a/source/nan_link.mk b/build_files/make/nan_link.mk
similarity index 100%
rename from source/nan_link.mk
rename to build_files/make/nan_link.mk
diff --git a/source/nan_subdirs.mk b/build_files/make/nan_subdirs.mk
similarity index 100%
rename from source/nan_subdirs.mk
rename to build_files/make/nan_subdirs.mk
diff --git a/source/nan_warn.mk b/build_files/make/nan_warn.mk
similarity index 100%
rename from source/nan_warn.mk
rename to build_files/make/nan_warn.mk