#include <stdlib.h>\r
#include <ctype.h>\r
\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
+\r
#include "EfiUtilityMsgs.h"\r
-#include <CommonLib.h>\r
+#include "CommonLib.h"\r
\r
//\r
// Structure to maintain a linked list of strings\r