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/StrGather/StrGather.c

@@ -24,9 +24,9 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-#include <CommonLib.h>
+#include <Common/UefiBaseTypes.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 <MultiPhase.h>
-#include <BaseLib.h>
+
+#include <Common/UefiBaseTypes.h>
+#include <Common/MultiPhase.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>