diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h
index 9597e028e4..c8dee8ab7a 100644
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h
@@ -1,13 +1,13 @@
 /** @file
-  Sample ACPI Platform Driver
+  OVMF ACPI Platform Driver
 
   Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _ACPI_PLATFORM_H_INCLUDED_
-#define _ACPI_PLATFORM_H_INCLUDED_
+#ifndef ACPI_PLATFORM_H_
+#define ACPI_PLATFORM_H_
 
 #include <PiDxe.h>
 
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuLoader.h b/OvmfPkg/AcpiPlatformDxe/QemuLoader.h
index 70e0ebc33b..bb3978e900 100644
--- a/OvmfPkg/AcpiPlatformDxe/QemuLoader.h
+++ b/OvmfPkg/AcpiPlatformDxe/QemuLoader.h
@@ -7,10 +7,10 @@
 
 **/
 
-#ifndef __QEMU_LOADER_H__
-#define __QEMU_LOADER_H__
+#ifndef QEMU_LOADER_H_
+#define QEMU_LOADER_H_
 
-#include <Include/Base.h>
+#include <Base.h>
 #include <Library/QemuFwCfgLib.h>
 
 //