\r
--*/\r
\r
-#include <WinNtInclude.h>\r
+#include "WinNtInclude.h"\r
+\r
#ifndef __GNUC__\r
#include <windows.h>\r
#endif\r
#include <string.h>\r
#include <time.h>\r
\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <CommonLib.h>\r
-#include <EfiImage.h>\r
-#include <EfiUtilityMsgs.c>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+\r
+#include "CommonLib.h"\r
+#include "EfiUtilityMsgs.c"\r
\r
#define UTILITY_NAME "FwImage"\r
\r