diff --git a/reactos/Makefile b/reactos/Makefile
index fd43631c668..acbba93ed48 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -161,15 +161,15 @@ ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
 ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 export OSTYPE = msys
 HOST=mingw32-linux
-CFLAGS+=-fshort-wchar
-CPPFLAGS+=-fshort-wchar
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
 else
 HOST=mingw32-windows
 endif
 else
 HOST=mingw32-linux
-CFLAGS+=-fshort-wchar
-CPPFLAGS+=-fshort-wchar
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
 endif
 endif
 
diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index 87bfde7715b..ad5a6dfc73d 100644
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -5,9 +5,9 @@ TOOLS_INT_ = $(TOOLS_INT)$(SEP)
 TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE)
 TOOLS_OUT_ = $(TOOLS_OUT)$(SEP)
 
-TOOLS_CFLAGS = $(CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing
-TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith
-TOOLS_LFLAGS = $(LFLAGS)
+TOOLS_CFLAGS = $(HOST_CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing
+TOOLS_CPPFLAGS = $(HOST_CPPFLAGS) -Wall -Wpointer-arith
+TOOLS_LFLAGS = $(HOST_LFLAGS)
 
 $(TOOLS_INT): | $(INTERMEDIATE)
 	$(ECHO_MKDIR)