diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6c5905f22a..7c1c60fc12 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* rtems/src/tasks.c: Make _RTEMS_tasks_Create_extension,
+	_RTEMS_tasks_Start_extension, _RTEMS_tasks_Delete_extension,
+	_RTEMS_tasks_Switch_extension, _RTEMS_tasks_Post_switch_extension
+	static.
+	* score/src/scheduleredf.c: Make _Scheduler_EDF_RBTree_compare_function
+	static.
+
 2011-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libfs/src/imfs/imfs_eval.c: Make IMFS_evaluate_permission,
diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c
index ecd81d900b..59d0eadace 100644
--- a/cpukit/rtems/src/tasks.c
+++ b/cpukit/rtems/src/tasks.c
@@ -42,7 +42,7 @@
  *  area.
  */
 
-bool _RTEMS_tasks_Create_extension(
+static bool _RTEMS_tasks_Create_extension(
   Thread_Control *executing,
   Thread_Control *created
 )
@@ -86,7 +86,7 @@ bool _RTEMS_tasks_Create_extension(
  *  first time.
  */
 
-void _RTEMS_tasks_Start_extension(
+static void _RTEMS_tasks_Start_extension(
   Thread_Control *executing,
   Thread_Control *started
 )
@@ -104,7 +104,7 @@ void _RTEMS_tasks_Start_extension(
  *  This extension routine is invoked when a task is deleted.
  */
 
-void _RTEMS_tasks_Delete_extension(
+static void _RTEMS_tasks_Delete_extension(
   Thread_Control *executing,
   Thread_Control *deleted
 )
@@ -137,7 +137,7 @@ void _RTEMS_tasks_Delete_extension(
  *  This extension routine is invoked at each context switch.
  */
 
-void _RTEMS_tasks_Switch_extension(
+static void _RTEMS_tasks_Switch_extension(
   Thread_Control *executing,
   Thread_Control *heir
 )
@@ -169,7 +169,7 @@ void _RTEMS_tasks_Switch_extension(
  *  This extension routine is invoked at each context switch.
  */
 
-void _RTEMS_tasks_Post_switch_extension(
+static void _RTEMS_tasks_Post_switch_extension(
   Thread_Control *executing
 )
 {
diff --git a/cpukit/score/src/scheduleredf.c b/cpukit/score/src/scheduleredf.c
index 2aa2d52cea..09d8cac363 100644
--- a/cpukit/score/src/scheduleredf.c
+++ b/cpukit/score/src/scheduleredf.c
@@ -18,7 +18,7 @@
 #include <rtems/score/scheduler.h>
 #include <rtems/score/scheduleredf.h>
 
-int _Scheduler_EDF_RBTree_compare_function
+static int _Scheduler_EDF_RBTree_compare_function
 (
   RBTree_Node* n1,
   RBTree_Node* n2