5 files changed, 7 insertions, 20 deletions
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 8fa70ab14a..696065ae75 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
@@ -37,11 +37,7 @@ Abstract:
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiLib.h>
 #include <Library/BaseLib.h>
-
-//
-// BugBug: We need relcate the head file.
-//
-#include <Common/Variable.h>
+#include <VariableFormat.h>
 
 #define VARIABLE_STORE_SIZE (64 * 1024)
 #define SCRATCH_SIZE        (4 * 1024)
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.h b/MdeModulePkg/Universal/Variable/Pei/Variable.h
index 9747a8d426..7155cda73c 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.h
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.h
@@ -30,12 +30,7 @@ Abstract:
 #include <Library/PcdLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesTablePointerLib.h>
-
-
-//
-// BugBug: We need relcate the head file.
-//
-#include <Common/Variable.h>
+#include <VariableFormat.h>
 
 //
 // Define GET_PAD_SIZE to optimize compiler
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 784a1987a8..8f546bddb3 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -21,7 +21,7 @@ Revision History
 
 
 #include "Variable.h"
-#include <Common/FlashMap.h>
+#include <Guid/FlashMapHob.h>
 
 //
 // Don't use module globals after the SetVirtualAddress map is signaled
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index 904a681c33..1eb477eb26 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -37,13 +37,9 @@ Abstract:
 #include <Library/BaseLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/HobLib.h>
-#include <Common/FlashMap.h>
 #include <Guid/FlashMapHob.h>
-
-//
-// BugBug: We need relcate the head file.
-//
-#include <Common/Variable.h>
+#include <Guid/FlashMapHob.h>
+#include <VariableFormat.h>
 
 #define VARIABLE_RECLAIM_THRESHOLD (1024)
 
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/reclaim.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/reclaim.c
index 0adaa8787c..dd43493f3e 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/reclaim.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/reclaim.c
@@ -23,8 +23,8 @@ Revision History
 --*/
 
 
-#include <Variable.h>
-#include "Common/Variable.h"
+#include "Variable.h"
+#include <VariableFormat.h>
 
 EFI_STATUS
 GetFvbHandleByAddress (