From 75699dbb0f72cdeb2866a252d4fd46a1bf13d3e1 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 8 Apr 2010 07:42:54 -0700
Subject: [PATCH] librados: reduce #includes

---
 src/osdc/librados.h | 10 +++-------
 src/rados.cc        |  1 +
 src/radosacl.cc     |  1 +
 src/testradospp.cc  |  1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/osdc/librados.h b/src/osdc/librados.h
index 4966b442d887a..9f64dbafcb5a2 100644
--- a/src/osdc/librados.h
+++ b/src/osdc/librados.h
@@ -2,19 +2,12 @@
 #define __LIBRADOS_H
 
 #ifdef __cplusplus
-
-#include "include/types.h"
-
 extern "C" {
 #endif
 
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <string.h>
-#include <stdbool.h>
-
-#include "include/msgr.h"
-#include "include/rados.h"
 
 /* initialization */
 int rados_initialize(int argc, const char **argv); /* arguments are optional */
@@ -93,6 +86,9 @@ int rados_aio_read(rados_pool_t pool, const char *oid, off_t off, char *buf, siz
 #ifdef __cplusplus
 }
 
+#include "include/types.h"
+#include <stdbool.h>
+
 class RadosClient;
 
 class Rados
diff --git a/src/rados.cc b/src/rados.cc
index fb0155428478a..cee521519959a 100644
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -12,6 +12,7 @@
  * 
  */
 
+#include "include/types.h"
 #include "osdc/rados_bencher.h"
 #include "osdc/librados.h"
 
diff --git a/src/radosacl.cc b/src/radosacl.cc
index a6c2611f8e304..92c2cf264548b 100644
--- a/src/radosacl.cc
+++ b/src/radosacl.cc
@@ -12,6 +12,7 @@
  * 
  */
 
+#include "include/types.h"
 #include "osdc/librados.h"
 
 #include <iostream>
diff --git a/src/testradospp.cc b/src/testradospp.cc
index b50ec9dca5bda..be73d6c4540d8 100644
--- a/src/testradospp.cc
+++ b/src/testradospp.cc
@@ -12,6 +12,7 @@
  * 
  */
 
+#include "include/types.h"
 #include "osdc/librados.h"
 
 #include <iostream>
-- 
2.47.3