diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 22170581a0..5e24b5d487 100644
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -338,6 +338,11 @@ struct _LIST_ENTRY {
 ///
 #define NULL  ((VOID *) 0)
 
+//
+// Null character
+//
+#define CHAR_NULL             0x0000
+
 ///
 /// Maximum values for common UEFI Data Types
 ///
diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index 71dcb0bd13..ebe1c7e0cd 100644
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -46,7 +46,6 @@ typedef struct {
 //
 // Required unicode control chars
 //
-#define CHAR_NULL             0x0000
 #define CHAR_BACKSPACE        0x0008
 #define CHAR_TAB              0x0009
 #define CHAR_LINEFEED         0x000A
diff --git a/MdePkg/Library/BaseLib/FilePaths.c b/MdePkg/Library/BaseLib/FilePaths.c
index c8da6bb3ea..183b3234d3 100644
--- a/MdePkg/Library/BaseLib/FilePaths.c
+++ b/MdePkg/Library/BaseLib/FilePaths.c
@@ -10,10 +10,8 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
-#include  <Uefi/UefiBaseType.h>
 #include  <Library/BaseMemoryLib.h>
 #include  <Library/BaseLib.h>
-#include  <Protocol/SimpleTextIn.h>
 
 /**
   Removes the last directory or file entry in a path by changing the last