diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
index aea1e0f4e27..61dfd3d1959 100644
--- a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
index f3bf1627879..ab9c97deea5 100644
--- a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
index 2f30eafc282..5ad42d2672d 100644
--- a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
index 5a80fdbeb9f..7c00b5a0084 100644
--- a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
index 4ab68a283be..29fd12614fe 100644
--- a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
+++ b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
index b0e77f806d2..d2e75885563 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
index 0294fe57cf9..162c8c62e26 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
index 9121c3a4c9b..968d0fa06d5 100644
--- a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
index ed72e54f536..1a6a6ff2332 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
index 7f90cbaf8b4..9fa5146fce0 100644
--- a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
+++ b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
index 312f8646f25..b41706aa9b8 100644
--- a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
+++ b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
index cb33e2d948c..27fa4d62c2f 100644
--- a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
+++ b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
index c96627c3eb1..453a51552cf 100644
--- a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
+++ b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
index 8e58025f80d..071d43f071d 100644
--- a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
+++ b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
index 5f3b688f2ce..953cfac7749 100644
--- a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
index e61978f4513..3e4a1b23cc1 100644
--- a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
index 02788a65ead..2856b0151a1 100644
--- a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
index 4a13812879c..2b88f434470 100644
--- a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
index aaf6da3e8b5..4147c7422fd 100644
--- a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c
index f2dca060162..b8c241943e3 100644
--- a/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c
index ec21c501ce5..9eb9f3bbae1 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c
index aa1513f7866..c3e0fccc7a3 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c
index 514addd337a..1f42751360a 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c b/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c
index 7150aa0cfc1..d4859c2bec9 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c
+++ b/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c
index cea7b8d4918..834810ff383 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c
index a9f63958ee8..ba5d1e22ae8 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c b/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c
index d98912497b1..6bdc4093dde 100644
--- a/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c
+++ b/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c b/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c
index 2c6dcb3070c..a1a92eb12c0 100644
--- a/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c
+++ b/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c
@@ -63,10 +63,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_usram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/kernel/esp32c3_userspace.c b/boards/risc-v/esp32c3/esp32c3-devkit/kernel/esp32c3_userspace.c
index f625aa4e44f..3c7e1dc9f51 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/kernel/esp32c3_userspace.c
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/kernel/esp32c3_userspace.c
@@ -59,10 +59,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_udram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c b/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c
index 1407df97ec2..3476ad63351 100644
--- a/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c
+++ b/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c
@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c b/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c
index c79d950ea24..213b12662f2 100644
--- a/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c
+++ b/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c
@@ -59,10 +59,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_usram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/boards/xtensa/esp32/common/kernel/esp32_userspace.c b/boards/xtensa/esp32/common/kernel/esp32_userspace.c
index 9d583375c08..35ef9513e63 100644
--- a/boards/xtensa/esp32/common/kernel/esp32_userspace.c
+++ b/boards/xtensa/esp32/common/kernel/esp32_userspace.c
@@ -59,10 +59,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_udram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
diff --git a/include/nuttx/init.h b/include/nuttx/init.h
index 3bdc67f6ec4..e0eafd2bbff 100644
--- a/include/nuttx/init.h
+++ b/include/nuttx/init.h
@@ -94,10 +94,6 @@ EXTERN uint8_t g_nx_initstate;  /* See enum nx_initstate_e */
  * Public Function Prototypes
  ****************************************************************************/
 
-/* This entry point must be supplied by the application */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 /* Functions contained in nx_task.c *****************************************/
 
 /* OS entry point called by boot logic */
diff --git a/include/sys/types.h b/include/sys/types.h
index d4d4ce0918d..28a524d26cd 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -300,10 +300,29 @@ enum
   OK = 0,
 };
 
-#endif /* __ASSEMBLY__ */
-
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
 
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/* This entry point must be supplied by the application */
+
+#ifdef CONFIG_INIT_ENTRYPOINT
+int CONFIG_INIT_ENTRYPOINT(int argc, FAR char *argv[]);
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+
 #endif /* __INCLUDE_SYS_TYPES_H */