1. Removed the unnecessary #include statements and include files

2. Removed the unnecessary library and include path from MSA files


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@541 6f19259b-4bc3-4df7-8a09-765794883524

Tools/Source/TianoTools/Common/CommonLib.h

@@ -22,13 +22,7 @@ Abstract:
 #ifndef _EFI_COMMON_LIB_H
 #define _EFI_COMMON_LIB_H
 
-/*
+#include <Common/UefiBaseTypes.h>
-#include "TianoCommon.h"
-#include "TianoCommon.h"
-#include "PeiHob.h"
-*/
-#include <Base.h>
-#include <UefiBaseTypes.h>
 
 #ifndef _MAX_PATH
 #define _MAX_PATH 500

Tools/Source/TianoTools/Common/Crc32.h

@@ -19,22 +19,17 @@ Abstract:
   
 --*/
 
-/*
-#include "TianoCommon.h"
-*/
-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _CRC32_H
 #define _CRC32_H
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 CalculateCrc32 (
   IN  UINT8                             *Data,
   IN  UINTN                             DataSize,
   IN OUT UINT32                         *CrcOut
   )
-;
-
 /*++
 
 Routine Description:
@@ -54,4 +49,6 @@ Returns:
   EFI_INVALID_PARAMETER     - Data / CrcOut = NULL, or DataSize = 0
 
 --*/
+;
+
 #endif

Tools/Source/TianoTools/Common/EfiCompress.c

@@ -23,9 +23,6 @@ Abstract:
 
 --*/
 
-/*
-#include "TianoCommon.h"
-*/
 #include "EfiCompress.h"
 
 //

Tools/Source/TianoTools/Common/EfiCompress.h

@@ -19,13 +19,14 @@ Abstract:
   
 --*/
 
