summaryrefslogtreecommitdiff
path: root/src/mon/Monitor.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mon/Monitor.h')
-rw-r--r--src/mon/Monitor.h25
1 files changed, 10 insertions, 15 deletions
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 1fddcd45e37..8299f00c258 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -23,31 +23,26 @@
#ifndef CEPH_MONITOR_H
#define CEPH_MONITOR_H
-#include "include/types.h"
-#include "msg/Messenger.h"
-
-#include "common/Timer.h"
-
-#include "MonMap.h"
-#include "Elector.h"
-#include "Paxos.h"
-#include "Session.h"
+#include "mon_types.h"
-#include "osd/OSDMap.h"
+#include <memory>
+#include <errno.h>
+#include "common/Timer.h"
#include "common/LogClient.h"
-
#include "auth/cephx/CephxKeyServer.h"
#include "auth/AuthMethodList.h"
#include "auth/KeyRing.h"
-
+#include "msg/Messenger.h"
+#include "osd/OSDMap.h"
#include "perfglue/heap_profiler.h"
#include "messages/MMonCommand.h"
-#include <memory>
-#include <errno.h>
-
+#include "MonMap.h"
+#include "Elector.h"
+#include "Paxos.h"
+#include "Session.h"
#define CEPH_MON_PROTOCOL 9 /* cluster internal */