diff --git a/FatPkg/EnhancedFatDxe/Fat.h b/FatPkg/EnhancedFatDxe/Fat.h
index fb6699061e..1e739af82e 100644
--- a/FatPkg/EnhancedFatDxe/Fat.h
+++ b/FatPkg/EnhancedFatDxe/Fat.h
@@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _FAT_H_
-#define _FAT_H_
+#pragma once
 
 #include <Uefi.h>
 
@@ -2030,5 +2029,3 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gFatComponentName2;
 extern EFI_LOCK                      FatFsLock;
 extern EFI_LOCK                      FatTaskLock;
 extern EFI_FILE_PROTOCOL             FatFileInterface;
-
-#endif
diff --git a/FatPkg/EnhancedFatDxe/FatFileSystem.h b/FatPkg/EnhancedFatDxe/FatFileSystem.h
index 60b9c56b71..e490e510c8 100644
--- a/FatPkg/EnhancedFatDxe/FatFileSystem.h
+++ b/FatPkg/EnhancedFatDxe/FatFileSystem.h
@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _FATFILESYSTEM_H_
-#define _FATFILESYSTEM_H_
+#pragma once
 
 #pragma pack(1)
 //
@@ -203,5 +202,3 @@ typedef struct {
 } FAT_DIRECTORY_LFN;
 
 #pragma pack()
-
-#endif
diff --git a/FatPkg/FatPei/FatLiteApi.h b/FatPkg/FatPei/FatLiteApi.h
index a9025633a0..904a2fd68b 100644
--- a/FatPkg/FatPei/FatLiteApi.h
+++ b/FatPkg/FatPei/FatLiteApi.h
@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _FAT_API_H_
-#define _FAT_API_H_
+#pragma once
 
 //
 // API data structures
@@ -21,5 +20,3 @@ typedef enum {
   Fat32,
   FatUnknown
 } PEI_FAT_TYPE;
-
-#endif
diff --git a/FatPkg/FatPei/FatLiteFmt.h b/FatPkg/FatPei/FatLiteFmt.h
index fef70fe1de..7a99323fa5 100644
--- a/FatPkg/FatPei/FatLiteFmt.h
+++ b/FatPkg/FatPei/FatLiteFmt.h
@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _FAT_FMT_H_
-#define _FAT_FMT_H_
+#pragma once
 
 //
 // Definitions
@@ -130,5 +129,3 @@ typedef struct {
 } PEI_FAT_BOOT_SECTOR_EX;
 
 #pragma pack()
-
-#endif
diff --git a/FatPkg/FatPei/FatLitePeim.h b/FatPkg/FatPei/FatLitePeim.h
index 1f90ef885d..79e6d1682e 100644
--- a/FatPkg/FatPei/FatLitePeim.h
+++ b/FatPkg/FatPei/FatLitePeim.h
@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _FAT_PEIM_H_
-#define _FAT_PEIM_H_
+#pragma once
 
 #include <PiPei.h>
 
@@ -495,5 +494,3 @@ VOID
 FatFindPartitions (
   IN  PEI_FAT_PRIVATE_DATA  *PrivateData
   );
-
-#endif // _FAT_PEIM_H_