Mac build fixes.

lib/handle_ping.c

@@ -18,6 +18,10 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "logging_mosq.h"
 #include "memory_mosq.h"
@@ -28,9 +32,6 @@ Contributors:
 #include "read_handle.h"
 #include "send_mosq.h"
 #include "util_mosq.h"
-#ifdef WITH_BROKER
-#include "mosquitto_broker_internal.h"
-#endif
 
 int handle__pingreq(struct mosquitto *mosq)
 {

lib/handle_pubackcomp.c

@@ -18,6 +18,10 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "logging_mosq.h"
 #include "memory_mosq.h"
@@ -29,10 +33,6 @@ Contributors:
 #include "send_mosq.h"
 #include "util_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#endif
-
 
 #ifdef WITH_BROKER
 int handle__pubackcomp(struct mosquitto_db *db, struct mosquitto *mosq, const char *type)

lib/handle_pubrec.c

@@ -18,6 +18,10 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "logging_mosq.h"
 #include "memory_mosq.h"
@@ -28,10 +32,6 @@ Contributors:
 #include "read_handle.h"
 #include "send_mosq.h"
 #include "util_mosq.h"
-#ifdef WITH_BROKER
-#include "mosquitto_broker_internal.h"
-#endif
-
 
 int handle__pubrec(struct mosquitto *mosq)
 {

lib/handle_pubrel.c

@@ -18,6 +18,10 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "logging_mosq.h"
 #include "memory_mosq.h"
@@ -29,10 +33,6 @@ Contributors:
 #include "send_mosq.h"
 #include "util_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#endif
-
 
 int handle__pubrel(struct mosquitto_db *db, struct mosquitto *mosq)
 {

lib/handle_suback.c

@@ -16,16 +16,16 @@ Contributors:
 
 #include <assert.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "mosquitto_internal.h"
 #include "logging_mosq.h"
 #include "memory_mosq.h"
 #include "packet_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#endif
-
 
 int handle__suback(struct mosquitto *mosq)
 {

lib/handle_unsuback.c

@@ -18,6 +18,10 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "logging_mosq.h"
 #include "memory_mosq.h"
@@ -28,9 +32,6 @@ Contributors:
 #include "read_handle.h"
 #include "send_mosq.h"
 #include "util_mosq.h"
-#ifdef WITH_BROKER
-#include "mosquitto_broker_internal.h"
-#endif
 
 
 int handle__unsuback(struct mosquitto *mosq)

lib/send_connect.c

@@ -17,6 +17,10 @@ Contributors:
 #include <assert.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "logging_mosq.h"
 #include "memory_mosq.h"
 #include "mosquitto.h"
@@ -24,10 +28,6 @@ Contributors:
 #include "mqtt3_protocol.h"
 #include "packet_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#endif
-
 int send__connect(struct mosquitto *mosq, uint16_t keepalive, bool clean_session)
 {
 	struct mosquitto__packet *packet = NULL;

lib/send_disconnect.c

@@ -16,16 +16,16 @@ Contributors:
 
 #include <assert.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "mosquitto_internal.h"
 #include "logging_mosq.h"
 #include "mqtt3_protocol.h"
 #include "send_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#endif
-
 
 int send__disconnect(struct mosquitto *mosq)
 {

lib/send_mosq.c

@@ -18,6 +18,13 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#  include "sys_tree.h"
+#else
+#  define G_PUB_BYTES_SENT_INC(A)
+#endif
+
 #include "mosquitto.h"
 #include "mosquitto_internal.h"
 #include "logging_mosq.h"
@@ -29,13 +36,6 @@ Contributors:
 #include "time_mosq.h"
 #include "util_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#  include "sys_tree.h"
-#else
-#  define G_PUB_BYTES_SENT_INC(A)
-#endif
-
 int send__pingreq(struct mosquitto *mosq)
 {
 	int rc;

lib/send_publish.c

@@ -15,9 +15,15 @@ Contributors:
 */
 
 #include <assert.h>
-//#include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#  include "sys_tree.h"
+#else
+#  define G_PUB_BYTES_SENT_INC(A)
+#endif
+
 #include "mosquitto.h"
 #include "mosquitto_internal.h"
 #include "logging_mosq.h"
@@ -26,15 +32,6 @@ Contributors:
 #include "net_mosq.h"
 #include "packet_mosq.h"
 #include "send_mosq.h"
-//#include "time_mosq.h"
-//#include "util_mosq.h"
-
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#  include "sys_tree.h"
-#else
-#  define G_PUB_BYTES_SENT_INC(A)
-#endif
 
 
 int send__publish(struct mosquitto *mosq, uint16_t mid, const char *topic, uint32_t payloadlen, const void *payload, int qos, bool retain, bool dup)

lib/send_subscribe.c

@@ -17,6 +17,10 @@ Contributors:
 #include <assert.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "mosquitto_internal.h"
 #include "logging_mosq.h"
@@ -25,10 +29,6 @@ Contributors:
 #include "packet_mosq.h"
 #include "util_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#endif
-
 
 int send__subscribe(struct mosquitto *mosq, int *mid, const char *topic, uint8_t topic_qos)
 {

lib/send_unsubscribe.c

@@ -17,18 +17,17 @@ Contributors:
 #include <assert.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "logging_mosq.h"
 #include "memory_mosq.h"
 #include "mqtt3_protocol.h"
-//#include "net_mosq.h"
 #include "packet_mosq.h"
-//#include "send_mosq.h"
 #include "util_mosq.h"
 
-#ifdef WITH_BROKER
-#  include "mosquitto_broker_internal.h"
-#endif
 
 int send__unsubscribe(struct mosquitto *mosq, int *mid, const char *topic)
 {

lib/util_mosq.c

@@ -27,6 +27,10 @@ Contributors:
 #endif
 
 
+#ifdef WITH_BROKER
+#include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "memory_mosq.h"
 #include "net_mosq.h"
@@ -35,10 +39,6 @@ Contributors:
 #include "tls_mosq.h"
 #include "util_mosq.h"
 
-#ifdef WITH_BROKER
-#include "mosquitto_broker_internal.h"
-#endif
-
 #ifdef WITH_WEBSOCKETS
 #include <libwebsockets.h>
 #endif

lib/will_mosq.c

@@ -17,6 +17,10 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_BROKER
+#  include "mosquitto_broker_internal.h"
+#endif
+
 #include "mosquitto.h"
 #include "mosquitto_internal.h"
 #include "logging_mosq.h"

src/plugin.c

@@ -16,9 +16,9 @@ Contributors:
 
 #include "config.h"
 
+#include "mosquitto_broker_internal.h"
 #include "mosquitto_internal.h"
 #include "mosquitto_broker.h"
-#include "mosquitto_broker_internal.h"
 
 #ifdef WITH_TLS
 #  include <openssl/ssl.h>