The word "RTEMS" almost completely removed from the core.

Configuration Table Template file added and all tests
modified to use this.  All gvar.h and conftbl.h files
removed from test directories.

Configuration parameter maximum_devices added.

Core semaphore and mutex handlers added and RTEMS API Semaphore
Manager updated to reflect this.

Initialization sequence changed to invoke API specific initialization
routines.  Initialization tasks table now owned by RTEMS Tasks Manager.

Added user extension for post-switch.

Utilized user extensions to implement API specific functionality
like signal dispatching.

Added extensions to the System Initialization Thread so that an
API can register a function to be invoked while the system
is being initialized.  These are largely equivalent to the
pre-driver and post-driver hooks.

Added the Modules file oar-go32_p5, modified oar-go32, and modified
the file make/custom/go32.cfg to look at an environment varable which
determines what CPU model is being used.

All BSPs updated to reflect named devices and clock driver's IOCTL
used by the Shared Memory Driver.  Also merged clock isr into
main file and removed ckisr.c where possible.

Updated spsize to reflect new and moved variables.

Makefiles for the executive source and include files updated to show
break down of files into Core, RTEMS API, and Neither.

Header and inline files installed into subdirectory based on whether
logically in the Core or a part of the RTEMS API.

12 files changed, 184 insertions, 150 deletions

