Clean up includes

2 files changed, 20 insertions, 1 deletions

diff --git a/lilv/lilv.h b/lilv/lilv.h
index 83b28e2..8c9ee22 100644
--- a/lilv/lilv.h
+++ b/lilv/lilv.h
@@ -26,7 +26,6 @@
 
 #include <stdarg.h>
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -80,6 +79,8 @@ extern "C" {
 #define LILV_URI_OUTPUT_PORT  "http://lv2plug.in/ns/lv2core#OutputPort"
 #define LILV_URI_PORT         "http://lv2plug.in/ns/lv2core#Port"
 
+struct LilvInstanceImpl;
+
 typedef struct LilvPluginImpl      LilvPlugin;       /**< LV2 Plugin. */
 typedef struct LilvPluginClassImpl LilvPluginClass;  /**< Plugin Class. */
 typedef struct LilvPortImpl        LilvPort;         /**< Port. */
diff --git a/lilv/lilvmm.hpp b/lilv/lilvmm.hpp
index 4a90e6d..c42de2f 100644
--- a/lilv/lilvmm.hpp
+++ b/lilv/lilvmm.hpp
@@ -18,6 +18,10 @@
 #define LILV_LILVMM_HPP
 
 #include "lilv/lilv.h"
+#include "lv2/core/lv2.h"
+
+#include <cstdarg>
+#include <cstdint>
 
 namespace Lilv {
 
@@ -29,6 +33,20 @@ namespace Lilv {
 #    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
+struct Instance;
+struct Node;
+struct Nodes;
+struct Plugin;
+struct PluginClass;
+struct PluginClasses;
+struct Plugins;
+struct Port;
+struct ScalePoint;
+struct ScalePoints;
+struct UI;
+struct UIs;
+struct World;
+
 LILV_DEPRECATED
 static inline const char*
 uri_to_path(const char* uri) {