diff --git a/Silicon/Intel/Tools/FitGen/GNUmakefile b/Silicon/Intel/Tools/FitGen/GNUmakefile
index 00a99bb0c73..1e962239562 100644
--- a/Silicon/Intel/Tools/FitGen/GNUmakefile
+++ b/Silicon/Intel/Tools/FitGen/GNUmakefile
@@ -4,7 +4,12 @@
 # Copyright (c) 2010-2019, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
+ifeq (Windows, $(findstring Windows,$(MAKE_HOST)))
+SEP:=$(shell echo \)
+MAKEROOT ?= $(EDK_TOOLS_PATH)$(SEP)Source$(SEP)C
+else
 MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C
+endif
 
 APPNAME = FitGen
 
diff --git a/Silicon/Intel/Tools/GNUmakefile b/Silicon/Intel/Tools/GNUmakefile
index 6910b6ad0f6..90a078b75a9 100644
--- a/Silicon/Intel/Tools/GNUmakefile
+++ b/Silicon/Intel/Tools/GNUmakefile
@@ -6,7 +6,12 @@
 #
 ##
 
-MAKEROOT = $(EDK_TOOLS_PATH)/Source/C
+ifeq (Windows, $(findstring Windows,$(MAKE_HOST)))
+SEP:=$(shell echo \)
+MAKEROOT ?= $(EDK_TOOLS_PATH)$(SEP)Source$(SEP)C
+else
+MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C
+endif
 
 APPLICATIONS = \
   FitGen \