diff --git a/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c
index 020210d3134..0e7c53c1790 100644
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/arch/arm/src/c5471/c5471_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"
diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c
index b09104e5776..15e4ecdf93f 100644
--- a/arch/arm/src/dm320/dm320_serial.c
+++ b/arch/arm/src/dm320/dm320_serial.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/imx/imx_serial.c b/arch/arm/src/imx/imx_serial.c
index 556eb4ebd40..26e6592be88 100644
--- a/arch/arm/src/imx/imx_serial.c
+++ b/arch/arm/src/imx/imx_serial.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index dd1cd687304..a35e0eef0eb 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/lm3s/lm3s_serial.c b/arch/arm/src/lm3s/lm3s_serial.c
index 50384a1b95c..45c388aec9c 100644
--- a/arch/arm/src/lm3s/lm3s_serial.c
+++ b/arch/arm/src/lm3s/lm3s_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c
index f5d1e3c015c..10b4a4838df 100644
--- a/arch/arm/src/lpc17xx/lpc17_serial.c
+++ b/arch/arm/src/lpc17xx/lpc17_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index a838e314396..bf7c1ec3466 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -49,7 +49,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index 8d3a020c738..69738dae512 100755
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -54,7 +54,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index 77073188297..c5438e1c8d6 100755
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "up_arch.h"
diff --git a/arch/arm/src/sam3u/sam3u_serial.c b/arch/arm/src/sam3u/sam3u_serial.c
index 063de7a5873..811bfda698f 100644
--- a/arch/arm/src/sam3u/sam3u_serial.c
+++ b/arch/arm/src/sam3u/sam3u_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index 9e103092f7b..e914112721d 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index 1cc6731ac7a..d9e9cc348d5 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -49,7 +49,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_serial.c b/arch/avr/src/at32uc3/at32uc3_serial.c
index ff5c5490d0a..06b4adb3976 100644
--- a/arch/avr/src/at32uc3/at32uc3_serial.c
+++ b/arch/avr/src/at32uc3/at32uc3_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/board/board.h>
 
diff --git a/arch/avr/src/at90usb/at90usb_serial.c b/arch/avr/src/at90usb/at90usb_serial.c
index f75f3806200..8d906a915c7 100644
--- a/arch/avr/src/at90usb/at90usb_serial.c
+++ b/arch/avr/src/at90usb/at90usb_serial.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <avr/io.h>
 
 #include <arch/board/board.h>
diff --git a/arch/avr/src/atmega/atmega_serial.c b/arch/avr/src/atmega/atmega_serial.c
index b3106b1d0b3..ec8a9b6f5b9 100644
--- a/arch/avr/src/atmega/atmega_serial.c
+++ b/arch/avr/src/atmega/atmega_serial.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <avr/io.h>
 
 #include <arch/board/board.h>
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index f04e7f6825b..6cb566bb6a9 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/board/board.h>
 
diff --git a/arch/rgmp/src/x86/com.c b/arch/rgmp/src/x86/com.c
index 36ca15238b4..e5e7f70f6ad 100644
--- a/arch/rgmp/src/x86/com.c
+++ b/arch/rgmp/src/x86/com.c
@@ -51,7 +51,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <nuttx/kmalloc.h>
 
 #include <arch/com.h>
diff --git a/arch/sh/src/m16c/m16c_serial.c b/arch/sh/src/m16c/m16c_serial.c
index a3bc2485c65..0027d423a4d 100644
--- a/arch/sh/src/m16c/m16c_serial.c
+++ b/arch/sh/src/m16c/m16c_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"
diff --git a/arch/sh/src/sh1/sh1_serial.c b/arch/sh/src/sh1/sh1_serial.c
index 027da35fafc..e696c96f5bf 100644
--- a/arch/sh/src/sh1/sh1_serial.c
+++ b/arch/sh/src/sh1/sh1_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"
diff --git a/arch/x86/src/qemu/qemu_serial.c b/arch/x86/src/qemu/qemu_serial.c
index 4c7d462ea92..8419c67d946 100644
--- a/arch/x86/src/qemu/qemu_serial.c
+++ b/arch/x86/src/qemu/qemu_serial.c
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/uart_16550.h>
+#include <nuttx/serial/uart_16550.h>
 
 #include <arch/io.h>
 
diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index ffe03decc14..42c81473750 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip/chip.h"
diff --git a/arch/z80/src/ez80/ez80_serial.c b/arch/z80/src/ez80/ez80_serial.c
index 8fbbe46c138..c6631c47aa3 100644
--- a/arch/z80/src/ez80/ez80_serial.c
+++ b/arch/z80/src/ez80/ez80_serial.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 #include <arch/io.h>
 
diff --git a/arch/z80/src/z8/z8_serial.c b/arch/z80/src/z8/z8_serial.c
index db13ab67d2a..eb7305bbc78 100755
--- a/arch/z80/src/z8/z8_serial.c
+++ b/arch/z80/src/z8/z8_serial.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip/chip.h"