diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index c88583a1952..3e1b0e6ab49 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -15,6 +15,8 @@
 #ifndef CEPH_MCACHEEXPIRE_H
 #define CEPH_MCACHEEXPIRE_H
 
+#include "mds/mdstypes.h"
+
 class MCacheExpire : public Message {
   __s32 from;
 
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index 0b424157a68..7a41be1e3f6 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -23,7 +23,6 @@
 #include <string>
 using namespace std;
 
-#define max(a,b)  ((a)>(b) ? (a):(b))
 
 
 /**
diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h
index e042bef00c8..6f326aa8cd0 100644
--- a/src/messages/MGenericMessage.h
+++ b/src/messages/MGenericMessage.h
@@ -23,7 +23,7 @@ class MGenericMessage : public Message {
   //long pcid;
 
  public:
-  MGenericMessage(int t) : Message(t) { 
+  MGenericMessage(int t=0) : Message(t) { 
     snprintf(tname, sizeof(tname), "generic%d", get_type());
   }
 
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index 0d66a001e24..66cbe212f38 100644
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -18,6 +18,7 @@
 
 #include "msg/Message.h"
 #include "mds/locks.h"
+#include "mds/SimpleLock.h"
 
 class MLock : public Message {
   int32_t     action;  // action type
diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index 19ee76673d1..21796f4b8cb 100644
--- a/src/messages/MOSDPGInfo.h
+++ b/src/messages/MOSDPGInfo.h
@@ -17,6 +17,7 @@
 #define CEPH_MOSDPGINFO_H
 
 #include "msg/Message.h"
+#include "osd/PG.h"
 
 class MOSDPGInfo : public Message {
   epoch_t epoch;