- Remove two headers (and actually include rml.h) prior to test of

removal script...

This commit was SVN r20765.

ompi/mca/btl/tcp/btl_tcp_proc.c

@@ -33,7 +33,6 @@
 #include "opal/util/argv.h"
 #include "opal/util/if.h"
 #include "opal/util/net.h"
-#include "orte/mca/oob/tcp/oob_tcp_addr.h"
 
 #include "btl_tcp.h"
 #include "btl_tcp_proc.h"

ompi/mca/common/sm/common_sm_mmap.c

@@ -49,7 +49,7 @@
 #include "opal/util/output.h"
 #include "opal/align.h"
 #include "orte/mca/rml/rml_types.h"
-#include "orte/mca/rml/base/base.h"
+#include "orte/mca/rml/rml.h"
 
 #include "ompi/mca/dpm/dpm.h"