diff --git a/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h b/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h
index a2ca8516aa..c681119068 100644
--- a/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h
+++ b/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h
@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef __EDKII_SYSTEM_FMP_CAPSULE_GUID_H__
-#define __EDKII_SYSTEM_FMP_CAPSULE_GUID_H__
+#pragma once
 
 /**
   @verbatim
@@ -142,5 +141,3 @@ typedef struct {
 extern EFI_GUID  gEdkiiSystemFirmwareImageDescriptorFileGuid;
 extern EFI_GUID  gEdkiiSystemFmpCapsuleConfigFileGuid;
 extern EFI_GUID  gEdkiiSystemFmpCapsuleDriverFvFileGuid;
-
-#endif
diff --git a/SignedCapsulePkg/Include/Library/EdkiiSystemCapsuleLib.h b/SignedCapsulePkg/Include/Library/EdkiiSystemCapsuleLib.h
index 6b4fb3c261..8a32a0de3e 100644
--- a/SignedCapsulePkg/Include/Library/EdkiiSystemCapsuleLib.h
+++ b/SignedCapsulePkg/Include/Library/EdkiiSystemCapsuleLib.h
@@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EDKII_SYSTEM_CAPSULE_LIB_H__
-#define __EDKII_SYSTEM_CAPSULE_LIB_H__
+#pragma once
 
 #include <Guid/EdkiiSystemFmpCapsule.h>
 
@@ -142,5 +141,3 @@ CapsuleAuthenticateSystemFirmware (
   OUT VOID    **AuthenticatedImage,
   OUT UINTN   *AuthenticatedImageSize
   );
-
-#endif
diff --git a/SignedCapsulePkg/Include/Library/IniParsingLib.h b/SignedCapsulePkg/Include/Library/IniParsingLib.h
index 70b149408b..b198d2643b 100644
--- a/SignedCapsulePkg/Include/Library/IniParsingLib.h
+++ b/SignedCapsulePkg/Include/Library/IniParsingLib.h
@@ -24,8 +24,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __INI_PARSING_LIB_H__
-#define __INI_PARSING_LIB_H__
+#pragma once
 
 /**
   Open an INI config file and return a context.
@@ -154,5 +153,3 @@ EFIAPI
 CloseIniFile (
   IN      VOID  *Context
   );
-
-#endif
diff --git a/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h b/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h
index fe3cf0a17b..434287e937 100644
--- a/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h
+++ b/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h
@@ -6,8 +6,7 @@
 
 **/
 
-#ifndef __PLATFORM_FLASH_ACCESS_LIB_H__
-#define __PLATFORM_FLASH_ACCESS_LIB_H__
+#pragma once
 
 #include <Protocol/FirmwareManagement.h>
 
@@ -91,5 +90,3 @@ PerformFlashWriteWithProgress (
   IN UINTN                                          StartPercentage,
   IN UINTN                                          EndPercentage
   );
-
-#endif
diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.h b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.h
index 09becb58dd..0e9a402d56 100644
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.h
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.h
@@ -6,8 +6,7 @@
 
 **/
 
-#ifndef _RECOVERY_MODULE_LOAD_PEI_H_
-#define _RECOVERY_MODULE_LOAD_PEI_H_
+#pragma once
 
 #include <PiPei.h>
 
@@ -33,5 +32,3 @@ typedef struct {
   UINTN       Length;
   UINTN       ImageOffset;
 } RECOVERY_CONFIG_DATA;
-
-#endif
diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
index c8443865cb..ad6c8b6ff2 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
@@ -6,8 +6,7 @@
 
 **/
 
-#ifndef _SYSTEM_FIRMWARE_UPDATE_H_
-#define _SYSTEM_FIRMWARE_UPDATE_H_
+#pragma once
 
 #include <PiDxe.h>
 
@@ -394,5 +393,3 @@ InitializePrivateData (
 extern EFI_GUID  gSystemFmpLastAttemptVariableGuid;
 extern EFI_GUID  mCurrentImageTypeId;
 extern EFI_GUID  gSystemFmpProtocolGuid;
-
-#endif