-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include "EfiImage.h"\r
-#include <FirmwareVolumeImageFormat.h>\r
-#include "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.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