diff --git a/c/src/exec/sapi/include/confdefs.h b/c/src/exec/sapi/include/confdefs.h
index 7b7bcffb26..f502118744 100644
--- a/c/src/exec/sapi/include/confdefs.h
+++ b/c/src/exec/sapi/include/confdefs.h
@@ -184,19 +184,19 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
  */
 
 #ifdef CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-#ifdef CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
 #endif
 #ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#ifdef CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #endif 
 #ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#ifdef CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #endif 
 #ifdef CONFIGURE_TEST_NEEDS_RTC_DRIVER
-#ifdef CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
 #endif 
 #ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
 #endif
 
 
@@ -240,14 +240,10 @@ rtems_driver_address_table Device_drivers[] = {
  *  overridden by the user.
  */
 
-#ifndef CONFIGURE_HAS_OWN_NUMBER_OF_DEVICES
-
 #ifndef CONFIGURE_MAXIMUM_DEVICES
 #define CONFIGURE_MAXIMUM_DEVICES   20
 #endif
 
-#endif /* CONFIGURE_HAS_OWN_NUMBER_OF_DEVICES */
-
 /*
  *  Default Configuration Table.  This table contains the most values set in
  *  the RTEMS Test Suite.  Each value may be overridden within each test to