//\r
// Include files\r
//\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <string.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 "TianoCommon.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
-#include "EfiFirmwareFileSystem.h"\r
-*/\r
-#include <string.h>\r
+#include <Common/MultiPhase.h>\r
\r
EFI_STATUS\r
InitializeFvLib (\r