Do not include msgr_rdma.h into messenger.h

src/messenger.cpp

@@ -11,6 +11,9 @@
 
 #include "addr_util.h"
 #include "messenger.h"
+#ifdef WITH_RDMA
+#include "msgr_rdma.h"
+#endif
 
 void osd_messenger_t::init()
 {

src/messenger.h

@@ -18,10 +18,6 @@
 #include "timerfd_manager.h"
 #include <ringloop.h>
 
-#ifdef WITH_RDMA
-#include "msgr_rdma.h"
-#endif
-
 #define CL_READ_HDR 1
 #define CL_READ_DATA 2
 #define CL_READ_REPLY_DATA 3
@@ -44,6 +40,11 @@ struct msgr_sendp_t
     int flags;
 };
 
+#ifdef WITH_RDMA
+struct msgr_rdma_connection_t;
+struct msgr_rdma_context_t;
+#endif
+
 struct osd_client_t
 {
     int refs = 0;

src/msgr_stop.cpp

@@ -5,6 +5,9 @@
 #include <assert.h>
 
 #include "messenger.h"
+#ifdef WITH_RDMA
+#include "msgr_rdma.h"
+#endif
 
 void osd_messenger_t::cancel_osd_ops(osd_client_t *cl)
 {

src/osd_secondary.cpp

@@ -2,6 +2,9 @@
 // License: VNPL-1.1 (see README.md for details)
 
 #include "osd.h"
+#ifdef WITH_RDMA
+#include "msgr_rdma.h"
+#endif
 
 #include "json11/json11.hpp"