diff --git a/drivers/note/Make.defs b/drivers/note/Make.defs
index fc74611f99..7c559d9279 100644
--- a/drivers/note/Make.defs
+++ b/drivers/note/Make.defs
@@ -18,6 +18,13 @@
 #
 ############################################################################
 
+ifeq ($(CONFIG_SCHED_INSTRUMENTATION),y)
+ifeq ($(CONFIG_SCHED_INSTRUMENTATION_EXTERNAL),)
+CSRCS += sched_note.c
+CFLAGS += ${INCDIR_PREFIX}${TOPDIR}/sched
+endif
+endif
+
 ifeq ($(CONFIG_DRIVER_NOTE),y)
   CSRCS += note_driver.c
 endif
diff --git a/sched/sched/sched_note.c b/drivers/note/sched_note.c
similarity index 99%
rename from sched/sched/sched_note.c
rename to drivers/note/sched_note.c
index a4d3bb1dd6..4cbadae7dc 100644
--- a/sched/sched/sched_note.c
+++ b/drivers/note/sched_note.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched/sched_note.c
+ * drivers/note/sched_note.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/sched/sched/Make.defs b/sched/sched/Make.defs
index 9f9fdd4c0c..257ff3f40b 100644
--- a/sched/sched/Make.defs
+++ b/sched/sched/Make.defs
@@ -89,12 +89,6 @@ ifeq ($(CONFIG_SMP),y)
 CSRCS += sched_thistask.c
 endif
 
-ifeq ($(CONFIG_SCHED_INSTRUMENTATION),y)
-ifeq ($(CONFIG_SCHED_INSTRUMENTATION_EXTERNAL),)
-CSRCS += sched_note.c
-endif
-endif
-
 ifeq ($(CONFIG_SCHED_CRITMONITOR),y)
 CSRCS += sched_critmonitor.c
 endif