diff --git a/src/security/intel/txt/common.c b/src/security/intel/txt/common.c
index 738cd5412c..e73defb912 100644
--- a/src/security/intel/txt/common.c
+++ b/src/security/intel/txt/common.c
@@ -1,15 +1,15 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/mmio.h>
-#include <string.h>
 #include <console/console.h>
-#include <types.h>
 #include <cbfs.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/cr.h>
+#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <lib.h>
 #include <smp/node.h>
+#include <string.h>
+#include <types.h>
 
 #if CONFIG(SOC_INTEL_COMMON_BLOCK_SA)
 #include <soc/intel/common/reset.h>
diff --git a/src/security/intel/txt/getsec.c b/src/security/intel/txt/getsec.c
index 412e243a8f..422f10d7c8 100644
--- a/src/security/intel/txt/getsec.c
+++ b/src/security/intel/txt/getsec.c
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/cr.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mp.h>
+#include <types.h>
 
 #include "txt_register.h"
 #include "txt_getsec.h"
diff --git a/src/security/intel/txt/logging.c b/src/security/intel/txt/logging.c
index f329cf975f..24def330f9 100644
--- a/src/security/intel/txt/logging.c
+++ b/src/security/intel/txt/logging.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
-#if CONFIG(SOC_INTEL_COMMON_BLOCK_SA)
-#include <intelblocks/systemagent.h>
-#endif
-
 #include <arch/mmio.h>
+#include <console/console.h>
 #include <string.h>
+#include <types.h>
 
 #include "txt.h"
 #include "txt_register.h"
diff --git a/src/security/intel/txt/ramstage.c b/src/security/intel/txt/ramstage.c
index 145182fb75..fb84777ede 100644
--- a/src/security/intel/txt/ramstage.c
+++ b/src/security/intel/txt/ramstage.c
@@ -1,16 +1,15 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/mmio.h>
 #include <acpi/acpi.h>
-#include <bootstate.h>
+#include <arch/mmio.h>
 #include <bootmem.h>
-#include <console/console.h>
-#include <stdint.h>
+#include <bootstate.h>
 #include <cbfs.h>
+#include <console/console.h>
 #include <cpu/intel/common/common.h>
 #include <cpu/x86/msr.h>
-
 #include <device/pci_ops.h>
+#include <types.h>
 
 #include "txt.h"
 #include "txt_register.h"
diff --git a/src/security/intel/txt/txt_getsec.h b/src/security/intel/txt/txt_getsec.h
index 7c4a1a4283..8e663d51b0 100644
--- a/src/security/intel/txt/txt_getsec.h
+++ b/src/security/intel/txt/txt_getsec.h
@@ -3,7 +3,7 @@
 #ifndef SECURITY_INTEL_TXT_GETSEC_H_
 #define SECURITY_INTEL_TXT_GETSEC_H_
 
-#include <stdint.h>
+#include <types.h>
 
 bool getsec_parameter(uint32_t *version_mask,
 		      uint32_t *version_numbers_supported,
diff --git a/src/security/intel/txt/txt_register.h b/src/security/intel/txt/txt_register.h
index c7f1575ce7..bd546b5825 100644
--- a/src/security/intel/txt/txt_register.h
+++ b/src/security/intel/txt/txt_register.h
@@ -4,7 +4,6 @@
 #define SECURITY_INTEL_TXT_REGISTER_H_
 
 #include <types.h>
-#include <stddef.h>
 
 /*
  * Document: 315168-016