diff --git a/src/rbus/rbus_asyncsubscribe.h b/src/rbus/rbus_asyncsubscribe.h
index 959d3ddc..4df56a23 100644
--- a/src/rbus/rbus_asyncsubscribe.h
+++ b/src/rbus/rbus_asyncsubscribe.h
@@ -25,7 +25,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#define RBUS_SUBSCRIBE_MAXWAIT   60000      /*subscribe retry max wait between retries in miliseconds*/
 void rbusAsyncSubscribe_AddSubscription(rbusEventSubscription_t* subscription, rbusMessage payload);
 bool rbusAsyncSubscribe_RemoveSubscription(rbusEventSubscription_t* subscription);
 bool rbusAsyncSubscribe_GetSubscription(rbusHandle_t handle, char const* eventName, rbusFilter_t filter);
diff --git a/src/rbus/rbus_handle.c b/src/rbus/rbus_handle.c
index 99ff8aa7..a9ad212c 100644
--- a/src/rbus/rbus_handle.c
+++ b/src/rbus/rbus_handle.c
@@ -19,7 +19,9 @@
 #include "rbus_handle.h"
 #include <string.h>
 #include <rbuscore.h>
-
+#include <rtMemory.h>
+#include <unistd.h>
+#include <stdlib.h>
 static rtVector gHandleList = NULL;
 
 #define VERIFY_NULL(T,R) if(NULL == T){ RBUSLOG_ERROR(#T" is NULL"); R; }
diff --git a/src/rbus/rbus_handle.h b/src/rbus/rbus_handle.h
index 513169d8..503a8db9 100644
--- a/src/rbus/rbus_handle.h
+++ b/src/rbus/rbus_handle.h
@@ -29,6 +29,8 @@ extern "C" {
 #endif
 
 #define RBUS_SUBSCRIBE_TIMEOUT   600000     /*subscribe retry timeout in miliseconds*/
+#define RBUS_SUBSCRIBE_MAXWAIT   60000      /*subscribe retry max wait between retries in miliseconds*/
+
 /*
   RBUS_MAX_HANDLES 16