#include <stdio.h>\r
#include <string.h>\r
#include <stdlib.h>\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/MultiPhase.h>\r
\r
#include "EfiUtilityMsgs.h"\r
#include "FlashDefFile.h"\r
#include "SimpleFileParsing.h"\r
#include "Symbols.h"\r
-// #include "EfiFirmwareVolumeHeader.h"\r
-#include "MultiPhase.h"\r
-#include "FirmwareVolumeHeader.h"\r
\r
//\r
// #include "TrackMallocFree.h"\r