Index: orte/mca/odls/base/base.h
===================================================================
--- orte/mca/odls/base/base.h	(revision 20705)
+++ orte/mca/odls/base/base.h	(working copy)
@@ -29,9 +29,10 @@
 #include "opal/mca/mca.h"
 #include "opal/class/opal_list.h"
 
+#if !ORTE_DISABLE_FULL_SUPPORT
 #include "orte/mca/odls/odls.h"
+#endif
 
-
 BEGIN_C_DECLS
 
 /**
Index: orte/mca/grpcomm/grpcomm.h
===================================================================
--- orte/mca/grpcomm/grpcomm.h	(revision 20705)
+++ orte/mca/grpcomm/grpcomm.h	(working copy)
@@ -44,7 +44,6 @@
 
 #include "orte/mca/rmaps/rmaps_types.h"
 #include "orte/mca/rml/rml_types.h"
-#include "orte/mca/odls/odls_types.h"
 
 #include "orte/mca/grpcomm/grpcomm_types.h"
 
Index: orte/runtime/orte_globals.c
===================================================================
--- orte/runtime/orte_globals.c	(revision 20705)
+++ orte/runtime/orte_globals.c	(working copy)
@@ -40,11 +40,11 @@
 #include "orte/runtime/runtime_internals.h"
 #include "orte/runtime/orte_globals.h"
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 /* need the data type support functions here */
 #include "orte/runtime/data_type_support/orte_dt_support.h"
 
-#if !ORTE_DISABLE_FULL_SUPPORT
-
 /* globals used by RTE */
 bool orte_timing;
 bool orte_debug_daemons_file_flag = false;
@@ -135,7 +135,8 @@
             opal_output_set_verbosity(orte_debug_output, 1);
         }
     }
-        
+
+#if !ORTE_DISABLE_FULL_SUPPORT
     /** register the base system types with the DSS */
     tmp = ORTE_STD_CNTR;
     if (ORTE_SUCCESS != (rc = opal_dss.register_type(orte_dt_pack_std_cntr,
@@ -192,7 +193,6 @@
         return rc;
     }
 
-#if !ORTE_DISABLE_FULL_SUPPORT
     /* get a clean output channel too */
     {
         opal_output_stream_t lds;
Index: orte/runtime/data_type_support/orte_dt_support.h
===================================================================
--- orte/runtime/data_type_support/orte_dt_support.h	(revision 20705)
+++ orte/runtime/data_type_support/orte_dt_support.h	(working copy)
@@ -30,7 +30,9 @@
 
 #include "opal/dss/dss_types.h"
 #include "orte/mca/grpcomm/grpcomm_types.h"
+#if !ORTE_DISABLE_FULL_SUPPORT
 #include "orte/mca/odls/odls_types.h"
+#endif
 #include "orte/mca/plm/plm_types.h"
 #include "orte/mca/rmaps/rmaps_types.h"
 #include "orte/mca/rml/rml_types.h"