#include <assert.h>\r
\r
/* MDE Headers */\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
#include <Common/EfiImage.h>\r
#include <Common/FirmwareVolumeImageFormat.h>\r
#include <Common/FirmwareFileSystem.h>\r
#include <Protocol/GuidedSectionExtraction.h>\r
\r
/* Tool Headers */\r
-#include <CommonLib.h>\r
-#include <Crc32.h>\r
-#include <EfiCompress.h>\r
-#include <EfiUtilityMsgs.h>\r
-#include <ParseInf.h>\r
+#include "CommonLib.h"\r
+#include "Crc32.h"\r
+#include "EfiCompress.h"\r
+#include "EfiUtilityMsgs.h"\r
+#include "ParseInf.h"\r
\r
//\r
// Module Coded to Tiano Coding Conventions\r