diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
index 41d6638119..c99782b78e 100755
--- a/BaseTools/Source/C/GenFw/GenFw.c
+++ b/BaseTools/Source/C/GenFw/GenFw.c
@@ -1250,7 +1250,7 @@ Routine Description:
 
     if ((stricmp (argv[0], "-z") == 0) || (stricmp (argv[0], "--zero") == 0)) {
       if (mOutImageType == FW_DUMMY_IMAGE) {
-      mOutImageType = FW_ZERO_DEBUG_IMAGE;
+        mOutImageType = FW_ZERO_DEBUG_IMAGE;
       }
       if (mOutImageType == FW_TE_IMAGE || mOutImageType == FW_EFI_IMAGE) {
         ZeroDebugFlag = TRUE;
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 0a9fb19aba..4299ab6ea9 100755
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -1244,7 +1244,7 @@ def __init__(self, ModuleAutoGen):
         BuildFile.__init__(self, ModuleAutoGen)
         self.PlatformInfo = self._AutoGenObject.PlatformInfo
         self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"]
-		self.DependencyHeaderFileSet = set()
+        self.DependencyHeaderFileSet = set()
 
     # Compose a dict object containing information used to do replacement in template
     @property
@@ -1435,7 +1435,7 @@ def __init__(self, PlatformAutoGen):
         self.ModuleBuildDirectoryList = []
         self.LibraryBuildDirectoryList = []
         self.LibraryMakeCommandList = []
-		self.DependencyHeaderFileSet = set()
+        self.DependencyHeaderFileSet = set()
 
     # Compose a dict object containing information used to do replacement in template
     @property
@@ -1541,7 +1541,7 @@ class TopLevelMakefile(BuildFile):
     def __init__(self, Workspace):
         BuildFile.__init__(self, Workspace)
         self.IntermediateDirectoryList = []
-		self.DependencyHeaderFileSet = set()
+        self.DependencyHeaderFileSet = set()
 
     # Compose a dict object containing information used to do replacement in template
     @property