From dc6f4a0feb87ecf04c127db3a85fc385798dc986 Mon Sep 17 00:00:00 2001
From: Joshua Ladd <joshual@mellanox.com>
Date: Tue, 6 Dec 2016 06:42:26 +0200
Subject: [PATCH] Remove shmemx.h from shmem.h. Add shmem.h to shmemx.h Fixes
 #2483 Signed-off-by: Joshua Ladd <joshual@mellanox.com>

---
 oshmem/include/shmem.h.in | 1 -
 oshmem/include/shmemx.h   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/oshmem/include/shmem.h.in b/oshmem/include/shmem.h.in
index 950b59fa8a..06b8882c5e 100644
--- a/oshmem/include/shmem.h.in
+++ b/oshmem/include/shmem.h.in
@@ -48,7 +48,6 @@
 #endif
 
 #include <shmem-compat.h>
-#include <shmemx.h>
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
diff --git a/oshmem/include/shmemx.h b/oshmem/include/shmemx.h
index da1fb7f1d5..4186cc04c6 100644
--- a/oshmem/include/shmemx.h
+++ b/oshmem/include/shmemx.h
@@ -12,6 +12,8 @@
 #ifndef OSHMEM_SHMEMX_H
 #define OSHMEM_SHMEMX_H
 
+#include <shmem.h>
+
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif