Refactor headers for easier discovery.

plugins/dynamic-security/acl.c

@@ -18,10 +18,9 @@ Contributors:
 
 #include "config.h"
 
+#include "mosquitto/broker_plugin.h"
+
 #include "dynamic_security.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_plugin.h"
 
 typedef int (*MOSQ_FUNC_acl_check)(struct dynsec__data *data, struct mosquitto_evt_acl_check *, struct dynsec__rolelist *);
 

plugins/dynamic-security/auth.c

@@ -24,8 +24,6 @@ Contributors:
 #include <openssl/rand.h>
 
 #include "dynamic_security.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
 
 
 /* ################################################################

plugins/dynamic-security/clientlist.c

@@ -22,11 +22,8 @@ Contributors:
 #include <stdio.h>
 #include <uthash.h>
 
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "json_help.h"
-
 #include "dynamic_security.h"
+#include "json_help.h"
 
 /* ################################################################
  * #

plugins/dynamic-security/clients.c

@@ -22,11 +22,8 @@ Contributors:
 #include <stdio.h>
 #include <uthash.h>
 
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "json_help.h"
-
 #include "dynamic_security.h"
+#include "json_help.h"
 
 struct connection_array_context{
 	const char *username;

plugins/dynamic-security/config.c

@@ -25,14 +25,9 @@ Contributors:
 #include <string.h>
 #include <sys/stat.h>
 
+#include "dynamic_security.h"
 #include "json_help.h"
 #include "misc_mosq.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_plugin.h"
-#include "mqtt_protocol.h"
-
-#include "dynamic_security.h"
 
 static int dynsec__general_config_load(struct dynsec__data *data, cJSON *tree)
 {

plugins/dynamic-security/config_init.c

@@ -27,14 +27,9 @@ Contributors:
 #include <sys/stat.h>
 #include <openssl/rand.h>
 
-#include "json_help.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_plugin.h"
-#include "mqtt_protocol.h"
-#include "misc_mosq.h"
-
 #include "dynamic_security.h"
+#include "json_help.h"
+#include "misc_mosq.h"
 
 const char pw_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-=_+[]{}@#~,./<>?";
 

plugins/dynamic-security/control.c

@@ -25,13 +25,8 @@ Contributors:
 #include <string.h>
 #include <sys/stat.h>
 
-#include "json_help.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_plugin.h"
-#include "mqtt_protocol.h"
-
 #include "dynamic_security.h"
+#include "json_help.h"
 
 #define RESPONSE_TOPIC "$CONTROL/dynamic-security/v1/response"
 

plugins/dynamic-security/default_acl.c

@@ -25,13 +25,8 @@ Contributors:
 #include <string.h>
 #include <sys/stat.h>
 
-#include "json_help.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_plugin.h"
-#include "mqtt_protocol.h"
-
 #include "dynamic_security.h"
+#include "json_help.h"
 
 int dynsec__process_set_default_acl_access(struct dynsec__data *data, struct mosquitto_control_cmd *cmd)
 {

plugins/dynamic-security/dynamic_security.h

@@ -21,8 +21,8 @@ Contributors:
 #include <cjson/cJSON.h>
 #include <uthash.h>
 #include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_control.h"
+#include "mosquitto/broker.h"
+#include "mosquitto/broker_control.h"
 #include "password_mosq.h"
 #include "base64_mosq.h"
 

plugins/dynamic-security/grouplist.c

@@ -22,11 +22,8 @@ Contributors:
 #include <stdio.h>
 #include <uthash.h>
 
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "json_help.h"
-
 #include "dynamic_security.h"
+#include "json_help.h"
 
 /* ################################################################
  * #

plugins/dynamic-security/groups.c

@@ -22,11 +22,8 @@ Contributors:
 #include <stdio.h>
 #include <uthash.h>
 
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "json_help.h"
-
 #include "dynamic_security.h"
+#include "json_help.h"
 
 /* ################################################################
  * #

plugins/dynamic-security/kicklist.c

@@ -21,9 +21,6 @@ Contributors:
 #include <stdio.h>
 #include <utlist.h>
 
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-
 #include "dynamic_security.h"
 
 int dynsec_kicklist__add(struct dynsec__data *data, const char *username)

plugins/dynamic-security/plugin.c

@@ -28,13 +28,10 @@ Contributors:
 #  include <strings.h>
 #endif
 
-#include "json_help.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_plugin.h"
-#include "mqtt_protocol.h"
+#include "mosquitto/broker_plugin.h"
 
 #include "dynamic_security.h"
+#include "json_help.h"
 
 MOSQUITTO_PLUGIN_DECLARE_VERSION(5);
 

plugins/dynamic-security/rolelist.c

@@ -26,9 +26,6 @@ Contributors:
 
 #include "dynamic_security.h"
 #include "json_help.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-
 
 /* ################################################################
  * #

plugins/dynamic-security/roles.c

@@ -30,9 +30,6 @@ Contributors:
 
 #include "dynamic_security.h"
 #include "json_help.h"
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-
 
 static cJSON *add_role_to_json(struct dynsec__role *role, bool verbose);
 static void role__remove_all_clients(struct dynsec__data *data, struct dynsec__role *role);

plugins/dynamic-security/tick.c

@@ -18,11 +18,6 @@ Contributors:
 
 #include "config.h"
 
-#include "mosquitto.h"
-#include "mosquitto_broker.h"
-#include "mosquitto_plugin.h"
-#include "mqtt_protocol.h"
-
 #include "dynamic_security.h"
 
 int dynsec__tick_callback(int event, void *event_data, void *userdata)