From 526566873499a56b552b1f771e98545cd6695acf Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Fri, 3 Mar 2023 13:56:03 +0000
Subject: [PATCH] Only typedef mosquitto_plugin_id_t once.

---
 include/mosquitto_broker.h      | 4 ----
 include/mosquitto_plugin.h      | 3 +--
 src/mosquitto_broker_internal.h | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/mosquitto_broker.h b/include/mosquitto_broker.h
index 4231c88d..9c42aacf 100644
--- a/include/mosquitto_broker.h
+++ b/include/mosquitto_broker.h
@@ -40,12 +40,8 @@ extern "C" {
 #include <time.h>
 
 #include <mosquitto.h>
-#include <mosquitto_plugin.h>
 #include <mqtt_protocol.h>
 
-struct mosquitto;
-typedef struct mqtt5__property mosquitto_property;
-
 enum mosquitto_protocol {
 	mp_mqtt,
 	mp_mqttsn,
diff --git a/include/mosquitto_plugin.h b/include/mosquitto_plugin.h
index 0e400abc..38c59a3c 100644
--- a/include/mosquitto_plugin.h
+++ b/include/mosquitto_plugin.h
@@ -44,6 +44,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <mosquitto.h>
 #include <mosquitto_broker.h>
 
 struct mosquitto;
@@ -66,8 +67,6 @@ struct mosquitto_acl_msg {
 	bool retain;
 };
 
-typedef struct mosquitto_plugin_id_t mosquitto_plugin_id_t;
-
 #ifdef WIN32
 #  define mosq_plugin_EXPORT __declspec(dllexport)
 #else
diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
index 0f8cd189..30cc6575 100644
--- a/src/mosquitto_broker_internal.h
+++ b/src/mosquitto_broker_internal.h
@@ -293,7 +293,7 @@ struct plugin_own_callback{
 	int event;
 };
 
-typedef struct mosquitto_plugin_id_t{
+struct mosquitto_plugin_id_t{
 	struct mosquitto__plugin_config config;
 	struct mosquitto__plugin_lib lib;
 	struct mosquitto__listener *listener;
@@ -301,7 +301,7 @@ typedef struct mosquitto_plugin_id_t{
 	char *plugin_version;
 	struct control_endpoint *control_endpoints;
 	struct plugin_own_callback *own_callbacks;
-} mosquitto_plugin_id_t;
+};
 
 struct mosquitto__config {
 	bool allow_duplicate_messages;