-#include "EfiCapsule.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
-#include "EfiFirmwareFileSystem.h" // for FV header GUID\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