diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 71c33313453..21b5ea2d6ef 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
 #include <nuttx/crypto/crypto.h>
@@ -261,6 +262,12 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   /* Initialize USB -- device and/or host */
 
   up_usbinitialize();
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 0e8499c99d0..fdd05dd72f2 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
 
@@ -275,6 +276,12 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   /* Initialize USB */
 
   up_usbinitialize();
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index 2e947c3ef79..315064354f6 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
 
@@ -199,6 +200,12 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   /* Initialize USB */
 
   up_usbinitialize();
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index c06b01e9908..4ee09a2acac 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
 
@@ -201,6 +202,12 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   /* Initialize USB -- device and/or host */
 
   up_usbinitialize();
diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c
index 0224bce01c3..fb38f4a8288 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/sh/src/common/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
 
@@ -189,6 +190,12 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   /* Initialize USB */
 
   up_usbinitialize();
diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c
index 24aaa49dbd3..18e426e178f 100644
--- a/arch/sim/src/up_initialize.c
+++ b/arch/sim/src/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
@@ -172,6 +173,12 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
 #if defined(CONFIG_FS_SMARTFS) && defined(CONFIG_SIM_SPIFLASH)
   up_init_smartfs();
 #endif
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 76f1621c5d8..f720c2ae107 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
 
@@ -201,6 +202,12 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   /* Initialize USB -- device and/or host */
 
   up_usbinitialize();
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 9a7710755da..79cf4617ed0 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 #include <nuttx/syslog/ramlog.h>
 #include <nuttx/syslog/syslog_console.h>
 
@@ -205,5 +206,11 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   board_led_on(LED_IRQSENABLED);
 }
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 7f0fdc68a0f..12e5cff6d85 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -45,6 +45,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/tun.h>
 
 #include <arch/board/board.h>
 
@@ -188,5 +189,11 @@ void up_initialize(void)
   (void)localhost_initialize();
 #endif
 
+#ifdef CONFIG_NET_TUN
+  /* Initialize the TUN device */
+
+  (void)tun_initialize();
+#endif
+
   board_led_on(LED_IRQSENABLED);
 }