ArmPkg/ArmLib: clean up library includes

Suspiciously, ArmLib's INF does not contain a [LibraryClasses]
section at all, but it turns out that all the library includes
it contains (except for ArmLib.h itself) are actually bogus so
let's just drop all of them. While at it, replace <Uefi.h> with
the more accurate <Base.h> for a BASE type module, and put the
includes in a consistent order.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c

@@ -7,11 +7,12 @@
 
 **/
 
-#include <Uefi.h>
+#include <Base.h>
-#include <Chipset/AArch64.h>
+
 #include <Library/ArmLib.h>
-#include <Library/BaseLib.h>
+
-#include <Library/IoLib.h>
+#include <Chipset/AArch64.h>
+
 #include "AArch64Lib.h"
 #include "ArmLibPrivate.h"
 

ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c

@@ -6,11 +6,13 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
-#include <Uefi.h>
+
-#include <Chipset/ArmV7.h>
+#include <Base.h>
+
 #include <Library/ArmLib.h>
-#include <Library/BaseLib.h>
+
-#include <Library/IoLib.h>
+#include <Chipset/ArmV7.h>
+
 #include "ArmV7Lib.h"
 #include "ArmLibPrivate.h"
 

ArmPkg/Library/ArmLib/ArmLib.c

@@ -10,8 +10,6 @@
 #include <Base.h>
 
 #include <Library/ArmLib.h>
-#include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 
 #include "ArmLibPrivate.h"