diff --git a/c/src/optman/rtems/no-dpmem.c b/c/src/optman/rtems/no-dpmem.c
index 40f343eef4..a7116fefa1 100644
--- a/c/src/optman/rtems/no-dpmem.c
+++ b/c/src/optman/rtems/no-dpmem.c
@@ -13,10 +13,13 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/address.h>
-#include <rtems/dpmem.h>
-#include <rtems/object.h>
-#include <rtems/thread.h>
+#include <rtems/core/address.h>
+#include <rtems/core/object.h>
+#include <rtems/core/thread.h>
+
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/types.h>
+#include <rtems/rtems/dpmem.h>
 
 void _Dual_ported_memory_Manager_initialization(
   unsigned32 maximum_ports
@@ -32,7 +35,7 @@ rtems_status_code rtems_port_create(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_port_ident(
@@ -40,14 +43,14 @@ rtems_status_code rtems_port_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_port_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_port_internal_to_external(
@@ -56,7 +59,7 @@ rtems_status_code rtems_port_internal_to_external(
   void       **external
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_port_external_to_internal(
@@ -65,5 +68,5 @@ rtems_status_code rtems_port_external_to_internal(
   void       **internal
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
diff --git a/c/src/optman/rtems/no-event.c b/c/src/optman/rtems/no-event.c
index c987193711..a0b2cecee7 100644
--- a/c/src/optman/rtems/no-event.c
+++ b/c/src/optman/rtems/no-event.c
@@ -13,19 +13,20 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/event.h>
-#include <rtems/isr.h>
-#include <rtems/object.h>
-#include <rtems/options.h>
-#include <rtems/states.h>
-#include <rtems/thread.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/event.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/object.h>
+#include <rtems/rtems/options.h>
+#include <rtems/core/states.h>
+#include <rtems/core/thread.h>
 
 rtems_status_code rtems_event_send(
   Objects_Id         id,
   rtems_event_set event_in
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_event_receive(
@@ -35,6 +36,6 @@ rtems_status_code rtems_event_receive(
   rtems_event_set *event_out
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
diff --git a/c/src/optman/rtems/no-mp.c b/c/src/optman/rtems/no-mp.c
index 9446cabb29..f354397c9f 100644
--- a/c/src/optman/rtems/no-mp.c
+++ b/c/src/optman/rtems/no-mp.c
@@ -14,23 +14,18 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/config.h>
-#include <rtems/cpu.h>
-#include <rtems/event.h>
-#include <rtems/fatal.h>
-#include <rtems/intthrd.h>
-#include <rtems/message.h>
-#include <rtems/mp.h>
-#include <rtems/mpci.h>
-#include <rtems/mppkt.h>
-#include <rtems/part.h>
-#include <rtems/sem.h>
-#include <rtems/signal.h>
-#include <rtems/states.h>
-#include <rtems/tasks.h>
-#include <rtems/thread.h>
-#include <rtems/threadq.h>
-#include <rtems/watchdog.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/mp.h>
+#include <rtems/core/cpu.h>
+#include <rtems/core/interr.h>
+#include <rtems/core/mpci.h>
+#include <rtems/core/mppkt.h>
+#include <rtems/core/states.h>
+#include <rtems/core/thread.h>
+#include <rtems/core/threadq.h>
+#include <rtems/core/tqdata.h>
+#include <rtems/core/watchdog.h>
+#include <rtems/sysstate.h>
 
 void _Multiprocessing_Manager_initialization ( void )
 {
@@ -40,62 +35,76 @@ void rtems_multiprocessing_announce ( void )
 {
 }
 
-Thread _Multiprocessing_Receive_server (
-  Thread_Argument ignored
+void _MPCI_Handler_initialization( 
+  MPCI_Control            *users_mpci_table
 )
 {
 }
 
-void _MPCI_Handler_initialization ( void )
+void _MPCI_Initialization ( void )
 {
 }
 
-void _MPCI_Initialization ( void )
+void _MPCI_Register_packet_processor(
+  Objects_Classes        the_class,
+  MPCI_Packet_processor  the_packet_processor
+ 
+)
 {
 }
-
-rtems_packet_prefix *_MPCI_Get_packet ( void )
+ 
+MP_packet_Prefix *_MPCI_Get_packet ( void )
 {
   return NULL;
 }
 
 void _MPCI_Return_packet (
-  rtems_packet_prefix   *the_packet
+  MP_packet_Prefix   *the_packet
 )
 {
 }
 
 void _MPCI_Send_process_packet (
   unsigned32          destination,
-  rtems_packet_prefix   *the_packet
+  MP_packet_Prefix   *the_packet
 )
 {
 }
 
-rtems_status_code _MPCI_Send_request_packet (
+unsigned32 _MPCI_Send_request_packet (
   unsigned32          destination,
-  rtems_packet_prefix   *the_packet,
+  MP_packet_Prefix   *the_packet,
   States_Control      extra_state
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return 0;
 }
 
 void _MPCI_Send_response_packet (
   unsigned32          destination,
-  rtems_packet_prefix   *the_packet
+  MP_packet_Prefix   *the_packet
 )
 {
 }
 
-rtems_packet_prefix  *_MPCI_Receive_packet ( void )
+MP_packet_Prefix  *_MPCI_Receive_packet ( void )
 {
   return NULL;
 }
 
 Thread_Control *_MPCI_Process_response (
-  rtems_packet_prefix  *the_packet
+  MP_packet_Prefix  *the_packet
 )
 {
   return NULL;
 }
+
+void _MPCI_Receive_server( void )
+{
+}
+
+void _MPCI_Announce ( void )
+{
+}
+
+/* end of file */
diff --git a/c/src/optman/rtems/no-msg.c b/c/src/optman/rtems/no-msg.c
index 6e8503ee32..8cdfcf8090 100644
--- a/c/src/optman/rtems/no-msg.c
+++ b/c/src/optman/rtems/no-msg.c
@@ -14,16 +14,17 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/attr.h>
-#include <rtems/chain.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/attr.h>
+#include <rtems/core/chain.h>
 #include <rtems/config.h>
-#include <rtems/isr.h>
-#include <rtems/message.h>
-#include <rtems/object.h>
-#include <rtems/options.h>
-#include <rtems/states.h>
-#include <rtems/thread.h>
-#include <rtems/wkspace.h>
+#include <rtems/core/isr.h>
+#include <rtems/rtems/message.h>
+#include <rtems/core/object.h>
+#include <rtems/rtems/options.h>
+#include <rtems/core/states.h>
+#include <rtems/core/thread.h>
+#include <rtems/core/wkspace.h>
 
 void _Message_queue_Manager_initialization(
   unsigned32 maximum_message_queues
@@ -39,7 +40,7 @@ rtems_status_code rtems_message_queue_create(
   Objects_Id         *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_message_queue_ident(
@@ -48,14 +49,14 @@ rtems_status_code rtems_message_queue_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_message_queue_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_message_queue_send(
@@ -64,7 +65,7 @@ rtems_status_code rtems_message_queue_send(
   unsigned32            size
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_message_queue_urgent(
@@ -73,7 +74,7 @@ rtems_status_code rtems_message_queue_urgent(
   unsigned32            size
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_message_queue_broadcast(
@@ -83,7 +84,7 @@ rtems_status_code rtems_message_queue_broadcast(
   unsigned32           *count
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_message_queue_receive(
@@ -94,7 +95,7 @@ rtems_status_code rtems_message_queue_receive(
   rtems_interval        timeout
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_message_queue_flush(
@@ -102,7 +103,7 @@ rtems_status_code rtems_message_queue_flush(
   unsigned32 *count
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 unsigned32 _Message_queue_Flush_support(
@@ -130,5 +131,5 @@ rtems_status_code _Message_queue_Submit(
   Message_queue_Submit_types  submit_type
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
diff --git a/c/src/optman/rtems/no-part.c b/c/src/optman/rtems/no-part.c
index 0b0e51329f..45cf1a7d78 100644
--- a/c/src/optman/rtems/no-part.c
+++ b/c/src/optman/rtems/no-part.c
@@ -14,11 +14,12 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/address.h>
+#include <rtems/rtems/status.h>
+#include <rtems/core/address.h>
 #include <rtems/config.h>
-#include <rtems/object.h>
-#include <rtems/part.h>
-#include <rtems/thread.h>
+#include <rtems/core/object.h>
+#include <rtems/rtems/part.h>
+#include <rtems/core/thread.h>
 
 void _Partition_Manager_initialization(
   unsigned32 maximum_partitions
@@ -35,7 +36,7 @@ rtems_status_code rtems_partition_create(
   Objects_Id         *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_partition_ident(
@@ -44,14 +45,14 @@ rtems_status_code rtems_partition_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_partition_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_partition_get_buffer(
@@ -59,7 +60,7 @@ rtems_status_code rtems_partition_get_buffer(
   void       **buffer
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_partition_return_buffer(
@@ -67,5 +68,5 @@ rtems_status_code rtems_partition_return_buffer(
   void       *buffer
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
diff --git a/c/src/optman/rtems/no-region.c b/c/src/optman/rtems/no-region.c
index 490d1371c0..4985000cab 100644
--- a/c/src/optman/rtems/no-region.c
+++ b/c/src/optman/rtems/no-region.c
@@ -14,12 +14,13 @@
  */
 
 #include <rtems/system.h>
+#include <rtems/rtems/status.h>
 #include <rtems/config.h>
-#include <rtems/object.h>
-#include <rtems/options.h>
-#include <rtems/region.h>
-#include <rtems/states.h>
-#include <rtems/thread.h>
+#include <rtems/core/object.h>
+#include <rtems/rtems/options.h>
+#include <rtems/rtems/region.h>
+#include <rtems/core/states.h>
+#include <rtems/core/thread.h>
 
 void _Region_Manager_initialization(
   unsigned32 maximum_regions
@@ -36,7 +37,7 @@ rtems_status_code rtems_region_create(
   Objects_Id         *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_region_ident(
@@ -44,14 +45,14 @@ rtems_status_code rtems_region_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_region_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_region_get_segment(
@@ -62,7 +63,7 @@ rtems_status_code rtems_region_get_segment(
   void              **segment
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_region_get_segment_size(
@@ -71,7 +72,7 @@ rtems_status_code rtems_region_get_segment_size(
   unsigned32        *size
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_region_return_segment(
@@ -79,5 +80,5 @@ rtems_status_code rtems_region_return_segment(
   void       *segment
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
diff --git a/c/src/optman/rtems/no-rtmon.c b/c/src/optman/rtems/no-rtmon.c
index 8371f19a7f..3c633721cc 100644
--- a/c/src/optman/rtems/no-rtmon.c
+++ b/c/src/optman/rtems/no-rtmon.c
@@ -14,10 +14,13 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/isr.h>
-#include <rtems/object.h>
-#include <rtems/ratemon.h>
-#include <rtems/thread.h>
+#include <rtems/rtems/status.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/object.h>
+#include <rtems/core/thread.h>
+
+#include <rtems/rtems/types.h>
+#include <rtems/rtems/ratemon.h>
 
 void _Rate_monotonic_Manager_initialization(
   unsigned32 maximum_periods
@@ -30,7 +33,7 @@ rtems_status_code rtems_rate_monotonic_create(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_rate_monotonic_ident(
@@ -38,21 +41,21 @@ rtems_status_code rtems_rate_monotonic_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_rate_monotonic_cancel(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_rate_monotonic_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_rate_monotonic_period(
@@ -60,7 +63,7 @@ rtems_status_code rtems_rate_monotonic_period(
   rtems_interval length
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 void _Rate_monotonic_Timeout(
diff --git a/c/src/optman/rtems/no-sem.c b/c/src/optman/rtems/no-sem.c
index d96b1693e2..eabd8e12a9 100644
--- a/c/src/optman/rtems/no-sem.c
+++ b/c/src/optman/rtems/no-sem.c
@@ -14,15 +14,16 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/attr.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/attr.h>
 #include <rtems/config.h>
-#include <rtems/isr.h>
-#include <rtems/object.h>
-#include <rtems/options.h>
-#include <rtems/sem.h>
-#include <rtems/states.h>
-#include <rtems/thread.h>
-#include <rtems/threadq.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/object.h>
+#include <rtems/rtems/options.h>
+#include <rtems/rtems/sem.h>
+#include <rtems/core/states.h>
+#include <rtems/core/thread.h>
+#include <rtems/core/threadq.h>
 
 void _Semaphore_Manager_initialization(
   unsigned32 maximum_semaphores
@@ -38,7 +39,7 @@ rtems_status_code rtems_semaphore_create(
   Objects_Id           *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_semaphore_ident(
@@ -47,14 +48,14 @@ rtems_status_code rtems_semaphore_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_semaphore_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_semaphore_obtain(
@@ -63,14 +64,14 @@ rtems_status_code rtems_semaphore_obtain(
   rtems_interval timeout
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_semaphore_release(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 boolean _Semaphore_Seize(
diff --git a/c/src/optman/rtems/no-signal.c b/c/src/optman/rtems/no-signal.c
index fedbf87db3..2193881d18 100644
--- a/c/src/optman/rtems/no-signal.c
+++ b/c/src/optman/rtems/no-signal.c
@@ -14,18 +14,24 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/asr.h>
-#include <rtems/isr.h>
-#include <rtems/modes.h>
-#include <rtems/signal.h>
-#include <rtems/thread.h>
+#include <rtems/rtems/status.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/thread.h>
 
+#include <rtems/rtems/asr.h>
+#include <rtems/rtems/modes.h>
+#include <rtems/rtems/signal.h>
+
+void _Signal_Manager_initialization( void )
+{
+}
+ 
 rtems_status_code rtems_signal_catch(
   rtems_asr_entry   handler,
   rtems_mode        mode_set
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_signal_send(
@@ -33,5 +39,7 @@ rtems_status_code rtems_signal_send(
   rtems_signal_set signal_set
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
+
+/* end of file */
diff --git a/c/src/optman/rtems/no-timer.c b/c/src/optman/rtems/no-timer.c
index 1f6deb2e4f..0e32a501a6 100644
--- a/c/src/optman/rtems/no-timer.c
+++ b/c/src/optman/rtems/no-timer.c
@@ -14,11 +14,14 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/object.h>
-#include <rtems/thread.h>
-#include <rtems/timer.h>
-#include <rtems/tod.h>
-#include <rtems/watchdog.h>
+#include <rtems/rtems/status.h>
+#include <rtems/core/object.h>
+#include <rtems/core/thread.h>
+#include <rtems/core/tod.h>
+#include <rtems/core/watchdog.h>
+
+#include <rtems/rtems/types.h>
+#include <rtems/rtems/timer.h>
 
 void _Timer_Manager_initialization(
   unsigned32 maximum_timers
@@ -31,7 +34,7 @@ rtems_status_code rtems_timer_create(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_timer_ident(
@@ -39,46 +42,46 @@ rtems_status_code rtems_timer_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_timer_cancel(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_timer_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_timer_fire_after(
-  Objects_Id         id,
-  rtems_interval  ticks,
-  Timer_Service      routine,
-  void              *user_data
+  Objects_Id                         id,
+  rtems_interval                     ticks,
+  rtems_timer_service_routine_entry  routine,
+  void                              *user_data
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_timer_fire_when(
-  Objects_Id          id,
-  rtems_time_of_day        *wall_time,
-  Timer_Service       routine,
-  void               *user_data
+  Objects_Id                         id,
+  rtems_time_of_day                 *wall_time,
+  rtems_timer_service_routine_entry  routine,
+  void                              *user_data
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_timer_reset(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
diff --git a/c/src/optman/sapi/no-ext.c b/c/src/optman/sapi/no-ext.c
index db1df3624f..ea5f04d672 100644
--- a/c/src/optman/sapi/no-ext.c
+++ b/c/src/optman/sapi/no-ext.c
@@ -14,8 +14,10 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/object.h>
-#include <rtems/thread.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/support.h>
+#include <rtems/core/object.h>
+#include <rtems/core/thread.h>
 #include <rtems/extension.h>
 
 void _Extension_Manager_initialization(
@@ -25,12 +27,12 @@ void _Extension_Manager_initialization(
 }
 
 rtems_status_code rtems_extension_create(
-  rtems_name                     name,
+  rtems_name              name,
   rtems_extensions_table *extension_table,
-  Objects_Id                    *id
+  Objects_Id             *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_extension_ident(
@@ -38,12 +40,12 @@ rtems_status_code rtems_extension_ident(
   Objects_Id   *id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_extension_delete(
   Objects_Id id
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
diff --git a/c/src/optman/sapi/no-io.c b/c/src/optman/sapi/no-io.c
index d0fc7676f1..058ecfbfd2 100644
--- a/c/src/optman/sapi/no-io.c
+++ b/c/src/optman/sapi/no-io.c
@@ -14,10 +14,11 @@
  */
 
 #include <rtems/system.h>
+#include <rtems/rtems/status.h>
 #include <rtems/config.h>
 #include <rtems/io.h>
-#include <rtems/isr.h>
-#include <rtems/thread.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/thread.h>
 
 void _IO_Initialize_all_drivers( void )
 {
@@ -46,7 +47,7 @@ rtems_status_code rtems_io_initialize(
   void             *argument
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_io_open(
@@ -55,7 +56,7 @@ rtems_status_code rtems_io_open(
   void             *argument
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_io_close(
@@ -64,7 +65,7 @@ rtems_status_code rtems_io_close(
   void             *argument
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_io_read(
@@ -73,7 +74,7 @@ rtems_status_code rtems_io_read(
   void             *argument
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_io_write(
@@ -82,7 +83,7 @@ rtems_status_code rtems_io_write(
   void             *argument
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }
 
 rtems_status_code rtems_io_control(
@@ -91,5 +92,5 @@ rtems_status_code rtems_io_control(
   void             *argument
 )
 {
-  return( RTEMS_NOT_CONFIGURED );
+  return RTEMS_NOT_CONFIGURED;
 }