diff --git a/configs/xtrs/src/xtr_irq.c b/configs/xtrs/src/xtr_irq.c
index 6603cfaec6..f8c3d65e1a 100644
--- a/configs/xtrs/src/xtr_irq.c
+++ b/configs/xtrs/src/xtr_irq.c
@@ -42,7 +42,6 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/configs/xtrs/src/xtr_lowputc.c b/configs/xtrs/src/xtr_lowputc.c
index 60f4db049a..038fe9f40a 100644
--- a/configs/xtrs/src/xtr_lowputc.c
+++ b/configs/xtrs/src/xtr_lowputc.c
@@ -48,7 +48,6 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /* Includes trs80-m3.h for assembler call addresses */
diff --git a/configs/xtrs/src/xtr_serial.c b/configs/xtrs/src/xtr_serial.c
index 7aa99a87da..f7ea11b0b8 100644
--- a/configs/xtrs/src/xtr_serial.c
+++ b/configs/xtrs/src/xtr_serial.c
@@ -58,7 +58,6 @@
 #include <arch/z80/io.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/configs/z80sim/src/z80_irq.c b/configs/z80sim/src/z80_irq.c
index 45d4eb962e..4faea34e49 100644
--- a/configs/z80sim/src/z80_irq.c
+++ b/configs/z80sim/src/z80_irq.c
@@ -42,7 +42,6 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/configs/z80sim/src/z80_lowputc.c b/configs/z80sim/src/z80_lowputc.c
index 9bfe266c1d..10b3d9a61c 100644
--- a/configs/z80sim/src/z80_lowputc.c
+++ b/configs/z80sim/src/z80_lowputc.c
@@ -44,7 +44,6 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************
diff --git a/configs/z80sim/src/z80_serial.c b/configs/z80sim/src/z80_serial.c
index 7a13ea69b2..56ca57b7f6 100644
--- a/configs/z80sim/src/z80_serial.c
+++ b/configs/z80sim/src/z80_serial.c
@@ -53,7 +53,6 @@
 #include <arch/serial.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER