From e69dc004603d74c4ba1e1789e2415cccb908f0a4 Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Fri, 18 Jan 2013 11:51:56 +0000
Subject: [PATCH] Dont duplicate headers nor global variables.

This commit was SVN r27864.
---
 orte/tools/orte-info/orte-info.c | 1 -
 orte/tools/orte-info/orte-info.h | 2 --
 orte/tools/orte-info/version.c   | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/orte/tools/orte-info/orte-info.c b/orte/tools/orte-info/orte-info.c
index bbf56e7c87..b8265229a5 100644
--- a/orte/tools/orte-info/orte-info.c
+++ b/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";
 
diff --git a/orte/tools/orte-info/orte-info.h b/orte/tools/orte-info/orte-info.h
index 6172c5ad50..afee6ee64a 100644
--- a/orte/tools/orte-info/orte-info.h
+++ b/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;
 
diff --git a/orte/tools/orte-info/version.c b/orte/tools/orte-info/version.c
index 8bb7db9543..66b6550088 100644
--- a/orte/tools/orte-info/version.c
+++ b/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"
 
 /*