//\r
// Include common header file for this module.\r
//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
\r
//\r
// This size must be at or below the smallest cache size possible among all\r