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/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 <Base.h>
-#include <CommonLib.h>
+#include <Common/UefiBaseTypes.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>