diff --git a/arch/arm/src/tiva/hardware/tiva_eeprom.h b/arch/arm/src/tiva/hardware/tiva_eeprom.h
index 708534e72aa..333fb604d3d 100644
--- a/arch/arm/src/tiva/hardware/tiva_eeprom.h
+++ b/arch/arm/src/tiva/hardware/tiva_eeprom.h
@@ -86,6 +86,7 @@
 #define TIVA_EEPROM_PP                (TIVA_EEPROM_BASE + TIVA_EEPROM_PP_OFFSET)
 
 /* Register Bit-Field Definitions ***************************************************/
+
 /* The following are defines for the bit fields in the EEPROM_EESIZE register. */
 
 #define EEPROM_EESIZE_WORDCNT_M       0x0000ffff  /* Number of 32-Bit Words */
diff --git a/arch/arm/src/tiva/hardware/tiva_sysctrl.h b/arch/arm/src/tiva/hardware/tiva_sysctrl.h
index 8bd63eb33f7..0296b2bb915 100644
--- a/arch/arm/src/tiva/hardware/tiva_sysctrl.h
+++ b/arch/arm/src/tiva/hardware/tiva_sysctrl.h
@@ -71,7 +71,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Public Functions
+ * Public Function Prototypes
  ************************************************************************************/
 
 #endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCONTROL_H */
diff --git a/arch/arm/src/tiva/hardware/tiva_uart.h b/arch/arm/src/tiva/hardware/tiva_uart.h
index afd45580c21..359f8881288 100644
--- a/arch/arm/src/tiva/hardware/tiva_uart.h
+++ b/arch/arm/src/tiva/hardware/tiva_uart.h
@@ -42,10 +42,6 @@
 
 #include <nuttx/config.h>
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
 /* Include the UART header file for the specific Tiva/Stellaris/SimpleLink chip */
 
 #if defined(CONFIG_ARCH_CHIP_LM)
@@ -60,6 +56,10 @@
 #  error "Unsupported Tiva/Stellaris memory map"
 #endif
 
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
 /************************************************************************************
  * Public Types
  ************************************************************************************/
@@ -69,7 +69,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Public Functions
+ * Public Function Prototypes
  ************************************************************************************/
 
 #endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_UART_H */
diff --git a/arch/arm/src/tiva/hardware/tiva_wdt.h b/arch/arm/src/tiva/hardware/tiva_wdt.h
index aa056d648f1..7559f290e46 100644
--- a/arch/arm/src/tiva/hardware/tiva_wdt.h
+++ b/arch/arm/src/tiva/hardware/tiva_wdt.h
@@ -107,6 +107,7 @@
 /* WDT register bitfield definitions ********************************************************/
 
 /* Configuration (32-bit interval value) */
+
 /* Current Count Value (32-bit timer counter value) */
 
 /* Control */