diff --git a/include/mosquitto.h b/include/mosquitto.h
index 04d401f6..71382597 100644
--- a/include/mosquitto.h
+++ b/include/mosquitto.h
@@ -64,6 +64,8 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 
+#include <mqtt_protocol.h>
+
 #define LIBMOSQUITTO_MAJOR 2
 #define LIBMOSQUITTO_MINOR 1
 #define LIBMOSQUITTO_REVISION 0
diff --git a/include/mosquitto_broker.h b/include/mosquitto_broker.h
index acdb37e4..69c03a7c 100644
--- a/include/mosquitto_broker.h
+++ b/include/mosquitto_broker.h
@@ -40,6 +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;
diff --git a/include/mosquitto_plugin.h b/include/mosquitto_plugin.h
index ff0eefe2..0e400abc 100644
--- a/include/mosquitto_plugin.h
+++ b/include/mosquitto_plugin.h
@@ -66,6 +66,8 @@ 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/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 2cf79cb4..03329d7c 100644
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(CPP_SRC mosquittopp.cpp mosquittopp.h)
+set(CPP_SRC mosquittopp.cpp ../../include/mosquittopp.h)
 
 add_library(mosquittopp SHARED
 	${CPP_SRC}