-//\r
-// Includes for EFI 1.1 build\r
-//\r
-// #include "Tiano.h" // required defines for Compress.h\r
-// #include "EfiImage.h" // for PE32 structure definitions\r
-// #include "Compress.h" // for compression function\r
-// Includes for Tiano build\r
-//\r
-#include <UefiBaseTypes.h>\r
-#include <EfiImage.h> // for PE32 structure definitions\r
-#include <EfiCompress.h>\r
-#include <CommonLib.h>\r
-#include <MultiPhase.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h> // for PE32 structure definitions\r
+#include <Common/MultiPhase.h>\r
+\r
+#include <IndustryStandard/pci22.h> // for option ROM header structures\r
+\r
+#include "EfiCompress.h"\r
+#include "CommonLib.h"\r