#include <stdlib.h>\r
#include <ctype.h>\r
\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
-\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/Capsule.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/FirmwareFileSystem.h> // for FV header GUID\r
+#include <Guid/Capsule.h>\r
+#include <Guid/FirmwareFileSystem.h> // for FV header GUID\r
+\r
+#include "CommonLib.h"\r
#include "EfiUtilityMsgs.h"\r
-#include "MultiPhase.h"\r
-#include "Capsule.h"\r
-#include "Guid/Capsule.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "FirmwareVolumeHeader.h"\r
-#include "FirmwareFileSystem.h" // for FV header GUID\r
-#include "Guid/FirmwareFileSystem.h" // for FV header GUID\r
+\r
#define MAX_PATH 256\r
#define PROGRAM_NAME "GenCapsuleHdr"\r
\r