-#include <string.h>
-#include <stdlib.h>
-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _EFICOMPRESS_H
 #define _EFICOMPRESS_H
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 Compress (
   IN      UINT8   *SrcBuffer,

Tools/Source/TianoTools/Common/EfiCustomizedCompress.h

@@ -19,11 +19,11 @@ Abstract:
   
 --*/
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _EFICUSTOMIZEDCOMPRESS_H
 #define _EFICUSTOMIZEDCOMPRESS_H
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 SetCustomizedCompressionType (
   IN  CHAR8   *Type

Tools/Source/TianoTools/Common/EfiDecompress.h

@@ -18,11 +18,12 @@ Abstract:
   Header file for compression routine
   
 --*/
-#include <Base.h>
-#include <UefiBaseTypes.h>
 
 #ifndef _EFI_DECOMPRESS_H
 #define _EFI_DECOMPRESS_H
+
+#include <Common/UefiBaseTypes.h>
+
 EFI_STATUS
 GetInfo (
   IN      VOID    *Source,

Tools/Source/TianoTools/Common/EfiUtilityMsgs.c

@@ -25,9 +25,6 @@ Abstract:
 #include <ctype.h>
 #include <stdarg.h>
 
-/*
-#include "Tiano.h"
-*/
 #include "EfiUtilityMsgs.h"
 
 #define MAX_LINE_LEN  200

Tools/Source/TianoTools/Common/EfiUtilityMsgs.h

@@ -19,12 +19,11 @@ Abstract:
   
 --*/
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _EFI_UTILITY_MSGS_H_
 #define _EFI_UTILITY_MSGS_H_
 
+#include <Common/UefiBaseTypes.h>
+
 //
 // Status codes returned by EFI utility programs and functions
 //

Tools/Source/TianoTools/Common/FvLib.c

@@ -25,14 +25,6 @@ Abstract:
 #include "FvLib.h"
 #include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
-#include "MultiPhase.h"
-/*
-#include <CommonBuild.h>
-*/
-
-/*
-#include EFI_GUID_DEFINITION (FirmwareFileSystem)
-*/
 
 //
 // Module global variables

Tools/Source/TianoTools/Common/FvLib.h

@@ -25,18 +25,14 @@ Abstract:
 //
 // Include files
 //
-#include <Base.h>
+#include <string.h>
-#include <UefiBaseTypes.h>
+
+#include <Common/UefiBaseTypes.h>
 #include <Common/EfiImage.h>
 #include <Common/FirmwareVolumeImageFormat.h>
 #include <Common/FirmwareFileSystem.h>
 #include <Common/FirmwareVolumeHeader.h>
-/*
+#include <Common/MultiPhase.h>
-#include "TianoCommon.h"
-#include "EfiFirmwareVolumeHeader.h"
-#include "EfiFirmwareFileSystem.h"
-*/
-#include <string.h>
 
 EFI_STATUS
 InitializeFvLib (

Tools/Source/TianoTools/Common/MyAlloc.h

@@ -25,11 +25,8 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <Base.h>
 
-/*
+#include <Common/BaseTypes.h>
-#include "Tiano.h"
-*/
 
 //
 // Default operation is to use the memory allocation tracking functions.

Tools/Source/TianoTools/Common/ParseInf.c

@@ -19,11 +19,11 @@ Abstract:
 
 --*/
 
-#include "ParseInf.h"
 #include <assert.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include "ParseInf.h"
 
 #ifndef _MAX_PATH
 #define _MAX_PATH 500

Tools/Source/TianoTools/Common/ParseInf.h

@@ -22,11 +22,10 @@ Abstract:
 #ifndef _EFI_PARSE_INF_H
 #define _EFI_PARSE_INF_H
 
-/* #include "TianoCommon.h" */
-#include <Base.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <UefiBaseTypes.h>
+
+#include <Common/UefiBaseTypes.h>
 
 //
 // Common data structures

Tools/Source/TianoTools/Common/SimpleFileParsing.c

@@ -24,9 +24,6 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>
 
-/*
-#include "Tiano.h"
-*/
 #include "EfiUtilityMsgs.h"
 #include "SimpleFileParsing.h"
 

Tools/Source/TianoTools/Common/SimpleFileParsing.h

@@ -19,12 +19,11 @@ Abstract:
 
 --*/
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-
 #ifndef _SIMPLE_FILE_PARSING_H_
 #define _SIMPLE_FILE_PARSING_H_
 
+#include <Common/UefiBaseTypes.h>
+
 #define T_CHAR  char
 
 STATUS

Tools/Source/TianoTools/Common/build.xml

@@ -60,20 +60,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="ToolsLibrary" depends="init">
@@ -83,7 +83,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         optimize="speed">
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
 
       <fileset dir="${basedir}/Common" 

Tools/Source/TianoTools/CompressDll/CompressDll.c

@@ -32,14 +32,14 @@ JNIEXPORT jbyteArray JNICALL  Java_org_tianocore_framework_tasks_Compress_CallCo
    //
 
    Result = Compress (
-			  (char*) InputBuffer, 
+        (char*) InputBuffer, 
-			  SourceSize,  
+        SourceSize,  
-			  DestBuffer,
+        DestBuffer,
-			  &DestSize
+        &DestSize
-			  );
+        );
 
    if (Result = EFI_BUFFER_TOO_SMALL) {
-	   DestBuffer = malloc (DestSize);
+     DestBuffer = malloc (DestSize);
    }
 
    //
@@ -47,10 +47,10 @@ JNIEXPORT jbyteArray JNICALL  Java_org_tianocore_framework_tasks_Compress_CallCo
    //
    Result = Compress(
               (char*) InputBuffer, 
-			  SourceSize,  
+        SourceSize,  
-			  DestBuffer,
+        DestBuffer,
-			  &DestSize  
+        &DestSize  
-	   );
+     );
 
    //
    // new a MV array to store the return compressed buffer
@@ -80,7 +80,7 @@ DllMainCRTStartup(
     void*   Reserved    
 )
 {
-	return TRUE;
+  return TRUE;
 }
 #else
 #ifdef __GNUC__

Tools/Source/TianoTools/CompressDll/build.xml

@@ -10,22 +10,29 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->
 <project default="GenTool" basedir=".">
-  <!--EDK GenDepex Tool
+<!--
-  Copyright (c) 2006, Intel Corporation-->
+    EDK GenDepex Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+
   <property environment="env"/>
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>
   <property name="ToolName" value="CompressDll"/>
   <property name="LibName" value="CompressDll"/>
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>
+
   <taskdef resource="cpptasks.tasks"/>
   <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
   <property name="LINK_OUTPUT_TYPE" value="static"/>
   <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>
+
   <target name="GenTool" depends="init,Lib" >
     <echo message="Building the EDK Tool: ${ToolName}"/>
   </target>
+
   <target name="init">
     <echo message="The EDK Tool: ${ToolName}"/>
     <mkdir dir="${BUILD_DIR}"/>
@@ -83,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <includepath path="${env.JAVA_HOME}/include"/>
       <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>
@@ -94,12 +100,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>
   </target>
+
   <target name="clean" depends="init">
     <echo message="Removing Intermediate Files Only"/>
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
+
   <target name="cleanall" depends="init">
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>
     <delete dir="${BUILD_DIR}">

Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c

@@ -23,8 +23,8 @@ Abstract:
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "UefiBaseTypes.h"
+
-#include "Base.h"
+#include <Common/UefiBaseTypes.h>
 
 #define PROGRAM_NAME  "CreateMtFile"
 

Tools/Source/TianoTools/CreateMtFile/build.xml

@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c

@@ -19,8 +19,7 @@ Abstract:
   
 --*/
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
 
 EFI_STATUS
 SetCustomizedCompressionType (

Tools/Source/TianoTools/CustomizedCompress/build.xml

@@ -59,23 +59,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<property name="HOST_ARCH" value="IA32" />
+
-		<ToolChainSetup confPath="${WORKSPACE}/Tools/Conf" />
+    <echo message="ToolChain: ${ToolChain}"/>
-    <echo message="Compiler: ${CC}"/>
+    <if>
-		<if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <then>
-			<then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="ToolsLibrary" depends="init">
@@ -91,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
     </cc>
     <if>

Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c

@@ -25,8 +25,9 @@ Abstract:
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <UefiBaseTypes.h>
+
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
+
 #include "EfiCompress.h"
 
 int

Tools/Source/TianoTools/EfiCompress/build.xml

@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/EfiRom/EfiRom.c

@@ -25,24 +25,15 @@ Abstract:
 #include <string.h>
 #include <stdlib.h>
 
-//
+#include <Common/UefiBaseTypes.h>
-// Includes for EFI 1.1 build
+#include <Common/EfiImage.h>  // for PE32 structure definitions
-//
+#include <Common/MultiPhase.h>
-// #include "Tiano.h"        // required defines for Compress.h
+
-// #include "EfiImage.h"   // for PE32 structure definitions
+#include <IndustryStandard/pci22.h>  // for option ROM header structures
-// #include "Compress.h"   // for compression function
+
-// Includes for Tiano build
+#include "EfiCompress.h"
-//
+#include "CommonLib.h"
-#include <UefiBaseTypes.h>
-#include <EfiImage.h> // for PE32 structure definitions
-#include <EfiCompress.h>
-#include <CommonLib.h>
-#include <MultiPhase.h>
 
-//
-// END include differences
-//
-#include "pci22.h"  // for option ROM header structures
 //
 // Version of this utility
 //

Tools/Source/TianoTools/EfiRom/build.xml

@@ -93,11 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/IndustryStandard"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/FlashMap/FlashDefFile.c

@@ -24,16 +24,15 @@ Abstract:
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <UefiBaseTypes.h>
+
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
+#include <Common/FirmwareVolumeHeader.h>
+#include <Common/MultiPhase.h>
 
 #include "EfiUtilityMsgs.h"
 #include "FlashDefFile.h"
 #include "SimpleFileParsing.h"
 #include "Symbols.h"
-// #include "EfiFirmwareVolumeHeader.h"
-#include "MultiPhase.h"
-#include "FirmwareVolumeHeader.h"
 
 //
 // #include "TrackMallocFree.h"

Tools/Source/TianoTools/FlashMap/FlashMap.c

@@ -24,8 +24,8 @@ Abstract:
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <UefiBaseTypes.h>
+
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
 
 #include "EfiUtilityMsgs.h"
 #include "Microcode.h"

Tools/Source/TianoTools/FlashMap/Symbols.c

@@ -29,10 +29,9 @@ Abstract:
 //
 #include <ctype.h>
 
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <Base.h>
-#include <CommonLib.h>
 
+#include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
 #include "Symbols.h"
 

Tools/Source/TianoTools/FlashMap/build.xml

@@ -98,10 +98,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/FwImage/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -91,10 +91,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/FwImage/fwimage.c

@@ -19,7 +19,8 @@ Abstract:
 
 --*/
 
-#include <WinNtInclude.h>
+#include "WinNtInclude.h"
+
 #ifndef __GNUC__
 #include <windows.h>
 #endif
@@ -28,11 +29,11 @@ Abstract:
 #include <string.h>
 #include <time.h>
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+#include <Common/EfiImage.h>
-#include <CommonLib.h>
+
-#include <EfiImage.h>
+#include "CommonLib.h"
-#include <EfiUtilityMsgs.c>
+#include "EfiUtilityMsgs.c"
 
 #define UTILITY_NAME  "FwImage"
 

Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c

@@ -23,10 +23,10 @@ Abstract:
 #include <string.h>
 #include <stdlib.h>
 
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <Base.h>
+#include <Common/EfiImage.h> // for PE32 structure definitions
-#include <CommonLib.h>
+
-#include "EfiImage.h" // for PE32 structure definitions
+#include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
 
 //

Tools/Source/TianoTools/GenAcpiTable/build.xml

@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h

@@ -31,8 +31,7 @@ Abstract:
 #include <assert.h>
 
 /* MDE Headers */
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
 #include <Common/EfiImage.h>
 #include <Common/FirmwareVolumeImageFormat.h>
 #include <Common/FirmwareFileSystem.h>
@@ -40,11 +39,11 @@ Abstract:
 #include <Protocol/GuidedSectionExtraction.h>
 
 /* Tool Headers */
-#include <CommonLib.h>
+#include "CommonLib.h"
-#include <Crc32.h>
+#include "Crc32.h"
-#include <EfiCompress.h>
+#include "EfiCompress.h"
-#include <EfiUtilityMsgs.h>
+#include "EfiUtilityMsgs.h"
-#include <ParseInf.h>
+#include "ParseInf.h"
 
 //
 // Module Coded to Tiano Coding Conventions

Tools/Source/TianoTools/GenCRC32Section/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -89,10 +89,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="${FileSet}"/>
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
 
     </cc>
   </target>

Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c

@@ -28,18 +28,18 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <Base.h>
+#include <Common/MultiPhase.h>
-#include <CommonLib.h>
+#include <Common/Capsule.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Common/FirmwareVolumeHeader.h>
+#include <Common/FirmwareFileSystem.h>  // for FV header GUID
+#include <Guid/Capsule.h>
+#include <Guid/FirmwareFileSystem.h>  // for FV header GUID
 
+#include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
-#include "MultiPhase.h"
+
-#include "Capsule.h"
-#include "Guid/Capsule.h"
-#include "FirmwareVolumeImageFormat.h"
-#include "FirmwareVolumeHeader.h"
-#include "FirmwareFileSystem.h"  // for FV header GUID
-#include "Guid/FirmwareFileSystem.h"  // for FV header GUID
 #define MAX_PATH                  256
 #define PROGRAM_NAME              "GenCapsuleHdr"
 

Tools/Source/TianoTools/GenCapsuleHdr/build.xml

@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/GenDepex/GenDepex.c

@@ -728,11 +728,11 @@ Returns:
         Ptrx++;
       }
 
-	  Ptrx++;
+    Ptrx++;
       while (*Ptrx != '}') {
         Ptrx++;
       }
-	  //
+    //
       // Absorb the closing }
       //
       Ptrx++;

Tools/Source/TianoTools/GenDepex/GenDepex.h

@@ -30,9 +30,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __GNUC__
 #include <malloc.h>
 #endif
-#include <Base.h>
+
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <Dependency.h>
+#include <Common/Dependency.h>
 
 #define DEPENDENCY_START            "DEPENDENCY_START"
 #define OPERATOR_BEFORE             "BEFORE"

Tools/Source/TianoTools/GenDepex/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -90,12 +90,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="${FileSet}" />
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
-	</target>
+  </target>
 
   <target name="clean" depends="init">
     <echo message="Removing Intermediate Files Only"/>  

Tools/Source/TianoTools/GenFdImage/GenFdImage.h

@@ -33,10 +33,9 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-// #include <io.h>
 #include <assert.h>
+
 #include "ParseInf.h"
-// #include "GenFvImage.h"
 
 //
 // Defines

Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c

@@ -26,12 +26,11 @@ Intel Corporation.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-// #include <io.h>
 #include <assert.h>
-#include "UefiBaseTypes.h"
+
-#include "Base.h"
+#include <Common/UefiBaseTypes.h>
+
 #include "GenFdImage.h"
-// #include "GenFvImage.h"
 #include "ParseInf.h"
 
 //

Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c

@@ -20,17 +20,6 @@ Abstract:
 
 --*/
 
-#include "Base.h"
-#include "UefiBaseTypes.h"
-#include "FirmwareVolumeImageFormat.h"
-#include "FirmwareFileSystem.h"
-#include "FirmwareVolumeHeader.h"
-#include "FirmwareVolumeImageFormat.h"
-#include "ParseInf.h"
-#include "EfiCompress.h"
-#include "EfiCustomizedCompress.h"
-#include "Crc32.h"
-#include "GenFfsFile.h"
 #include <stdio.h>
 #include <ctype.h>  // for isalpha()
 //
@@ -41,6 +30,18 @@ Abstract:
 #endif
 #include <stdlib.h>
 #include <string.h>
+
+#include <Common/UefiBaseTypes.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Common/FirmwareFileSystem.h>
+#include <Common/FirmwareVolumeHeader.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+
+#include "ParseInf.h"
+#include "EfiCompress.h"
+#include "EfiCustomizedCompress.h"
+#include "Crc32.h"
+#include "GenFfsFile.h"
 #include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
 #include "SimpleFileParsing.h"

Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h

@@ -28,9 +28,9 @@ Abstract:
 //
 // External Files Referenced
 //
-#include "Base.h"
+#include <Common/UefiBaseTypes.h>
-#include "UefiBaseTypes.h"
+#include <Common/FirmwareVolumeImageFormat.h>
-#include "FirmwareVolumeImageFormat.h"
+
 #include "MyAlloc.h"
 
 #endif

Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c

@@ -24,8 +24,8 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "Base.h"
+#include <Common/UefiBaseTypes.h>
-#include "UefiBaseTypes.h"
+
 #include "EfiUtilityMsgs.h"
 #include "SimpleFileParsing.h"
 

Tools/Source/TianoTools/GenFfsFile/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c

@@ -23,8 +23,6 @@ Abstract:
 //
 // Include files
 //
-#define EFI_SPECIFICATION_VERSION 0x00020000
-#define EDK_RELEASE_VERSION       0x00020000
 #ifdef __GNUC__
 #include <uuid/uuid.h>
 #include <sys/stat.h>
@@ -34,19 +32,21 @@ Abstract:
 #include <io.h>
 #endif
 #include <assert.h>
-#include <Dxe.h>
+
-#include <Library/PeCoffLib.h>
+#include <Common/UefiBaseTypes.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Common/Variable.h>
+#include <Common/WorkingBlockHeader.h>
+#include <Guid/FirmwareFileSystem.h>
+
 #include "GenFvImageLib.h"
 #include "GenFvImageLibInternal.h"
-#include <CommonLib.h>
+#include "CommonLib.h"
-#include <FirmwareVolumeImageFormat.h>
+#include "Crc32.h"
-#include <Crc32.h>
+#include "EfiUtilityMsgs.h"
-#include <EfiUtilityMsgs.h>
+#include "FvLib.h"
-#include <FvLib.h>
+#include "EfiCompress.h"
-#include <EfiCompress.h>
+#include "WinNtInclude.h"
-#include <Variable.h>
-#include <WinNtInclude.h>
-#include <WorkingBlockHeader.h>
 
 
 //

Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h

@@ -26,7 +26,9 @@ Abstract:
 //
 // Include files
 //
-// #include "Efi2WinNT.h"
+#include <Common/UefiBaseTypes.h>
+#include <Common/MultiPhase.h>
+
 #include "ParseInf.h"
 
 //

Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h

@@ -26,10 +26,12 @@ Abstract:
 //
 // Include files
 //
-#include "GenFvImageLib.h"
 #include <stdlib.h>
-#include <CommonLib.h>
+
-#include "FirmwareVolumeHeader.h"
+#include <Common/FirmwareVolumeHeader.h>
+
+#include "CommonLib.h"
+#include "GenFvImageLib.h"
 
 //
 // Private data declarations

Tools/Source/TianoTools/GenFvImage/build.xml

@@ -123,14 +123,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${ToolName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
-      <includepath path="${PACKAGE_DIR}/Include/ToBeRemoved"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
+
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>
       <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>
       <syslibset libs="RpcRT4" unless="gcc"/>

Tools/Source/TianoTools/GenSection/GenSection.c

@@ -19,22 +19,21 @@ Abstract:
 
 --*/
 
-#include <Base.h>
+#include <stdio.h>
-#include <UefiBaseTypes.h>
+#include <stdlib.h>
-#include "FirmwareVolumeImageFormat.h"
+#include <string.h>
+
+#include <Common/UefiBaseTypes.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Protocol/GuidedSectionExtraction.h>
+
 #include "CommonLib.h"
 #include "EfiCompress.h"
 #include "EfiCustomizedCompress.h"
 #include "Crc32.h"
 #include "EfiUtilityMsgs.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "GenSection.h"
 
-#include <GuidedSectionExtraction.h>
 
 #define UTILITY_NAME            "GenSection"
 

Tools/Source/TianoTools/GenSection/GenSection.h

@@ -28,9 +28,8 @@ Abstract:
 //
 // External Files Referenced
 //
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+#include <Common/FirmwareVolumeImageFormat.h>
-#include "FirmwareVolumeImageFormat.h"
 
 typedef struct {
   EFI_GUID_DEFINED_SECTION  GuidSectionHeader;

Tools/Source/TianoTools/GenSection/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/GenTEImage/GenTEImage.c

@@ -24,11 +24,10 @@ Abstract:
 #include <string.h>
 #include <stdlib.h>
 
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <Base.h>
+#include <Common/EfiImage.h> // for PE32 structure definitions
-#include <CommonLib.h>
 
-#include "EfiImage.h" // for PE32 structure definitions
+#include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
 
 //

Tools/Source/TianoTools/GenTEImage/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/GuidChk/GuidList.c

@@ -39,14 +39,12 @@ Notes:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+#include <Guid/Apriori.h>
-#include <UgaDraw.h>
+#include <Guid/AcpiTableStorage.h>
+
 #include "EfiUtilityMsgs.h"
 
-#include <Apriori.h>
-#include <AcpiTableStorage.h>
-// #include <Bmp.h>
 
 #define GUID_XREF(varname, guid) { \
     #varname, #guid, guid \

Tools/Source/TianoTools/GuidChk/UtilsMsgs.c

@@ -25,8 +25,8 @@ Abstract:
 #include <ctype.h>
 #include <stdarg.h>
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+
 #include "EfiUtilityMsgs.h"
 
 #define MAX_LINE_LEN  200

Tools/Source/TianoTools/GuidChk/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init" unless="gcc">
@@ -93,12 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Guid"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
-			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
 
     </cc>
   </target>

Tools/Source/TianoTools/MakeDeps/MakeDeps.c

@@ -25,10 +25,10 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+
 #include "EfiUtilityMsgs.h"
-#include <CommonLib.h>
+#include "CommonLib.h"
 
 //
 // Structure to maintain a linked list of strings

Tools/Source/TianoTools/MakeDeps/build.xml

@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/ModifyInf/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools"/>
 
     </cc>
   </target>

Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c

@@ -22,11 +22,9 @@ Revision History
 --*/
 
 
-#define EFI_SPECIFICATION_VERSION    0x00000000
+#include <Common/UefiBaseTypes.h>
-#define EDK_RELEASE_VERSION          0x00020000
+#include <Common/EfiImage.h>
-#include <Base.h>
 #include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
 
 STATIC
 RETURN_STATUS
@@ -600,11 +598,11 @@ Returns:
     //
     RelocDir = &TeHdr->DataDirectory[0];
     RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(
-		                                ImageContext->ImageAddress + 
+                                    ImageContext->ImageAddress + 
-		                                RelocDir->VirtualAddress +
+                                    RelocDir->VirtualAddress +
-		                                sizeof(EFI_TE_IMAGE_HEADER) - 
+                                    sizeof(EFI_TE_IMAGE_HEADER) - 
-		                                TeHdr->StrippedSize
+                                    TeHdr->StrippedSize
-		                                );
+                                    );
     RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);
   }
   
@@ -620,10 +618,10 @@ Returns:
       FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);
     } else {
       FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +
-	  	              RelocBase->VirtualAddress +
+                    RelocBase->VirtualAddress +
-	  	              sizeof(EFI_TE_IMAGE_HEADER) - 
+                    sizeof(EFI_TE_IMAGE_HEADER) - 
-	  	              TeHdr->StrippedSize
+                    TeHdr->StrippedSize
-	  	              );
+                    );
     }
 
     if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||
