diff --git a/fuzzing/apps/mosquitto_passwd/Makefile b/fuzzing/apps/mosquitto_passwd/Makefile
index 5769d2aa..b6402173 100644
--- a/fuzzing/apps/mosquitto_passwd/Makefile
+++ b/fuzzing/apps/mosquitto_passwd/Makefile
@@ -7,7 +7,7 @@ FUZZERS:= \
 LOCAL_CPPFLAGS+=
 LOCAL_CXXFLAGS+=-g -Wall -Werror -pthread
 LOCAL_LDFLAGS+=
-LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/apps/mosquitto_passwd/mosquitto_passwd.a -lssl -lcrypto
+LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/apps/mosquitto_passwd/mosquitto_passwd.a -lssl -lcrypto -largon2
 
 all: $(FUZZERS)
 
diff --git a/fuzzing/broker/Makefile b/fuzzing/broker/Makefile
index c0415ba2..2b25bd64 100644
--- a/fuzzing/broker/Makefile
+++ b/fuzzing/broker/Makefile
@@ -11,7 +11,7 @@ LOCAL_CPPFLAGS+=-I${R}/include/ -I${R}/src -I${R}/lib -I${R} -I${R}/common -I${R
 	-DWITH_SYS_TREE -DWITH_TLS -DWITH_TLS_PSK -DWITH_UNIX_SOCKETS -DWITH_WEBSOCKETS=WS_IS_BUILTIN
 LOCAL_CXXFLAGS+=-g -Wall -Werror -pthread
 LOCAL_LDFLAGS+=
-LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/src/mosquitto_broker.a -lssl -lcrypto -lcjson
+LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/src/mosquitto_broker.a -lssl -lcrypto -lcjson -largon2 -lm
 
 all: $(FUZZERS)
 
diff --git a/fuzzing/lib/Makefile b/fuzzing/lib/Makefile
index 8d22da3a..9871b71f 100644
--- a/fuzzing/lib/Makefile
+++ b/fuzzing/lib/Makefile
@@ -9,7 +9,7 @@ FUZZERS:= \
 LOCAL_CPPFLAGS+=-I${R}/include/
 LOCAL_CXXFLAGS+=-g -Wall -Werror -pthread
 LOCAL_LDFLAGS+=
-LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${LIBMOSQ_STATIC} -lssl -lcrypto
+LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/lib/libmosquitto.a -lssl -lcrypto
 
 all: $(FUZZERS)
 
diff --git a/fuzzing/plugins/dynamic-security/Makefile b/fuzzing/plugins/dynamic-security/Makefile
index 2ffdbef0..b039cf17 100644
--- a/fuzzing/plugins/dynamic-security/Makefile
+++ b/fuzzing/plugins/dynamic-security/Makefile
@@ -11,7 +11,7 @@ LOCAL_CPPFLAGS+= \
 	-DWITH_SYS_TREE -DWITH_TLS -DWITH_TLS_PSK -DWITH_UNIX_SOCKETS -DWITH_WEBSOCKETS=WS_IS_BUILTIN
 LOCAL_CXXFLAGS+=-g -Wall -Werror -pthread
 LOCAL_LDFLAGS+=
-LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/plugins/dynamic-security/mosquitto_dynamic_security.a ${R}/src/mosquitto_broker.a ${R}/deps/mosquitto-license/mosquitto_license.a -lssl -lcrypto -lcjson
+LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/plugins/dynamic-security/mosquitto_dynamic_security.a ${R}/src/mosquitto_broker.a -lssl -lcrypto -lcjson -lm -largon2
 
 all: $(FUZZERS)
 
diff --git a/fuzzing/plugins/dynamic-security/dynsec_fuzz_load.cpp b/fuzzing/plugins/dynamic-security/dynsec_fuzz_load.cpp
index 33e40b94..9d854dbd 100644
--- a/fuzzing/plugins/dynamic-security/dynsec_fuzz_load.cpp
+++ b/fuzzing/plugins/dynamic-security/dynsec_fuzz_load.cpp
@@ -26,7 +26,7 @@ Contributors:
 extern "C" {
 #endif
 
-#include <mosquitto_plugin.h>
+#include <mosquitto.h>
 #include <mosquitto_broker_internal.h>
 
 #ifdef __cplusplus
diff --git a/fuzzing/scripts/oss-fuzz-dependencies.sh b/fuzzing/scripts/oss-fuzz-dependencies.sh
index 16e44f4e..500e8503 100755
--- a/fuzzing/scripts/oss-fuzz-dependencies.sh
+++ b/fuzzing/scripts/oss-fuzz-dependencies.sh
@@ -21,4 +21,4 @@
 # currently part of fuzz testing. Once it is part of fuzz testing, sqlite will
 # need to be built statically.
 apt-get update && apt-get install -y libargon2-dev libtool-bin make libsqlite3-dev
-git clone https://github.com/DaveGamble/cJSON ${SRC}/cJSON
+git clone https://github.com/ralight/cJSON ${SRC}/cJSON
diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile
index 0c9e6ccd..348ade92 100644
--- a/plugins/dynamic-security/Makefile
+++ b/plugins/dynamic-security/Makefile
@@ -7,7 +7,7 @@ PLUGIN_NAME=mosquitto_dynamic_security
 
 LOCAL_CFLAGS+=-fPIC
 LOCAL_CPPFLAGS+=-I${R}/lib/ -I${R}/src/ -I${R}/plugins/common
-LOCAL_LIBADD+=-lcjson
+LOCAL_LIBADD+=-lcjson -lm
 LOCAL_LDFLAGS+=-fPIC -shared
 
 WITH_PW_CACHE:=yes
diff --git a/plugins/dynamic-security/acl.c b/plugins/dynamic-security/acl.c
index 291f10bf..1c8d8bc2 100644
--- a/plugins/dynamic-security/acl.c
+++ b/plugins/dynamic-security/acl.c
@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include "mosquitto/broker_plugin.h"
+#include "mosquitto.h"
 
 #include "dynamic_security.h"
 
diff --git a/plugins/dynamic-security/dynamic_security.h b/plugins/dynamic-security/dynamic_security.h
index 3f6adadd..c61d0f9e 100644
--- a/plugins/dynamic-security/dynamic_security.h
+++ b/plugins/dynamic-security/dynamic_security.h
@@ -21,8 +21,6 @@ Contributors:
 #include <cjson/cJSON.h>
 #include <uthash.h>
 #include "mosquitto.h"
-#include "mosquitto/broker.h"
-#include "mosquitto/broker_control.h"
 #include "password_mosq.h"
 #include "base64_mosq.h"
 
diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c
index c1ce33cb..845669da 100644
--- a/plugins/dynamic-security/plugin.c
+++ b/plugins/dynamic-security/plugin.c
@@ -28,7 +28,7 @@ Contributors:
 #  include <strings.h>
 #endif
 
-#include "mosquitto/broker_plugin.h"
+#include "mosquitto.h"
 
 #include "dynamic_security.h"
 #include "json_help.h"
diff --git a/plugins/sparkplug-aware/on_message.c b/plugins/sparkplug-aware/on_message.c
index 4d186649..1ca5c174 100644
--- a/plugins/sparkplug-aware/on_message.c
+++ b/plugins/sparkplug-aware/on_message.c
@@ -7,7 +7,7 @@ Copyright (c) 2023 Cedalo Gmbh
 #include <stdio.h>
 #include <string.h>
 
-#include "mosquitto/broker.h"
+#include "mosquitto.h"
 #include "plugin_global.h"
 
 int plugin__message_in_callback(int event, void *event_data, void *user_data)