msg: add missing #includes for messages

And remove that unused max() macro.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

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;
 

src/messages/MDiscoverReply.h

@@ -23,7 +23,6 @@
 #include <string>
 using namespace std;
 
-#define max(a,b)  ((a)>(b) ? (a):(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());
   }
 

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

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;