\r
#include <stdio.h>\r
#include <stdlib.h>\r
-#include "EfiCommon.h"\r
-#include "EfiImage.h"\r
-#include "EfiImageFormat.h"\r
-#include "EfiFirmwareFileSystem.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+\r
#include "EfiUtilityMsgs.c"\r
#include "CommonLib.h"\r
\r