diff --git a/sched/task/Make.defs b/sched/task/Make.defs
index 81410d71f74..2c89cedbfcb 100644
--- a/sched/task/Make.defs
+++ b/sched/task/Make.defs
@@ -33,10 +33,11 @@
 #
 ############################################################################
 
-TSK_SRCS  = task_init.c task_setup.c task_activate.c task_start.c
-TSK_SRCS += task_delete.c task_exit.c task_exithook.c task_recover.c
-TSK_SRCS += task_restart.c task_spawnparms.c task_terminate.c
-TSK_SRCS += task_getgroup.c task_prctl.c task_getpid.c exit.c
+TSK_SRCS  = task_create.c task_init.c task_setup.c task_activate.c
+TSK_SRCS += task_start.c task_delete.c task_exit.c task_exithook.c
+TSK_SRCS += task_recover.c task_restart.c task_spawnparms.c
+TSK_SRCS += task_terminate.c task_getgroup.c task_prctl.c task_getpid.c
+TSK_SRCS += exit.c
 
 ifeq ($(CONFIG_ARCH_HAVE_VFORK),y)
 ifeq ($(CONFIG_SCHED_WAITPID),y)
@@ -45,7 +46,7 @@ endif
 endif
 
 ifneq ($(CONFIG_BUILD_KERNEL),y)
-TSK_SRCS += task_create.c task_spawn.c
+TSK_SRCS += task_spawn.c
 endif
 
 ifneq ($(CONFIG_BINFMT_DISABLE),y)
diff --git a/sched/task/task_create.c b/sched/task/task_create.c
index 358306c1347..32b12116420 100644
--- a/sched/task/task_create.c
+++ b/sched/task/task_create.c
@@ -55,7 +55,7 @@
 #ifndef CONFIG_BUILD_KERNEL
 
 /****************************************************************************
- * Definitions
+ * Preprocessor Definitions
  ****************************************************************************/
 
 /****************************************************************************
@@ -242,7 +242,7 @@ errout:
  *
  ****************************************************************************/
 
-#ifndef CONFIG_ARCH_ADDRENV
+#ifndef CONFIG_BUILD_KERNEL
 int task_create(FAR const char *name, int priority,
                 int stack_size, main_t entry, FAR char * const argv[])
 {