diff --git a/Application.mk b/Application.mk
index a56852aa8..da7dada5c 100644
--- a/Application.mk
+++ b/Application.mk
@@ -37,9 +37,9 @@ endif
 # we need to fix up the path so the DELIM will match the actual delimiter.
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-CWD = $(strip ${shell echo %CD% | cut -d: -f2})
+  CWD = $(strip ${shell echo %CD% | cut -d: -f2})
 else
-CWD = $(CURDIR)
+  CWD = $(CURDIR)
 endif
 
 # Add the static application library to the linked libraries.
diff --git a/Directory.mk b/Directory.mk
index 230d75a2c..8c96d7fba 100644
--- a/Directory.mk
+++ b/Directory.mk
@@ -28,8 +28,8 @@ CLEANSUBDIRS  += $(dir $(wildcard */.depend))
 CLEANSUBDIRS  += $(dir $(wildcard */.kconfig))
 CLEANSUBDIRS  := $(sort $(CLEANSUBDIRS))
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-	CONFIGSUBDIRS  := $(subst /,\,$(CONFIGSUBDIRS))
-	CLEANSUBDIRS  := $(subst /,\,$(CLEANSUBDIRS))
+  CONFIGSUBDIRS := $(subst /,\,$(CONFIGSUBDIRS))
+  CLEANSUBDIRS  := $(subst /,\,$(CLEANSUBDIRS))
 endif
 
 all: nothing
diff --git a/Make.defs b/Make.defs
index d87cd0072..4d466fcad 100644
--- a/Make.defs
+++ b/Make.defs
@@ -33,9 +33,9 @@ CONFIGDIRS := $(filter-out $(APPDIR)/builtin/,$(BUILDIRS))
 CONFIGDIRS := $(filter-out $(dir $(wildcard $(APPDIR)/*/Kconfig)),$(CONFIGDIRS))
 CLEANDIRS  := $(dir $(wildcard $(APPDIR)/*/Makefile))
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-	BUILDIRS  := $(subst /,\,$(BUILDIRS))
-	CONFIGDIRS  := $(subst /,\,$(CONFIGDIRS))
-	CLEANDIRS  := $(subst /,\,$(CLEANDIRS))
+  BUILDIRS   := $(subst /,\,$(BUILDIRS))
+  CONFIGDIRS := $(subst /,\,$(CONFIGDIRS))
+  CLEANDIRS  := $(subst /,\,$(CLEANDIRS))
 endif
 
 # CONFIGURED_APPS is the application directories that should be built in
@@ -44,7 +44,7 @@ endif
 CONFIGURED_APPS :=
 
 define Add_Application
-	include $(1)Make.defs
+  include $(1)Make.defs
 endef
 
 $(foreach BDIR, $(BUILDIRS), $(eval $(call Add_Application,$(BDIR))))
diff --git a/Makefile b/Makefile
index e21ddd09e..f54bb4b7d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ endif
 # use
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-export APPDIR = $(subst /,\,$(CURDIR))
+  export APPDIR = $(subst /,\,$(CURDIR))
 endif
 
 # Symbol table for loadable apps.