diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
index e8de00b1e3..c42865612a 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
@@ -19,7 +19,7 @@ Revision history:
 --*/
 
 // TODO: fix comment to add: Module Name: DECODE.C
-#include "undi32.h"
+#include "Undi32.h"
 
 
 //
diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c
index 90ec85de19..d425778e06 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c
@@ -21,7 +21,7 @@ Revision History
 
 --*/
 
-#include "undi32.h"
+#include "Undi32.h"
 
 static UINT8 basic_config_cmd[22] = {
                     22,        0x08,
diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c
index c9a217fe72..30056d91f2 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c
@@ -21,7 +21,7 @@ Revision History
 
 --*/
 
-#include "undi32.h"
+#include "Undi32.h"
 
 //
 // Global Variables
diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
index 7c219b637c..39dd3d6956 100644
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
@@ -319,12 +319,6 @@ Returns:
   PERF_START (0, "PlatformBds", "BDS", 0);
   PlatformBdsInit (PrivateData);
 
-  //
-  // Initialize the platform specific string and language
-  //
-  InitializeStringSupport ();
-  InitializeLanguage (TRUE);
-  InitializeFrontPage (FALSE);
   //
   // Set up the device list based on EFI 1.1 variables
   // process Driver#### and Load the driver's in the