diff --git a/arch/arm/src/tms570/chip.h b/arch/arm/src/tms570/chip.h
index c4da84da7ab..4d45ecad832 100644
--- a/arch/arm/src/tms570/chip.h
+++ b/arch/arm/src/tms570/chip.h
@@ -49,12 +49,6 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* arch/arm/src/armv7-a/l2cc_pl310.h includes this file and expects it to provide the
- * address of the L2CC-PL310 implementation.
- */
-
-#define L2CC_VBASE SAM_L2CC_VSECTION
-
 /* Cache line sizes (in bytes)for the SAVA5Dx */
 
 #define ARMV7A_DCACHE_LINESIZE 32  /* 32 bytes (8 words) */
diff --git a/arch/arm/src/tms570/tms570_boot.h b/arch/arm/src/tms570/tms570_boot.h
index 09ce644727b..8f8a2f3b5ea 100644
--- a/arch/arm/src/tms570/tms570_boot.h
+++ b/arch/arm/src/tms570/tms570_boot.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_TMS570_SAM_BOOT_H
-#define __ARCH_ARM_SRC_TMS570_SAM_BOOT_H
+#ifndef __ARCH_ARM_SRC_TMS570_TMS570_BOOT_H
+#define __ARCH_ARM_SRC_TMS570_TMS570_BOOT_H
 
 /************************************************************************************
  * Included Files
@@ -139,4 +139,4 @@ void tms570_board_initialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_TMS570_SAM_BOOT_H */
+#endif /* __ARCH_ARM_SRC_TMS570_TMS570_BOOT_H */
diff --git a/arch/arm/src/tms570/tms570_irq.h b/arch/arm/src/tms570/tms570_irq.h
index 1d4114bec5b..eba6c7eba6a 100644
--- a/arch/arm/src/tms570/tms570_irq.h
+++ b/arch/arm/src/tms570/tms570_irq.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_TMS570_SAM_IRQ_H
-#define __ARCH_ARM_SRC_TMS570_SAM_IRQ_H
+#ifndef __ARCH_ARM_SRC_TMS570_TMS570_IRQ_H
+#define __ARCH_ARM_SRC_TMS570_TMS570_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -79,4 +79,4 @@ void up_enable_fiq(int channel);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_TMS570_SAM_IRQ_H */
+#endif /* __ARCH_ARM_SRC_TMS570_TMS570_IRQ_H */