diff --git a/c/src/exec/score/headers/mpci.h b/c/src/exec/score/headers/mpci.h
index 06dc0015d4..67246d8d46 100644
--- a/c/src/exec/score/headers/mpci.h
+++ b/c/src/exec/score/headers/mpci.h
@@ -132,7 +132,8 @@ EXTERN MPCI_Packet_processor _MPCI_Packet_processors[MP_PACKET_CLASSES_LAST+1];
  */
 
 void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table
+  MPCI_Control            *users_mpci_table,
+  unsigned32               timeout_status
 );
 
 /*
diff --git a/c/src/exec/score/include/rtems/score/mpci.h b/c/src/exec/score/include/rtems/score/mpci.h
index 06dc0015d4..67246d8d46 100644
--- a/c/src/exec/score/include/rtems/score/mpci.h
+++ b/c/src/exec/score/include/rtems/score/mpci.h
@@ -132,7 +132,8 @@ EXTERN MPCI_Packet_processor _MPCI_Packet_processors[MP_PACKET_CLASSES_LAST+1];
  */
 
 void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table
+  MPCI_Control            *users_mpci_table,
+  unsigned32               timeout_status
 );
 
 /*
diff --git a/c/src/exec/score/src/mpci.c b/c/src/exec/score/src/mpci.c
index b2e183765d..8910661f09 100644
--- a/c/src/exec/score/src/mpci.c
+++ b/c/src/exec/score/src/mpci.c
@@ -27,8 +27,6 @@
 
 #include <rtems/core/coresem.h>
 
-#include <rtems/rtems/status.h> /* XXX for TIMEOUT */
-
 /*PAGE
  *
  *  _MPCI_Handler_initialization
@@ -37,7 +35,8 @@
  */
 
 void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table
+  MPCI_Control            *users_mpci_table,
+  unsigned32               timeout_status
 )
 {
   CORE_semaphore_Attributes    attributes;
@@ -67,7 +66,7 @@ void _MPCI_Handler_initialization(
     THREAD_QUEUE_DISCIPLINE_FIFO,
     STATES_WAITING_FOR_RPC_REPLY,
     NULL,
-    RTEMS_TIMEOUT   /* XXX */
+    timeout_status
   );
 }
 
diff --git a/c/src/exec/score/src/thread.c b/c/src/exec/score/src/thread.c
index a380d76c44..a22f52af2d 100644
--- a/c/src/exec/score/src/thread.c
+++ b/c/src/exec/score/src/thread.c
@@ -16,7 +16,6 @@
 #include <rtems/system.h>
 #include <rtems/core/context.h>
 #include <rtems/core/interr.h>
-#include <rtems/core/intthrd.h>
 #include <rtems/core/isr.h>
 #include <rtems/core/object.h>
 #include <rtems/core/priority.h>
diff --git a/c/src/exec/score/src/threadq.c b/c/src/exec/score/src/threadq.c
index ec6f8cc242..d6b8029a22 100644
--- a/c/src/exec/score/src/threadq.c
+++ b/c/src/exec/score/src/threadq.c
@@ -22,8 +22,6 @@
 #include <rtems/core/threadq.h>
 #include <rtems/core/tqdata.h>
 
-#include <rtems/rtems/status.h>
-
 /*PAGE
  *
  *  _Thread_queue_Initialize
diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/score/include/rtems/score/mpci.h
index 06dc0015d4..67246d8d46 100644
--- a/cpukit/score/include/rtems/score/mpci.h
+++ b/cpukit/score/include/rtems/score/mpci.h
@@ -132,7 +132,8 @@ EXTERN MPCI_Packet_processor _MPCI_Packet_processors[MP_PACKET_CLASSES_LAST+1];
  */
 
 void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table
+  MPCI_Control            *users_mpci_table,
+  unsigned32               timeout_status
 );
 
 /*
diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c
index b2e183765d..8910661f09 100644
--- a/cpukit/score/src/mpci.c
+++ b/cpukit/score/src/mpci.c
@@ -27,8 +27,6 @@
 
 #include <rtems/core/coresem.h>
 
-#include <rtems/rtems/status.h> /* XXX for TIMEOUT */
-
 /*PAGE
  *
  *  _MPCI_Handler_initialization
@@ -37,7 +35,8 @@
  */
 
 void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table
+  MPCI_Control            *users_mpci_table,
+  unsigned32               timeout_status
 )
 {
   CORE_semaphore_Attributes    attributes;
@@ -67,7 +66,7 @@ void _MPCI_Handler_initialization(
     THREAD_QUEUE_DISCIPLINE_FIFO,
     STATES_WAITING_FOR_RPC_REPLY,
     NULL,
-    RTEMS_TIMEOUT   /* XXX */
+    timeout_status
   );
 }
 
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index a380d76c44..a22f52af2d 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -16,7 +16,6 @@
 #include <rtems/system.h>
 #include <rtems/core/context.h>
 #include <rtems/core/interr.h>
-#include <rtems/core/intthrd.h>
 #include <rtems/core/isr.h>
 #include <rtems/core/object.h>
 #include <rtems/core/priority.h>
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
index ec6f8cc242..d6b8029a22 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -22,8 +22,6 @@
 #include <rtems/core/threadq.h>
 #include <rtems/core/tqdata.h>
 
-#include <rtems/rtems/status.h>
-
 /*PAGE
  *
  *  _Thread_queue_Initialize