Dont duplicate headers nor global variables.

This commit was SVN r27864.

orte/tools/orte-info/orte-info.c

@@ -60,7 +60,6 @@ bool orte_info_pretty = true;
 opal_cmd_line_t *orte_info_cmd_line = NULL;
 
 const char *orte_info_type_all = "all";
-const char *orte_info_type_orte = "orte";
 const char *orte_info_type_opal = "opal";
 const char *orte_info_type_base = "base";
 

orte/tools/orte-info/orte-info.h

@@ -36,8 +36,6 @@ extern bool orte_info_pretty;
 extern opal_cmd_line_t *orte_info_cmd_line;
 
 extern const char *orte_info_type_all;
-extern const char *orte_info_type_orte;
-extern const char *orte_info_type_orte;
 extern const char *orte_info_type_opal;
 extern const char *orte_info_type_base;
 

orte/tools/orte-info/version.c

@@ -25,10 +25,10 @@
 
 #include "opal/version.h"
 #include "orte/version.h"
-#include "orte/version.h"
 #include "opal/mca/base/base.h"
 #include "opal/util/printf.h"
 
+#include "orte/runtime/orte_info_support.h"
 #include "orte/tools/orte-info/orte-info.h"
 
 /*