From c0e804dbfb6cc662783563a9145b5e349044cc26 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Fri, 10 Jun 2011 13:38:14 -0700
Subject: [PATCH] ObjectStore: clean up includes a little bit

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 src/os/ObjectStore.h | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 2ab80ef9d89b3..9ad89d892385e 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -16,16 +16,14 @@
 #ifndef CEPH_OBJECTSTORE_H
 #define CEPH_OBJECTSTORE_H
 
-#include "include/types.h"
 #include "include/Context.h"
 #include "include/buffer.h"
-
-#include "include/Distribution.h"
-
+#include "include/types.h"
 #include "osd/osd_types.h"
 
-#include <sys/stat.h>
 #include <errno.h>
+#include <sys/stat.h>
+#include <vector>
 
 #ifdef DARWIN
 #include <sys/statvfs.h>
@@ -33,14 +31,9 @@
 #include <sys/vfs.h>    /* or <sys/statfs.h> */
 #endif /* DARWIN */
 
-#include <vector>
 using std::vector;
 using std::string;
 
-#ifndef MIN
-# define MIN(a,b) ((a) < (b) ? (a):(b))
-#endif
-
 typedef uint64_t collection_list_handle_t;
 
 /*
-- 
2.39.5