From 01581524c74e62643a71c07cdbb88564f0428cc3 Mon Sep 17 00:00:00 2001
From: Swen Boehm <boehms@ornl.gov>
Date: Tue, 10 Oct 2017 16:00:52 -0400
Subject: [PATCH 1/2] make mpool.h installable

---
 src/ucs/Makefile.am          | 2 +-
 src/ucs/datastruct/mpool.h   | 4 +---
 src/ucs/datastruct/mpool.inl | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ucs/Makefile.am b/src/ucs/Makefile.am
index 04f9a809979..e64bc97b06f 100644
--- a/src/ucs/Makefile.am
+++ b/src/ucs/Makefile.am
@@ -38,6 +38,7 @@ nobase_dist_libucs_la_HEADERS = \
 	config/types.h \
 	datastruct/callbackq.h \
 	datastruct/list_types.h \
+	datastruct/mpool.h \
 	debug/check.h \
 	debug/debug.h \
 	debug/log.h \
@@ -62,7 +63,6 @@ noinst_HEADERS = \
 	datastruct/hash.h \
 	datastruct/list.h \
 	datastruct/mpmc.h \
-	datastruct/mpool.h \
 	datastruct/mpool.inl \
 	datastruct/pgtable.h \
 	datastruct/ptr_array.h \
diff --git a/src/ucs/datastruct/mpool.h b/src/ucs/datastruct/mpool.h
index ebe62a970fe..312356bde51 100644
--- a/src/ucs/datastruct/mpool.h
+++ b/src/ucs/datastruct/mpool.h
@@ -7,9 +7,7 @@
 #ifndef UCS_MPOOL_H_
 #define UCS_MPOOL_H_
 
-
-#include <ucs/debug/log.h>
-#include <ucs/debug/memtrack.h>
+#include <stdlib.h>
 #include <ucs/type/status.h>
 
 
diff --git a/src/ucs/datastruct/mpool.inl b/src/ucs/datastruct/mpool.inl
index d56a6911b71..4f737522828 100644
--- a/src/ucs/datastruct/mpool.inl
+++ b/src/ucs/datastruct/mpool.inl
@@ -9,6 +9,7 @@
 
 #include "mpool.h"
 
+#include <ucs/debug/log.h>
 #include <ucs/sys/checker.h>
 #include <ucs/sys/sys.h>
 

From 157316d7daa4e51ae6b97a6ca08315634865c294 Mon Sep 17 00:00:00 2001
From: Swen Boehm <boehms@ornl.gov>
Date: Wed, 11 Oct 2017 08:46:04 -0400
Subject: [PATCH 2/2] Address feedback

---
 src/ucs/datastruct/mpool.h   | 2 +-
 src/ucs/datastruct/mpool.inl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ucs/datastruct/mpool.h b/src/ucs/datastruct/mpool.h
index 312356bde51..ab850fe0964 100644
--- a/src/ucs/datastruct/mpool.h
+++ b/src/ucs/datastruct/mpool.h
@@ -7,7 +7,7 @@
 #ifndef UCS_MPOOL_H_
 #define UCS_MPOOL_H_
 
-#include <stdlib.h>
+#include <stddef.h>
 #include <ucs/type/status.h>
 
 
diff --git a/src/ucs/datastruct/mpool.inl b/src/ucs/datastruct/mpool.inl
index 4f737522828..d06e2f95bcd 100644
--- a/src/ucs/datastruct/mpool.inl
+++ b/src/ucs/datastruct/mpool.inl
@@ -9,7 +9,7 @@
 
 #include "mpool.h"
 
-#include <ucs/debug/log.h>
+#include <ucs/config/global_opts.h>
 #include <ucs/sys/checker.h>
 #include <ucs/sys/sys.h>