@@ -836,9 +834,9 @@ Returns:
     TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);
 
     FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
-		      (UINTN)ImageContext->ImageAddress +
+          (UINTN)ImageContext->ImageAddress +
-		      sizeof(EFI_TE_IMAGE_HEADER)
+          sizeof(EFI_TE_IMAGE_HEADER)
-		      );
+          );
     NumberOfSections  = (UINTN) (TeHdr->NumberOfSections);
 
   }
@@ -933,9 +931,9 @@ Returns:
                                                                 );
   } else {
     ImageContext->EntryPoint =  (PHYSICAL_ADDRESS) (
-		                   (UINTN)ImageContext->ImageAddress +
+                       (UINTN)ImageContext->ImageAddress +
-		                   (UINTN)TeHdr->AddressOfEntryPoint +
+                       (UINTN)TeHdr->AddressOfEntryPoint +
-		                   (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+                       (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
           (UINTN) TeHdr->StrippedSize
       );
   }
@@ -976,11 +974,11 @@ Returns:
                     );
     } else {
       DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(
-	  	                                         ImageContext->ImageAddress +
+                                               ImageContext->ImageAddress +
-	  	                                         ImageContext->DebugDirectoryEntryRva +
+                                               ImageContext->DebugDirectoryEntryRva +
-	  	                                         sizeof(EFI_TE_IMAGE_HEADER) -
+                                               sizeof(EFI_TE_IMAGE_HEADER) -
-	  	                                         TeHdr->StrippedSize
+                                               TeHdr->StrippedSize
-	  	                                         );
+                                               );
     }
 
     if (DebugEntry != NULL) {
@@ -999,9 +997,9 @@ Returns:
           ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);
         } else {
           ImageContext->CodeView = (VOID *)(
-		  	              (UINTN)ImageContext->ImageAddress +
+                      (UINTN)ImageContext->ImageAddress +
-		  	              (UINTN)TempDebugEntryRva +
+                      (UINTN)TempDebugEntryRva +
-		  	              (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+                      (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
                 (UINTN) TeHdr->StrippedSize
             );
         }

Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h

@@ -1,19 +1,19 @@
 /** @file
-	EFI image format for PE32+. Please note some data structures are different
+  EFI image format for PE32+. Please note some data structures are different
-	for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64
+  for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64
 
-	@bug Fix text - doc as defined in MSFT EFI specification.
+  @bug Fix text - doc as defined in MSFT EFI specification.
 
-	Copyright (c) 2006, Intel Corporation                                                         
+  Copyright (c) 2006, Intel Corporation                                                         
-	All rights reserved. This program and the accompanying materials                          
+  All rights reserved. This program and the accompanying materials                          
-	are licensed and made available under the terms and conditions of the BSD License         
+  are licensed and made available under the terms and conditions of the BSD License         
-	which accompanies this distribution.  The full text of the license may be found at        
+  which accompanies this distribution.  The full text of the license may be found at        
-	http://opensource.org/licenses/bsd-license.php                                            
+  http://opensource.org/licenses/bsd-license.php                                            
 
-	THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-	WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-	Module Name:	EfiImage.h
+  Module Name:  EfiImage.h
 
 **/
 

Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c

@@ -21,15 +21,7 @@ Revision History
 
 --*/
 
-
+#include <Common/UefiBaseTypes.h>
-#define EFI_SPECIFICATION_VERSION    0x00000000
-#define EDK_RELEASE_VERSION          0x00020000
-#include <Base.h>
-#include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
-
-
-
 
 RETURN_STATUS
 PeCoffLoaderRelocateImageEx (

Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c

@@ -22,11 +22,9 @@ Revision History
 
 --*/
 
-#define EFI_SPECIFICATION_VERSION    0x00000000
+#include <Common/UefiBaseTypes.h>
-#define EDK_RELEASE_VERSION          0x00020000
+#include <Common/EfiImage.h>
-#include <Base.h>
 #include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
 
 
 

Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c

@@ -22,11 +22,9 @@ Revision History
 
 --*/
 
-#define EFI_SPECIFICATION_VERSION    0x00000000
+#include <Common/UefiBaseTypes.h>
-#define EDK_RELEASE_VERSION          0x00020000
+#include <Common/EfiImage.h>
-#include <Base.h>
 #include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
 
 
 

Tools/Source/TianoTools/PeCoffLoader/build.xml

@@ -125,11 +125,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>
@@ -150,11 +146,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>
@@ -175,11 +167,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>

Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c

@@ -22,19 +22,18 @@ Abstract:
 
 --*/
 
-#include <UefiBaseTypes.h>
-#include <Base.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "CommonLib.h"
+
+#include <Common/UefiBaseTypes.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Common/FirmwareFileSystem.h>
+#include <Library/PeCoffLib.h>
+
 #include "ParseInf.h"
 #include "FvLib.h"
-
 #include "EfiUtilityMsgs.h"
-#include "FirmwareFileSystem.h"
-#include "PeCoffLib.h"
-
 #include "PeiRebaseExe.h"
 
 EFI_STATUS

Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h

@@ -23,10 +23,10 @@ Abstract:
 #ifndef _EFI_PEIM_FIXUP_EXE_H
 #define _EFI_PEIM_FIXUP_EXE_H
 
-// #include "Efi2WinNt.h"
+#include <Common/FirmwareVolumeImageFormat.h>
-#include "FirmwareFileSystem.h"
+#include <Common/FirmwareFileSystem.h>
-#include "FirmwareVolumeHeader.h"
+#include <Common/FirmwareVolumeHeader.h>
-#include "MultiPhase.h"
+#include <Common/MultiPhase.h>
 
 //
 // Utility Name

Tools/Source/TianoTools/PeiRebase/build.xml

@@ -63,22 +63,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="PeiRebase_Ia32" depends="init">
@@ -92,11 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ia32"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ia32"/>
     </cc>
   </target>
 
@@ -111,11 +108,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ipf"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ipf"/>
     </cc>
   </target>
 
@@ -130,11 +124,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_X64"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_X64"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c

@@ -314,7 +314,7 @@ Returns:
     Error (NULL, 0, 0, "The position to place Ap reset vector is not in E and F segment!", NULL);
     free ((VOID *)FileBufferRaw);
     return STATUS_ERROR; 
-  }  	
+  }    
   //
   // Fix up Ap reset vector and calculate the IPI vector
   //

Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h

@@ -25,12 +25,13 @@ Abstract:
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <UefiBaseTypes.h>
+
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include "EfiImage.h"
+#include <Common/EfiImage.h>
-#include <FirmwareVolumeImageFormat.h>
+#include <Common/FirmwareVolumeImageFormat.h>
-#include "FirmwareFileSystem.h"
+#include <Common/FirmwareFileSystem.h>
-#include "FirmwareVolumeHeader.h"
+#include <Common/FirmwareVolumeHeader.h>
+
 #include "EfiUtilityMsgs.c"
 #include "CommonLib.h"
 

Tools/Source/TianoTools/SecApResetVectorFixup/build.xml

@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/SecFixup/SecFixup.c

@@ -28,12 +28,11 @@ Abstract:
 
 #include <stdio.h>
 
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <Base.h>
+#include <Common/EfiImage.h>
-#include "EfiImage.h"
+#include <Common/FirmwareVolumeImageFormat.h>
-#include "FirmwareVolumeImageFormat.h"
-#include "EfiUtilityMsgs.c"
 
+#include "EfiUtilityMsgs.c"
 #include "SecFixup.h"
 
 VOID

Tools/Source/TianoTools/SecFixup/build.xml

@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/SetStamp/build.xml

@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>
     </else>
     </if>
-		<if>
+    <if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
+      </then>
-			<elseif>
+      <elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
+        </then>
-			</elseif>
+      </elseif>
-		</if>
+    </if>
   </target>
 
   <target name="Tool" depends="init">
@@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-			<libset dir="${LIB_DIR}" libs="CommonTools"/>
 
     </cc>
   </target>

Tools/Source/TianoTools/SplitFile/build.xml

@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/StrGather/StrGather.c

@@ -24,9 +24,9 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+
-#include <CommonLib.h>
+#include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
 #include "StrGather.h"
 #include "StringDB.h"

Tools/Source/TianoTools/StrGather/StringDB.c

@@ -23,18 +23,17 @@ Abstract:
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>  // for tolower()
-#include <Base.h>
+
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <MultiPhase.h>
+#include <Common/MultiPhase.h>
-#include <BaseLib.h>
+#include <Common/InternalFormRepresentation.h>
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition
+#include <Protocol/Hii.h>
+
 #include "EfiUtilityMsgs.h"
 #include "StrGather.h"
 #include "StringDB.h"
-#include "InternalFormRepresentation.h"
 
-// #include EFI_PROTOCOL_DEFINITION (Hii)
-#include <UgaDraw.h>
-#include <Hii.h>
 
 #define STRING_OFFSET RELOFST
 

Tools/Source/TianoTools/StrGather/build.xml

@@ -95,11 +95,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress String"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools String"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/String/PrintLib.c

@@ -14,10 +14,10 @@
 
 **/
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+#include <Library/PrintLib.h>
-#include <PrintLib.h>
+
-#include <CommonLib.h>
+#include "CommonLib.h"
 #include "PrintLibInternal.h"
 
 typedef struct {

Tools/Source/TianoTools/String/PrintLibInternal.c

@@ -14,11 +14,10 @@
 
 **/
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+#include <Library/PrintLib.h>
-#include <PrintLib.h>
+
-#include <BaseLib.h>
+#include "CommonLib.h"
-#include <CommonLib.h>
 #include "PrintLibInternal.h"
 
 static CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};

Tools/Source/TianoTools/String/String.c

@@ -15,13 +15,10 @@
 **/
 
 #include <assert.h>
-#include <Base.h>
+
-#include <UefiBaseTypes.h>
+#include <Common/UefiBaseTypes.h>
-#include <BaseLib.h>
+
-#include <PcdLib.h>
+#include "CommonLib.h"
-#include <CommonLib.h>
-#define _gPcd_FixedAtBuild_PcdMaximumUnicodeStringLength   0
-#define _gPcd_FixedAtBuild_PcdMaximumAsciiStringLength   0
 
 /**
   Copies one Null-terminated Unicode string to another Null-terminated Unicode
@@ -34,8 +31,6 @@
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
   If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated Unicode string.
   @param  Source      Pointer to a Null-terminated Unicode string.
@@ -87,8 +82,6 @@ StrCpy (
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
   If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated Unicode string.
   @param  Source      Pointer to a Null-terminated Unicode string.
@@ -130,7 +123,6 @@ StrnCpy (
     Length--;
   }
 
-  // ZeroMem (Destination, Length * sizeof (*Destination));
   memset (Destination, 0, Length * sizeof (*Destination));
   return ReturnValue;
 }
@@ -142,8 +134,6 @@ StrnCpy (
   Unicode string specified by String.
 
   If String is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  String  Pointer to a Null-terminated Unicode string.
 
@@ -161,13 +151,7 @@ StrLen (
   ASSERT (String != NULL);
 
   for (Length = 0; *String != L'\0'; String++, Length++) {
-    //
+    ;
-    // If PcdMaximumUnicodeStringLength is not zero,
-    // length should not more than PcdMaximumUnicodeStringLength
-    //
-    if (FixedPcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumUnicodeStringLength));
-    }
   }
   return Length;
 }
@@ -180,8 +164,6 @@ StrLen (
   string specified by String.
 
   If String is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  String  Pointer to a Null-terminated Unicode string.
 
@@ -209,10 +191,6 @@ StrSize (
 
   If FirstString is NULL, then ASSERT().
   If SecondString is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  FirstString   Pointer to a Null-terminated Unicode string.
   @param  SecondString  Pointer to a Null-terminated Unicode string.
@@ -229,7 +207,7 @@ StrCmp (
   )
 {
   //
-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength
+  // ASSERT both strings should never be zero
   //
   ASSERT (StrSize (FirstString) != 0);
   ASSERT (StrSize (SecondString) != 0);
@@ -254,10 +232,6 @@ StrCmp (
 
   If FirstString is NULL, then ASSERT().
   If SecondString is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  FirstString   Pointer to a Null-terminated Unicode string.
   @param  SecondString  Pointer to a Null-terminated Unicode string.
@@ -280,8 +254,7 @@ StrnCmp (
   }
 
   //
-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength.
+  // ASSERT both strings should never be zero
-  // Length tests are performed inside StrLen().
   //
   ASSERT (StrSize (FirstString) != 0);
   ASSERT (StrSize (SecondString) != 0);
@@ -310,13 +283,6 @@ StrnCmp (
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
   If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
-  and Source results in a Unicode string with more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated Unicode string.
   @param  Source      Pointer to a Null-terminated Unicode string.
@@ -335,7 +301,6 @@ StrCat (
 
   //
   // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
   //
   ASSERT (StrSize (Destination) != 0);
   return Destination;
@@ -357,13 +322,6 @@ StrCat (
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
   If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
-  and Source results in a Unicode string with more than
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated Unicode string.
   @param  Source      Pointer to a Null-terminated Unicode string.
@@ -385,7 +343,6 @@ StrnCat (
 
   //
   // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
   //
   ASSERT (StrSize (Destination) != 0);
   return Destination;
@@ -402,8 +359,6 @@ StrnCat (
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
   If Source and Destination overlap, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated ASCII string.
   @param  Source      Pointer to a Null-terminated ASCII string.
@@ -454,8 +409,6 @@ AsciiStrCpy (
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
   If Source and Destination overlap, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated ASCII string.
   @param  Source      Pointer to a Null-terminated ASCII string.
@@ -508,8 +461,6 @@ AsciiStrnCpy (
   ASCII string specified by String.
 
   If String is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and String contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
 
   @param  String  Pointer to a Null-terminated ASCII string.
 
@@ -527,13 +478,7 @@ AsciiStrLen (
   ASSERT (String != NULL);
 
   for (Length = 0; *String != '\0'; String++, Length++) {
-    //
+    ;
-    // If PcdMaximumUnicodeStringLength is not zero,
-    // length should not more than PcdMaximumUnicodeStringLength
-    //
-    if (FixedPcdGet32 (PcdMaximumAsciiStringLength) != 0) {
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumAsciiStringLength));
-    }
   }
   return Length;
 }
@@ -546,8 +491,6 @@ AsciiStrLen (
   specified by String.
 
   If String is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and String contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
 
   @param  String  Pointer to a Null-terminated ASCII string.
 
@@ -575,10 +518,6 @@ AsciiStrSize (
 
   If FirstString is NULL, then ASSERT().
   If SecondString is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
 
   @param  FirstString   Pointer to a Null-terminated ASCII string.
   @param  SecondString  Pointer to a Null-terminated ASCII string.
@@ -595,7 +534,7 @@ AsciiStrCmp (
   )
 {
   //
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
+  // ASSERT both strings should never be zero
   //
   ASSERT (AsciiStrSize (FirstString));
   ASSERT (AsciiStrSize (SecondString));
@@ -631,10 +570,6 @@ AsciiToUpper (
 
   If FirstString is NULL, then ASSERT().
   If SecondString is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
 
   @param  FirstString   Pointer to a Null-terminated ASCII string.
   @param  SecondString  Pointer to a Null-terminated ASCII string.
@@ -653,7 +588,7 @@ AsciiStriCmp (
   )
 {
   //
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
+  // ASSERT both strings should never be zero
   //
   ASSERT (AsciiStrSize (FirstString));
   ASSERT (AsciiStrSize (SecondString));
@@ -680,10 +615,6 @@ AsciiStriCmp (
 
   If FirstString is NULL, then ASSERT().
   If SecondString is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
 
   @param  FirstString   Pointer to a Null-terminated ASCII string.
   @param  SecondString  Pointer to a Null-terminated ASCII string.
@@ -701,7 +632,7 @@ AsciiStrnCmp (
   )
 {
   //
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
+  // ASSERT both strings should never be zero
   //
   ASSERT (AsciiStrSize (FirstString));
   ASSERT (AsciiStrSize (SecondString));
@@ -727,13 +658,6 @@ AsciiStrnCmp (
 
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and Destination contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and concatenating Destination and
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength
-  ASCII characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated ASCII string.
   @param  Source      Pointer to a Null-terminated ASCII string.
@@ -752,7 +676,6 @@ AsciiStrCat (
 
   //
   // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
   //
   ASSERT (AsciiStrSize (Destination) != 0);
   return Destination;
@@ -774,13 +697,6 @@ AsciiStrCat (
   If Destination is NULL, then ASSERT().
   If Source is NULL, then ASSERT().
   If Source and Destination overlap, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and Destination contains more
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and concatenating Destination and
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength
-  ASCII characters, then ASSERT().
 
   @param  Destination Pointer to a Null-terminated ASCII string.
   @param  Source      Pointer to a Null-terminated ASCII string.
@@ -802,7 +718,6 @@ AsciiStrnCat (
 
   //
   // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
   //
   ASSERT (AsciiStrSize (Destination) != 0);
   return Destination;

Tools/Source/TianoTools/String/build.xml

@@ -116,11 +116,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>

Tools/Source/TianoTools/Strip/Strip.c

@@ -82,7 +82,7 @@ Returns:
 
   fseek (InFile, 0, SEEK_SET);
 
-  Buffer = malloc (FileSize);
+  Buffer = (char *) malloc (FileSize);
   if (Buffer == NULL) {
     printf ("Error: Out of resources.\n");
     return -1;

Tools/Source/TianoTools/Strip/build.xml

@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/VfrCompile/EfiVfr.h

@@ -23,11 +23,11 @@ Abstract:
 #ifndef _EFI_VFR_H_
 #define _EFI_VFR_H_
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-#include "InternalFormRepresentation.h"
 #include <string.h>
 
+#include <Common/UefiBaseTypes.h>
+#include <Common/InternalFormRepresentation.h>
+
 //
 // This number should be incremented with each change to the VFR compiler.
 // We write the version to the output list file for debug purposes.

Tools/Source/TianoTools/VfrCompile/VfrCompile.g

@@ -21,15 +21,16 @@ Abstract:
 
 #header<<
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+#include <Common/MultiPhase.h>
-#include <CommonLib.h>
+#include <Common/InternalFormRepresentation.h>
-#include <MultiPhase.h>
+#include <Protocol/UgaDraw.h>
+#include <Protocol/Hii.h>
+
+#include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
 #include "EfiVfr.h"
 #include "VfrServices.h"
-#include <UgaDraw.h>
-#include <Hii.h>
 
 #include <ctype.h>
 #ifndef __GNUC__

Tools/Source/TianoTools/VfrCompile/VfrServices.cpp

@@ -22,15 +22,16 @@ Abstract:
 #include <stdio.h>    // for FILE routines
 #include <stdlib.h>   // for malloc() and free()
 
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
-#include <UefiBaseTypes.h>
+#include <Common/MultiPhase.h>
-#include <MultiPhase.h>
+#include <Common/InternalFormRepresentation.h>
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition
+#include <Protocol/Hii.h>
+
 #include "EfiUtilityMsgs.h"
 #include "EfiVfr.h"
 #include "VfrServices.h"
 
-#include <UgaDraw.h>
-#include <Hii.h>
 
 static const char *mSourceFileHeader[] = {
   "//",

Tools/Source/TianoTools/VfrCompile/build.xml

@@ -77,25 +77,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </then>
       </elseif>
     </if>
-		<condition property="CheckDepends">
+    <condition property="CheckDepends">
-		  <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
+      <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
-			  <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" 
+        <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" 
         includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>
-			</uptodate>
+      </uptodate>
-		</condition>
+    </condition>
 
     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">
       <os family="mac"/>
-	</condition>
+  </condition>
-		
+    
     <condition property="gxx_extra_libs" value="stdc++">
       <os name="linux"/>
-	</condition>
+  </condition>
-		
+    
     <condition property="gxx_extra_libs" value="stdc++">
       <os family="windows"/>
-	</condition>
+  </condition>
-		
+    
   </target>
 
   <target name="Antlr" depends="init" unless="CheckDepends">
@@ -122,11 +122,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <fileset dir="${basedir}/Pccts/h" 
         includes="${FileSetPccts}" />
 
-      <includepath path="${env.WORKSPACE}/Tools/Source/TianoTools/Pccts/h"/>
+      <includepath path="${PACKAGE_DIR}/Pccts/h"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
       <syslibset libs="${gxx_extra_libs}" if="gcc"/>

Tools/Source/TianoTools/ZeroDebugData/build.xml

@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
     </cc>
   </target>
 

Tools/Source/TianoTools/build.xml

@@ -65,8 +65,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </else>
     </if>
 
-    <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />
-    
     <if>
         <isset property="env.TOOL_CHAIN" />
       <then>