OvmfPkg/AcpiPlatformDxe: sort #includes and [LibraryClasses]

Place all public #includes first, all module-private #includes second.
Separate them with a single empty line. Keep each section sorted in
itself.

Sort all sections in both INF files.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-8-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h

@@ -9,20 +9,17 @@
 #ifndef ACPI_PLATFORM_H_
 #define ACPI_PLATFORM_H_
 
+#include <IndustryStandard/Acpi.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/XenPlatformLib.h>
 #include <PiDxe.h>
-
 #include <Protocol/AcpiTable.h>
 #include <Protocol/FirmwareVolume2.h>
 #include <Protocol/PciIo.h>
 
-#include <Library/BaseLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
-#include <Library/XenPlatformLib.h>
-
-#include <IndustryStandard/Acpi.h>
-
 typedef struct {
   EFI_PCI_IO_PROTOCOL *PciIo;
   UINT64              PciAttributes;

OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf

@@ -32,24 +32,24 @@
   Xen.c
 
 [Packages]
-  MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
 
 [LibraryClasses]
-  UefiLib
+  BaseLib
-  PcdLib
   BaseMemoryLib
   DebugLib
-  UefiBootServicesTableLib
+  DxeServicesTableLib
-  UefiDriverEntryPoint
+  MemoryAllocationLib
+  OrderedCollectionLib
+  PcdLib
   QemuFwCfgLib
   QemuFwCfgS3Lib
-  MemoryAllocationLib
+  UefiBootServicesTableLib
-  BaseLib
+  UefiDriverEntryPoint
-  DxeServicesTableLib
+  UefiLib
-  OrderedCollectionLib
   XenPlatformLib
 
 [Protocols]

OvmfPkg/AcpiPlatformDxe/EntryPoint.c

@@ -8,6 +8,7 @@
 **/
 
 #include <Guid/RootBridgesConnectedEventGroup.h>
+
 #include "AcpiPlatform.h"
 
 STATIC

OvmfPkg/AcpiPlatformDxe/Qemu.c

@@ -9,14 +9,15 @@
 
 **/
 
-#include "AcpiPlatform.h"
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/QemuFwCfgLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/PcdLib.h>
-#include <Library/OrderedCollectionLib.h>
 #include <IndustryStandard/Acpi.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DxeServicesTableLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/OrderedCollectionLib.h>
+#include <Library/PcdLib.h>
+#include <Library/QemuFwCfgLib.h>
+
+#include "AcpiPlatform.h"
 
 BOOLEAN
 QemuDetected (

OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c

@@ -8,17 +8,17 @@
 
 **/
 
-#include "AcpiPlatform.h"
+#include <IndustryStandard/Acpi.h>
-#include "QemuLoader.h"
 #include <Library/BaseMemoryLib.h>
+#include <Library/DxeServicesTableLib.h>
 #include <Library/MemoryAllocationLib.h>
+#include <Library/OrderedCollectionLib.h>
+#include <Library/PcdLib.h>
 #include <Library/QemuFwCfgLib.h>
 #include <Library/QemuFwCfgS3Lib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/PcdLib.h>
-#include <Library/OrderedCollectionLib.h>
-#include <IndustryStandard/Acpi.h>
 
+#include "AcpiPlatform.h"
+#include "QemuLoader.h"
 
 //
 // The user structure for the ordered collection that will track the fw_cfg

OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf

@@ -30,8 +30,8 @@
   QemuLoader.h
 
 [Packages]
-  MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
 
 [LibraryClasses]

OvmfPkg/AcpiPlatformDxe/Xen.c

@@ -8,9 +8,10 @@
 
 **/
 
-#include "AcpiPlatform.h"
 #include <Library/BaseLib.h>
 
+#include "AcpiPlatform.h"
+
 #define XEN_ACPI_PHYSICAL_ADDRESS         0x000EA020
 #define XEN_BIOS_PHYSICAL_END             0x000FFFFF