diff --git a/boards/arm/cxd56xx/common/src/cxd56_ili9340.c b/boards/arm/cxd56xx/common/src/cxd56_ili9340.c
index 617bc04b820..9f04b8ac6a7 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_ili9340.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_ili9340.c
@@ -62,7 +62,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 #ifndef ILI9340_SPI_MAXFREQUENCY
diff --git a/boards/arm/cxd56xx/common/src/cxd56_lpm013m091a.c b/boards/arm/cxd56xx/common/src/cxd56_lpm013m091a.c
index f00ff3d6101..b2ca725d342 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_lpm013m091a.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_lpm013m091a.c
@@ -61,7 +61,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 #ifndef LPM013M091A_SPI_MAXFREQUENCY
diff --git a/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c b/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
index da3fea24fc6..28b67013078 100644
--- a/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
@@ -131,7 +131,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for ak09912 device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c b/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
index c43b86f9c6b..4e81c419697 100644
--- a/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
@@ -134,7 +134,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for apds9930 device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c b/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
index b78712aa9cf..23c50dbd7a8 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
@@ -61,7 +61,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for bh1721fvc device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c b/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
index 38fc49e6bbf..80b765623e0 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
@@ -86,7 +86,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for bh1745nuc device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c b/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
index 45e238f7788..63846b5f148 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
@@ -88,7 +88,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for bm1383glv device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c b/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
index d117dc7edd6..1958d818b22 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
@@ -102,7 +102,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for bm1422gmv device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c b/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c
index b490b6d0988..9c21678c568 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c
@@ -125,7 +125,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 struct bmp280_dev_s
diff --git a/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c b/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
index 6457f9509ad..f90009bb6a2 100644
--- a/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
@@ -93,7 +93,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for kx022 device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c b/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
index 000fecf17a7..6db59dd3446 100644
--- a/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
@@ -129,7 +129,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for lt1pa01 device */
diff --git a/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c b/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
index 5da5bd8dcaa..cdbc4f7c979 100644
--- a/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
@@ -112,7 +112,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Structure for rpr0521rs device */
diff --git a/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c b/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c
index 742421a298a..a01ab059b17 100644
--- a/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c
+++ b/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c
@@ -53,7 +53,7 @@
 #define HIBYTE(n) ((uint8_t)(((n) & 0xff00) >> 8))
 
 /****************************************************************************
- * Private Type Definitions
+ * Private Types
  ****************************************************************************/
 
 /* Private data of the SMBus Smart Battery Data slave device */
diff --git a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c
index f92dd1ae341..328b9e5ef39 100644
--- a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c
+++ b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c
@@ -273,7 +273,7 @@
 #define HX8347_R95H          0x95
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* This structure describes the state of this driver */
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c
index 60685acd246..57e2037f25b 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c
@@ -241,7 +241,7 @@
 #define BKL_DISABLE_DURATION  (128*1024)
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* Type definition for the correct size of one pixel
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c
index d3100ec7460..bf0a0a68131 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c
@@ -244,7 +244,7 @@
 #define BKL_DISABLE_DURATION  (128*1024)
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* Type definition for the correct size of one pixel
diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
index 66ae07e28b5..78a0e4f0008 100644
--- a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
+++ b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
@@ -216,7 +216,7 @@
 #define SLCD_AM          (&g_einfo[7])
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* Global SLCD state */
diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
index acd863f3077..b3d47849b63 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
@@ -280,7 +280,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* Type definition for the correct size of one pixel (from the application
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c
index 9cb5be48496..1d757f13215 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -88,7 +88,7 @@
  */
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 struct stm32f4_dev_s
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c
index 907e9daea34..29356612c43 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -88,7 +88,7 @@
  */
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 struct stm32f4_dev_s
diff --git a/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c b/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c
index ead1d900f7c..b72c72780d2 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c
@@ -350,7 +350,7 @@
 #define ILI9919_ID            0x9919
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* LCD type */
diff --git a/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c b/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c
index 4fbd6c640c8..c2dc08bf818 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c
@@ -58,7 +58,7 @@
 #define CONFIG_LCD_FASTCONFIG 1
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* This structure describes the state of this driver */
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c
index e45d6aaa764..40ab0f71ab7 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c
@@ -288,7 +288,7 @@
 #define R61580_ID             0x1580
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* LCD type */
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c
index 7899e6b8b47..217a88a5eba 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c
@@ -241,7 +241,7 @@
 #define ILI9325_ID            0x9325
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* LCD type */
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c
index b5c38321872..67337fc2e7b 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c
@@ -241,7 +241,7 @@
 #define ILI9325_ID            0x9325
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* LCD type */
diff --git a/boards/arm/stm32/stm32f334-disco/src/stm32_powerled.c b/boards/arm/stm32/stm32f334-disco/src/stm32_powerled.c
index 5e25c6504ba..4d49d4e2950 100644
--- a/boards/arm/stm32/stm32f334-disco/src/stm32_powerled.c
+++ b/boards/arm/stm32/stm32f334-disco/src/stm32_powerled.c
@@ -109,7 +109,7 @@
 #define CURRENT_TO_VOLTAGE_RATIO (1/(LED_CURRENT_SENSE_RESISTOR))
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* Private data for powerled */
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c
index 1ce38d2ac13..126f97d3bc2 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c
@@ -123,7 +123,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 struct ili93414ws_lcd_s
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
index 4247f3d051e..b0b18afabbf 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
@@ -275,7 +275,7 @@
 #define SLCD_CHAR6_UPDATE3(s) SLCD_CHAR6_UPDATE2(s)
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* Global SLCD state */
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c
index 39401df9dfd..dfb6bbcc78b 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -118,7 +118,7 @@
 #ifdef CONFIG_LCD_MIO283QT2
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 struct pic32mx7mmb_dev_s
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
index 2c97c86874e..1566f31d9b6 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -109,7 +109,7 @@
 #define NOP              __asm__ __volatile__ ("nop");
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 /* Global LCD state */
diff --git a/boards/xtensa/esp32/common/src/esp32_ili9341.c b/boards/xtensa/esp32/common/src/esp32_ili9341.c
index eff3be6c7a5..c28a8a37f52 100644
--- a/boards/xtensa/esp32/common/src/esp32_ili9341.c
+++ b/boards/xtensa/esp32/common/src/esp32_ili9341.c
@@ -74,7 +74,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 struct ili93414ws_lcd_s
diff --git a/boards/xtensa/esp32s2/common/src/esp32s2_ili9341.c b/boards/xtensa/esp32s2/common/src/esp32s2_ili9341.c
index 3764db26192..59b16328e3f 100644
--- a/boards/xtensa/esp32s2/common/src/esp32s2_ili9341.c
+++ b/boards/xtensa/esp32s2/common/src/esp32s2_ili9341.c
@@ -74,7 +74,7 @@
 #endif
 
 /****************************************************************************
- * Private Type Definition
+ * Private Types
  ****************************************************************************/
 
 struct ili93414ws_lcd_s