diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
index 0fe62f2f53..c0f3bfb4c2 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
@@ -12,10 +12,9 @@
 *
 **/
 
-#include <Uefi.h>
-#include <Library/IoLib.h>
+#include <Base.h>
 #include <Library/ArmGicLib.h>
-#include <Library/PcdLib.h>
+#include <Library/IoLib.h>
 
 UINTN
 EFIAPI
@@ -120,3 +119,13 @@ ArmGicIsInterruptEnabled (
 
   return ((MmioRead32 (GicDistributorBase + ARM_GIC_ICDISER + (4 * RegOffset)) & (1 << RegShift)) != 0);
 }
+
+VOID
+EFIAPI
+ArmGicDisableDistributor (
+  IN  INTN          GicDistributorBase
+  )
+{
+  // Disable Gic Distributor
+  MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x0);
+}
diff --git a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c b/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c
index 0bbc509550..3ff9b4888c 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2014, ARM Limited. All rights reserved.
+*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.
 *
 *  This program and the accompanying materials
 *  are licensed and made available under the terms and conditions of the BSD License
@@ -53,13 +53,3 @@ ArmGicEnableDistributor (
    */
   MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x1);
 }
-
-VOID
-EFIAPI
-ArmGicDisableDistributor (
-  IN  INTN          GicDistributorBase
-  )
-{
-  // Disable Gic Distributor
-  MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x0);
-}