#include <string.h>\r
#include <stdlib.h>\r
\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
-#include "EfiImage.h" // for PE32 structure definitions\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h> // for PE32 structure definitions\r
+\r
+#include "CommonLib.h"\r
#include "EfiUtilityMsgs.h"\r
\r
//\r