2 files changed, 18 insertions, 18 deletions
diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/Source/TianoTools/FwImage/build.xml
index dc493855ab..6bccbd2d5a 100644
--- a/Tools/Source/TianoTools/FwImage/build.xml
+++ b/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>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <then>
         <property name="ext_static" value=".lib"/>
         <property name="ext_dynamic" value=".dll"/>
         <property name="ext_exe" value=".exe"/>
-			</then>
-			<elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
+      </then>
+      <elseif>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
+        <then>
           <property name="ext_static" value=".a"/>
           <property name="ext_dynamic" value=".so"/>
           <property name="ext_exe" value=""/>
-				</then>
-			</elseif>
-		</if>
+        </then>
+      </elseif>
+    </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>
 
diff --git a/Tools/Source/TianoTools/FwImage/fwimage.c b/Tools/Source/TianoTools/FwImage/fwimage.c
index e2e0d49b9f..b8fd1e1c33 100644
--- a/Tools/Source/TianoTools/FwImage/fwimage.c
+++ b/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 <UefiBaseTypes.h>
-#include <CommonLib.h>
-#include <EfiImage.h>
-#include <EfiUtilityMsgs.c>
+#include <Common/UefiBaseTypes.h>
+#include <Common/EfiImage.h>
+
+#include "CommonLib.h"
+#include "EfiUtilityMsgs.c"
 
 #define UTILITY_NAME  "FwImage"