diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 3e0d78f12e..c3af125d1b 100644
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -87,7 +87,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>
       <includepath path="${env.JAVA_HOME}/include"/>
       <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>
-      <includepath path="${env.JAVA_HOME}/include/linux" if="linux"/>
+      <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
       <syslibset libs="kernel32" unless="gcc"/>
     </cc>
diff --git a/Tools/Source/TianoTools/CreateMtFile/Makefile b/Tools/Source/TianoTools/CreateMtFile/Makefile
deleted file mode 100644
index d6574fc09f..0000000000
--- a/Tools/Source/TianoTools/CreateMtFile/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#/*++
-#  
-#  Copyright (c)  1999 - 2001 Intel Corporation. All rights reserved
-#  This software and associated documentation (if any) is furnished
-#  under a license and may only be used or copied in accordance
-#  with the terms of the license. Except as permitted by such
-#  license, no part of this software or documentation may be
-#  reproduced, stored in a retrieval system, or transmitted in any
-#  form or by any means without the express written consent of
-#  Intel Corporation.
-#  
-#  
-#  Module Name:
-#  
-#    Makefile
-#  
-#  Abstract:
-#  
-#    makefile for building the CreateMtFile utility.
-#  
-#  Revision History
-#  
-#--*/
-
-#
-# Make sure environmental variable EFI_SOURCE is set
-#
-!IFNDEF EFI_SOURCE
-!ERROR EFI_SOURCE environmental variable not set 
-!ENDIF
-
-#
-# Define the toolchain which is used to set build options and toolchain paths
-#
-TOOLCHAIN = TOOLCHAIN_MSVC
-
-!INCLUDE PlatformTools.env
-
-#
-# Target specific information
-#
-
-TARGET_NAME         = CreateMtFile
-TARGET_SRC_DIR      = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\CreateMtFile.obj
-            
-#
-# Build the EXE by compiling the source files, then linking the resultant
-# object files together.
-#
-
-$(TIANO_TOOLS_OUTPUT)\CreateMtFile.obj : $(TARGET_SRC_DIR)\CreateMtFile.c
-  $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\CreateMtFile.c /Fo$@
-
-$(TARGET_EXE): $(OBJECTS) $(TARGET_EXE_LIBS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/EfiRom/Makefile b/Tools/Source/TianoTools/EfiRom/Makefile
deleted file mode 100644
index 5ba3607549..0000000000
--- a/Tools/Source/TianoTools/EfiRom/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#/*++
-#  
-#  Copyright (c) 2001 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#  
-#  Module Name:
-#  
-#    makefile
-#    
-#  Abstract:
-#  
-#    makefile for building the EfiRom utility.
-#  
-#  Revision History
-#  
-#--*/
-
-#
-# Make sure environmental variable EFI_SOURCE is set
-#
-!IFNDEF EFI_SOURCE
-!ERROR EFI_SOURCE environmental variable not set 
-!ENDIF
-
-#
-# Define the toolchain which is used to set build options and toolchain paths
-#
-TOOLCHAIN = TOOLCHAIN_MSVC
-
-!INCLUDE PlatformTools.env
-
-#
-# Target specific information
-#
-
-TARGET_NAME         = EfiRom
-TARGET_SRC_DIR      = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\EfiRom.exe
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\EfiRom.obj \
-            $(TIANO_TOOLS_OUTPUT)\EfiCompress.obj
-            
-#
-# Build the EXE by compiling the source files, then linking the resultant
-# object files together.
-#
-
-$(TIANO_TOOLS_OUTPUT)\EfiRom.obj : $(TARGET_SRC_DIR)\EfiRom.c
-  $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\EfiRom.c /Fo$@
-
-$(TIANO_TOOLS_OUTPUT)\EfiCompress.obj : $(EDK_TOOLS_SOURCE)\Common\EfiCompress.c
-  $(CC) $(C_FLAGS) $(EDK_TOOLS_SOURCE)\Common\EfiCompress.c /Fo$@
-  
-$(TARGET_EXE): $(OBJECTS) $(TARGET_EXE_LIBS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/FlashMap/Makefile b/Tools/Source/TianoTools/FlashMap/Makefile
deleted file mode 100644
index 6b6d011c1d..0000000000
--- a/Tools/Source/TianoTools/FlashMap/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#/*++
-#  
-#  Copyright (c) 2004 Intel Corporation. All rights reserved
-#  This software and associated documentation (if any) is furnished
-#  under a license and may only be used or copied in accordance
-#  with the terms of the license. Except as permitted by such
-#  license, no part of this software or documentation may be
-#  reproduced, stored in a retrieval system, or transmitted in any
-#  form or by any means without the express written consent of
-#  Intel Corporation.
-#  
-#  
-#  Module Name:
-#  
-#    Makefile
-#  
-#  Abstract:
-#  
-#    makefile for building the FlashMap utility
-#    
-#--*/
-
-#
-# Make sure environmental variable EFI_SOURCE is set
-#
-!IFNDEF EFI_SOURCE
-!ERROR EFI_SOURCE environmental variable not set 
-!ENDIF
-
-
-!INCLUDE PlatformTools.env
-
-INCLUDE_PATHS = -I $(TIANO_TOOLS_SOURCE)\Common
-
-#
-# Target specific information
-#
-TARGET_NAME         = FlashMap
-TARGET_SRC_DIR      = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\FlashMap.exe
-LIBS                = $(LIBS) "$(TIANO_TOOLS_OUTPUT)\Common.lib"
-
-#
-# Build targets
-#
-all: $(TARGET_EXE)
-
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\FlashMap.obj  \
-            $(TIANO_TOOLS_OUTPUT)\FlashDefFile.obj \
-            $(TIANO_TOOLS_OUTPUT)\Symbols.obj \
-            $(TIANO_TOOLS_OUTPUT)\Microcode.obj 
-            
-#            $(TIANO_TOOLS_OUTPUT)\TrackMallocFree.obj 
- 
-#C_FLAGS  = $(C_FLAGS) /D TRACK_MALLOC_FREE
-C_FLAGS   = $(C_FLAGS) /D _malloc=malloc /D _free=free
-           
-#
-# Compile each source file
-#
-$(TIANO_TOOLS_OUTPUT)\FlashMap.obj : $(TARGET_SRC_DIR)\FlashMap.c $(TARGET_SRC_DIR)\Symbols.h $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(INCLUDE_PATHS) $(TARGET_SRC_DIR)\FlashMap.c /Fo$@
-
-$(TIANO_TOOLS_OUTPUT)\Symbols.obj : $(TARGET_SRC_DIR)\Symbols.c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(INCLUDE_PATHS) $(TARGET_SRC_DIR)\Symbols.c /Fo$@
-
-$(TIANO_TOOLS_OUTPUT)\Microcode.obj : $(TARGET_SRC_DIR)\Microcode.c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_SRC_DIR)\Microcode.c /Fo$@
-
-$(TIANO_TOOLS_OUTPUT)\FlashDefFile.obj : $(TARGET_SRC_DIR)\FlashDefFile.c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_SRC_DIR)\FlashDefFile.c /Fo$@
-
-$(TIANO_TOOLS_OUTPUT)\TrackMallocFree.obj : $(TARGET_SRC_DIR)\TrackMallocFree.c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_SRC_DIR)\TrackMallocFree.c /Fo$@
-
-#
-# Link the object files together to create the final executable
-#
-$(TARGET_EXE) : $(OBJECTS) $(LIBS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)
-
diff --git a/Tools/Source/TianoTools/GenAcpiTable/Makefile b/Tools/Source/TianoTools/GenAcpiTable/Makefile
deleted file mode 100644
index c4df9bcbb7..0000000000
--- a/Tools/Source/TianoTools/GenAcpiTable/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#/*++
-#  
-#  Copyright (c) 2002 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#  
-#  Module Name:
-#  
-#    makefile
-#    
-#  Abstract:
-#  
-#    makefile for building the GenAcpiTable utility.
-#  
-#--*/
-
-#
-# Make sure environmental variable EFI_SOURCE is set
-#
-!IFNDEF EFI_SOURCE
-!ERROR EFI_SOURCE environmental variable not set 
-!ENDIF
-
-#
-# Define the toolchain which is used to set build options and toolchain paths
-#
-TOOLCHAIN = TOOLCHAIN_MSVC
-
-!INCLUDE PlatformTools.env
-
-#
-# Target specific information
-#
-
-TARGET_NAME         = GenAcpiTable
-TARGET_SRC_DIR      = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj 
-
-LIBS      = $(TIANO_TOOLS_OUTPUT)\Common.lib
-
-INC_DEPS  = $(EDK_SOURCE)\Foundation\Efi\Include\EfiImage.h
-          
-#
-# Build the EXE by compiling the source files, then linking the resultant
-# object files together.
-#
-
-$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj : $(TARGET_SRC_DIR)\$(TARGET_NAME).c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\$(TARGET_NAME).c /Fo$@
-
-$(TARGET_EXE): $(OBJECTS) $(TARGET_EXE_LIBS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/Makefile b/Tools/Source/TianoTools/GenCapsuleHdr/Makefile
deleted file mode 100644
index 1979c3d11c..0000000000
--- a/Tools/Source/TianoTools/GenCapsuleHdr/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#/*++
-#  
-#  Copyright (c)  2002 Intel Corporation. All rights reserved
-#  This software and associated documentation (if any) is furnished
-#  under a license and may only be used or copied in accordance
-#  with the terms of the license. Except as permitted by such
-#  license, no part of this software or documentation may be
-#  reproduced, stored in a retrieval system, or transmitted in any
-#  form or by any means without the express written consent of
-#  Intel Corporation.
-#  
-#  
-#  Module Name:
-#  
-#    Makefile
-#  
-#  Abstract:
-#  
-#    makefile for the GenCapsuleHdr utility.
-#    
-#--*/  
-
-#
-# Make sure environmental variable EFI_SOURCE is set
-#
-!IFNDEF EFI_SOURCE
-!ERROR EFI_SOURCE environmental variable not set 
-!ENDIF
-
-#
-# Do this if you want to compile from this directory
-#
-!IFNDEF TOOLCHAIN
-TOOLCHAIN = TOOLCHAIN_MSVC
-!ENDIF
-
-!INCLUDE PlatformTools.env
-
-#
-# Target specific information
-#
-
-
-TARGET_NAME         = GenCapsuleHdr
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-SRC                 = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-ETO                 = $(TIANO_TOOLS_OUTPUT)
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-LIBS    = $(LIBS) "$(TIANO_TOOLS_OUTPUT)\Common.lib" ole32.lib
-
-OBJECTS = $(ETO)\$(TARGET_NAME).obj \
-          $(ETO)\CreateGuid.obj
-
-#
-# Compile each source file
-#
-$(ETO)\$(TARGET_NAME).obj : $(SRC)\$(TARGET_NAME).c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(SRC)\$(TARGET_NAME).c /Fo$@
-
-$(ETO)\CreateGuid.obj : $(SRC)\CreateGuid.c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(SRC)\CreateGuid.c /Fo$@
-
-#
-# Link the object files together
-#
-$(TARGET_EXE) : $(OBJECTS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)
-
-clean:
diff --git a/Tools/Source/TianoTools/GenFdImage/Makefile b/Tools/Source/TianoTools/GenFdImage/Makefile
deleted file mode 100644
index 94fafaf798..0000000000
--- a/Tools/Source/TianoTools/GenFdImage/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-#/*++
-#   
-#  Copyright (c) 2001 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#   
-#  Module Name:  makefile
-#   
-#  Abstract:
-#   
-#    This file is used to build the EFI utility.
-#   
-#--*/
-
-#
-# Do this if you want to compile from this directory
-#
-!IFNDEF TOOLCHAIN
-TOOLCHAIN = TOOLCHAIN_MSVC
-!ENDIF
-
-!INCLUDE PlatformTools.env
-
-#
-# Define some macros we use here. Should get rid of them someday and 
-# get rid of the extra level of indirection.
-#
-COMMON_SOURCE      = $(EDK_TOOLS_COMMON)
-
-#
-# Common information
-#
-
-INC=$(INC) \
-    -I "$(TIANO_TOOLS_SOURCE)\GenFvImage"
-
-#
-# Target specific information
-#
-
-TARGET_NAME=GenFdImage
-TARGET_SOURCE_DIR = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-
-TARGET_LIB = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).lib
-TARGET_EXE = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-
-TARGET_EXE_SOURCE = "$(TARGET_SOURCE_DIR)\GenFdImageExe.c"
-TARGET_EXE_INCLUDE = "$(TARGET_SOURCE_DIR)\GenFdImageExe.h" \
-                     "$(TARGET_SOURCE_DIR)\GenFdImage.h" \
-                     "$(COMMON_SOURCE)\ParseInf.h" \
-                     "$(EDK_SOURCE)\Foundation\Include\TianoCommon.h"
-TARGET_EXE_LIBS = "$(TIANO_TOOLS_OUTPUT)\Common.lib" \
-                  "$(TIANO_TOOLS_OUTPUT)\GenFvImage.lib" \
-                  "$(TIANO_TOOLS_OUTPUT)\PeimFixup.lib"
-
-TARGET_LIB_SOURCE = "$(TARGET_SOURCE_DIR)\GenFdImageLib.c"
-TARGET_LIB_INCLUDE = "$(TARGET_SOURCE_DIR)\GenFdImage.h" \
-                     "$(TIANO_TOOLS_SOURCE)\GenFvImage\GenFvImage.h" \
-                     "$(COMMON_SOURCE)\ParseInf.h" \
-                     "$(EDK_SOURCE)\Foundation\Include\TianoCommon.h"
-TARGET_LIB_LIBS = "$(TIANO_TOOLS_OUTPUT)\Common.lib" \
-                  "$(TIANO_TOOLS_OUTPUT)\GenFvImage.lib" \
-                  "$(TIANO_TOOLS_OUTPUT)\PeimFixup.lib"
-
-
-#
-# Build targets
-#
-
-all: $(TARGET_LIB) $(TARGET_EXE)
-
-#
-# Build EXE
-#
-
-$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj: $(TARGET_EXE_SOURCE) $(TARGET_EXE_INCLUDE)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_EXE_SOURCE) /Fo$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj
-
-$(TARGET_EXE): $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_EXE_LIBS) $(TARGET_LIB)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_LIB)  $(TARGET_EXE_LIBS)
-
-#
-# Build LIB
-#
-
-$(TARGET_LIB): $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME)Lib.obj $(TARGET_LIB_LIBS)
-  $(LIB) $(LIB_FLAGS) $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME)Lib.obj /OUT:$(TARGET_LIB)
-
-$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME)Lib.obj:  $(TARGET_LIB_SOURCE) $(TARGET_LIB_INCLUDE)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_LIB_SOURCE) /Fo$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME)Lib.obj
-
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME)Lib.* del /q $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME)Lib.* > NUL
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del /q $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/GenTEImage/Makefile b/Tools/Source/TianoTools/GenTEImage/Makefile
deleted file mode 100644
index f731b6d34e..0000000000
--- a/Tools/Source/TianoTools/GenTEImage/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#/*++
-#  
-#  Copyright (c) 2002 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#  
-#  Module Name:
-#  
-#    makefile
-#    
-#  Abstract:
-#  
-#    makefile for building the GenTEImage utility.
-#  
-#--*/
-
-#
-# Make sure environmental variable EFI_SOURCE is set
-#
-!IFNDEF EFI_SOURCE
-!ERROR EFI_SOURCE environmental variable not set 
-!ENDIF
-
-#
-# Define the toolchain which is used to set build options and toolchain paths
-#
-TOOLCHAIN = TOOLCHAIN_MSVC
-
-!INCLUDE PlatformTools.env
-
-#
-# Target specific information
-#
-
-TARGET_NAME         = GenTEImage
-TARGET_SRC_DIR      = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj 
-
-LIBS      = $(TIANO_TOOLS_OUTPUT)\Common.lib
-
-INC_DEPS  = $(EDK_SOURCE)\Foundation\Efi\Include\EfiImage.h
-          
-#
-# Build the EXE by compiling the source files, then linking the resultant
-# object files together.
-#
-
-$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj : $(TARGET_SRC_DIR)\$(TARGET_NAME).c $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\$(TARGET_NAME).c /Fo$@
-
-$(TARGET_EXE): $(OBJECTS) $(TARGET_EXE_LIBS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/Makefile b/Tools/Source/TianoTools/SecApResetVectorFixup/Makefile
deleted file mode 100644
index 53e6be5b70..0000000000
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#/*++
-#   
-#  Copyright (c) 2005 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#   
-#  Module Name:  makefile
-#   
-#  Abstract:
-#   
-#    This file is used to build the EFI utility.
-#   
-#--*/
-
-#
-# Do this if you want to compile from this directory
-#
-!IFNDEF TOOLCHAIN
-TOOLCHAIN = TOOLCHAIN_MSVC
-!ENDIF
-
-!INCLUDE PlatformTools.env
-
-#
-# Target specific information
-#
-
-TARGET_NAME         = SecApResetVectorFixup
-TARGET_SOURCE_DIR   = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-TARGET_EXE_SOURCE   = $(TARGET_SOURCE_DIR)\$(TARGET_NAME).c
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj
-LIBS      = $(TIANO_TOOLS_OUTPUT)\Common.lib  
-
-#
-# Build EXE
-#
-
-$(OBJECTS) : $(TARGET_EXE_SOURCE) $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(TARGET_EXE_SOURCE) /Fo$@
-
-$(TARGET_EXE): $(OBJECTS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(OBJECTS) $(LIBS) /out:$(TARGET_EXE)
-
-clean:
-  @if exist $(EDK_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(EDK_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/SecFixup/Makefile b/Tools/Source/TianoTools/SecFixup/Makefile
deleted file mode 100644
index 6ae2ebd31a..0000000000
--- a/Tools/Source/TianoTools/SecFixup/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#/*++
-#   
-#  Copyright (c) 2001 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#   
-#  Module Name:  makefile
-#   
-#  Abstract:
-#   
-#    This file is used to build the EFI utility.
-#   
-#--*/
-
-#
-# Do this if you want to compile from this directory
-#
-!IFNDEF TOOLCHAIN
-TOOLCHAIN = TOOLCHAIN_MSVC
-!ENDIF
-
-!INCLUDE PlatformTools.env
-
-#
-# Target specific information
-#
-
-TARGET_NAME         = SecFixup
-TARGET_SOURCE_DIR   = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-TARGET_EXE          = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-TARGET_EXE_SOURCE   = $(TARGET_SOURCE_DIR)\$(TARGET_NAME).c
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-OBJECTS   = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj  
-
-#
-# Build EXE
-#
-
-$(OBJECTS) : $(TARGET_EXE_SOURCE) $(INC_DEPS)
-  $(CC) $(C_FLAGS) $(TARGET_EXE_SOURCE) /Fo$@
-
-$(TARGET_EXE): $(OBJECTS)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(OBJECTS) $(LIBS) /out:$(TARGET_EXE)
-
-clean:
-  @if exist $(EDK_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(EDK_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/SplitFile/Makefile b/Tools/Source/TianoTools/SplitFile/Makefile
deleted file mode 100644
index 3cd45f9b2d..0000000000
--- a/Tools/Source/TianoTools/SplitFile/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#/*++
-#   
-#  Copyright (c) 2001 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#   
-#  Module Name:  makefile
-#   
-#  Abstract:
-#   
-#    This file is used to build the EFI utility.
-#   
-#--*/
-
-#
-# Do this if you want to compile from this directory
-#
-!IFNDEF TOOLCHAIN
-TOOLCHAIN = TOOLCHAIN_MSVC
-!ENDIF
-
-!INCLUDE PlatformTools.env
-
-#
-# Define some macros we use here. Should get rid of them someday and 
-# get rid of the extra level of indirection.
-#
-COMMON_SOURCE      = $(EDK_TOOLS_COMMON)
-
-#
-# Common information
-#
-
-INC=$(INC)
-
-#
-# Target specific information
-#
-
-TARGET_NAME=SplitFile
-TARGET_SOURCE_DIR = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-
-TARGET_EXE = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-
-TARGET_EXE_SOURCE = "$(TARGET_SOURCE_DIR)\SplitFile.c"
-TARGET_EXE_INCLUDE = 
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-#
-# Build EXE
-#
-
-$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj: $(TARGET_EXE_SOURCE) $(TARGET_EXE_INCLUDE)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_EXE_SOURCE) /Fo$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj
-
-$(TARGET_EXE): $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_EXE_LIBS) $(TARGET_DLL)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_LIB)  $(TARGET_EXE_LIBS)
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/Strip/Makefile b/Tools/Source/TianoTools/Strip/Makefile
deleted file mode 100644
index f47a68fa5b..0000000000
--- a/Tools/Source/TianoTools/Strip/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#/*++
-#   
-#  Copyright (c) 2001 Intel Corporation.  All rights reserved.
-#
-#  This software and associated documentation (if any) is furnished under 
-#  a license and may only be used or copied in accordance with the terms 
-#  of the license.  Except as permitted by such license, no part of this 
-#  software or documentation may be reproduced, stored in a retrieval 
-#  system, or transmitted in any form or by any means without the express 
-#  written consent of Intel Corporation.
-#   
-#  Module Name:  makefile
-#   
-#  Abstract:
-#   
-#    This file is used to build the EFI utility.
-#   
-#--*/
-
-#
-# Do this if you want to compile from this directory
-#
-!IFNDEF TOOLCHAIN
-TOOLCHAIN = TOOLCHAIN_MSVC
-!ENDIF
-
-!INCLUDE PlatformTools.env
-
-#
-# Define some macros we use here. Should get rid of them someday and 
-# get rid of the extra level of indirection.
-#
-COMMON_SOURCE      = $(EDK_TOOLS_COMMON)
-
-#
-# Common information
-#
-
-INC=$(INC)
-
-#
-# Target specific information
-#
-
-TARGET_NAME=Strip
-TARGET_SOURCE_DIR = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-
-TARGET_EXE = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-
-TARGET_EXE_SOURCE = "$(TARGET_SOURCE_DIR)\Strip.c"
-TARGET_EXE_INCLUDE = 
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-#
-# Build EXE
-#
-
-$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj: $(TARGET_EXE_SOURCE) $(TARGET_EXE_INCLUDE)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_EXE_SOURCE) /Fo$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj
-
-$(TARGET_EXE): $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_EXE_LIBS) $(TARGET_DLL)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_LIB)  $(TARGET_EXE_LIBS)
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL
diff --git a/Tools/Source/TianoTools/ZeroDebugData/Makefile b/Tools/Source/TianoTools/ZeroDebugData/Makefile
deleted file mode 100644
index c20fd85d8c..0000000000
--- a/Tools/Source/TianoTools/ZeroDebugData/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#/*++
-#   
-#  Copyright (c) 2001 Intel Corporation
-#   
-#  Module Name:  makefile
-#   
-#  Abstract:
-#   
-#    This file is used to build the EFI utility.
-#   
-#--*/
-
-#
-# Do this if you want to compile from this directory
-#
-!IFNDEF TOOLCHAIN
-TOOLCHAIN = TOOLCHAIN_MSVC
-!ENDIF
-
-!INCLUDE PlatformTools.env
-
-#
-# Define some macros we use here. Should get rid of them someday and 
-# get rid of the extra level of indirection.
-#
-COMMON_SOURCE      = $(EDK_TOOLS_COMMON)
-
-#
-# Common information
-#
-
-INC=$(INC)
-
-#
-# Target specific information
-#
-
-TARGET_NAME=ZeroDebugData
-TARGET_SOURCE_DIR = $(TIANO_TOOLS_SOURCE)\$(TARGET_NAME)
-
-TARGET_EXE = $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).exe
-
-TARGET_EXE_SOURCE = "$(TARGET_SOURCE_DIR)\ZeroDebugData.c"
-TARGET_EXE_INCLUDE =
-
-#
-# Build targets
-#
-
-all: $(TARGET_EXE)
-
-#
-# Build EXE
-#
-
-$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj: $(TARGET_EXE_SOURCE)
-  $(CC) $(C_FLAGS) $(INC) $(TARGET_EXE_SOURCE) /Fo$(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj
-
-$(TARGET_EXE): $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_EXE_LIBS) $(TARGET_DLL)
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).obj $(TARGET_LIB)  $(TARGET_EXE_LIBS)
-
-clean:
-  @if exist $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(TIANO_TOOLS_OUTPUT)\$(TARGET_NAME).*