Clean up includes

13 files changed, 126 insertions, 28 deletions

diff --git a/src/control.c b/src/control.c
index 2326280..2da8f0d 100644
--- a/src/control.c
+++ b/src/control.c
@@ -16,6 +16,17 @@
 
 #include "jalv_internal.h"
 
+#include "lilv/lilv.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/urid/urid.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 int
 scale_point_cmp(const ScalePoint* a, const ScalePoint* b)
 {
diff --git a/src/jack.c b/src/jack.c
index a27e261..9173ce5 100644
--- a/src/jack.c
+++ b/src/jack.c
@@ -15,10 +15,20 @@
 */
 
 #include "jalv_internal.h"
-#include "worker.h"
+#include "lv2_evbuf.h"
+
+#include "lilv/lilv.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "sratom/sratom.h"
+#include "zix/ring.h"
+#include "zix/sem.h"
 
 #include <jack/jack.h>
 #include <jack/midiport.h>
+#include <jack/transport.h>
+#include <jack/types.h>
+
 #ifdef JALV_JACK_SESSION
 #    include <jack/session.h>
 #endif
@@ -27,6 +37,11 @@
 #endif
 
 #include <ctype.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct JalvBackend {
 	jack_client_t* client;             ///< Jack client
diff --git a/src/jalv.c b/src/jalv.c
index e3f4069..7905b20 100644
--- a/src/jalv.c
+++ b/src/jalv.c
@@ -22,22 +22,33 @@
 #include "lv2_evbuf.h"
 #include "worker.h"
 
+#include "lilv/lilv.h"
 #include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
 #include "lv2/buf-size/buf-size.h"
+#include "lv2/core/lv2.h"
 #include "lv2/data-access/data-access.h"
+#include "lv2/log/log.h"
+#include "lv2/midi/midi.h"
 #include "lv2/options/options.h"
 #include "lv2/parameters/parameters.h"
 #include "lv2/patch/patch.h"
 #include "lv2/port-groups/port-groups.h"
 #include "lv2/port-props/port-props.h"
 #include "lv2/presets/presets.h"
+#include "lv2/resize-port/resize-port.h"
 #include "lv2/state/state.h"
 #include "lv2/time/time.h"
 #include "lv2/ui/ui.h"
 #include "lv2/urid/urid.h"
 #include "lv2/worker/worker.h"
-
-#include "lilv/lilv.h"
+#include "serd/serd.h"
+#include "sratom/sratom.h"
+#include "symap.h"
+#include "zix/common.h"
+#include "zix/ring.h"
+#include "zix/sem.h"
 
 #ifdef HAVE_SUIL
 #include "suil/suil.h"
@@ -46,18 +57,17 @@
 #ifdef _WIN32
 #    include <io.h>  /* for _mktemp */
 #    define snprintf _snprintf
-#else
-#    include <unistd.h>
 #endif
 
 #include <assert.h>
 #include <math.h>
 #include <signal.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 #define NS_XSD "http://www.w3.org/2001/XMLSchema#"
diff --git a/src/jalv_console.c b/src/jalv_console.c
index 2d4a197..fb4c23f 100644
--- a/src/jalv_console.c
+++ b/src/jalv_console.c
@@ -22,10 +22,15 @@
 #include "jalv_config.h"
 #include "jalv_internal.h"
 
+#include "lilv/lilv.h"
 #include "lv2/ui/ui.h"
+#include "suil/suil.h"
+#include "zix/sem.h"
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c
index 375ea76..7e456e7 100644
--- a/src/jalv_gtk.c
+++ b/src/jalv_gtk.c
@@ -16,15 +16,33 @@
 
 #include "jalv_internal.h"
 
+#include "lilv/lilv.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
 #include "lv2/core/attributes.h"
-#include "lv2/patch/patch.h"
-#include "lv2/port-props/port-props.h"
+#include "lv2/core/lv2.h"
+#include "lv2/ui/ui.h"
+#include "lv2/urid/urid.h"
+#include "suil/suil.h"
+#include "zix/common.h"
+#include "zix/sem.h"
 
 LV2_DISABLE_DEPRECATION_WARNINGS
 
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gobject/gclosure.h>
 #include <gtk/gtk.h>
 
+#include <float.h>
 #include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 static GtkCheckMenuItem* active_preset_item = NULL;
 static bool              updating           = false;
diff --git a/src/jalv_gtkmm2.cpp b/src/jalv_gtkmm2.cpp
index 065b971..cdc7f74 100644
--- a/src/jalv_gtkmm2.cpp
+++ b/src/jalv_gtkmm2.cpp
@@ -17,13 +17,20 @@
 #include "jalv_internal.h"
 
 #include "lv2/core/attributes.h"
+#include "suil/suil.h"
+#include "zix/sem.h"
 
 LV2_DISABLE_DEPRECATION_WARNINGS
+#include <glib.h>
 #include <gtkmm/button.h>
 #include <gtkmm/main.h>
+#include <gtkmm/object.h>
+#include <gtkmm/widget.h>
 #include <gtkmm/window.h>
 LV2_RESTORE_WARNINGS
 
+#include <stdint.h>
+
 static Gtk::Main* jalv_gtk_main = nullptr;
 
 int
diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp
index bf211f0..7d71318 100644
--- a/src/jalv_qt.cpp
+++ b/src/jalv_qt.cpp
@@ -16,34 +16,51 @@
 
 #include "jalv_internal.h"
 
-#include "lv2/patch/patch.h"
-#include "lv2/port-props/port-props.h"
+#include "lilv/lilv.h"
+#include "suil/suil.h"
+#include "zix/sem.h"
 
-#include <qglobal.h>
+#include <QtGlobal>
 
 #if QT_VERSION >= 0x050000
 #    include <QAction>
 #    include <QApplication>
 #    include <QDial>
+#    include <QFontMetrics>
 #    include <QGroupBox>
+#    include <QGuiApplication>
+#    include <QHBoxLayout>
+#    include <QKeySequence>
 #    include <QLabel>
 #    include <QLayout>
+#    include <QLayoutItem>
+#    include <QList>
 #    include <QMainWindow>
 #    include <QMenu>
 #    include <QMenuBar>
+#    include <QObject>
+#    include <QPoint>
+#    include <QRect>
 #    include <QScreen>
 #    include <QScrollArea>
+#    include <QSize>
+#    include <QSizePolicy>
+#    include <QString>
 #    include <QStyle>
 #    include <QTimer>
+#    include <QVBoxLayout>
 #    include <QWidget>
-#    include <QWindow>
+#    include <QtCore>
 #else
 #    include <QtGui>
 #endif
 
 #include <algorithm>
 #include <cmath>
-#include <cstdio>
+#include <cstdint>
+#include <cstring>
+#include <map>
+#include <vector>
 
 #define CONTROL_WIDTH 150
 #define DIAL_STEPS    10000
diff --git a/src/log.c b/src/log.c
index 45a8f59..cedf906 100644
--- a/src/log.c
+++ b/src/log.c
@@ -16,6 +16,13 @@
 
 #include "jalv_internal.h"
 
+#include "lv2/log/log.h"
+#include "lv2/urid/urid.h"
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+
 int
 jalv_printf(LV2_Log_Handle handle,
             LV2_URID       type,
diff --git a/src/state.c b/src/state.c
index 4f8100a..6c35b96 100644
--- a/src/state.c
+++ b/src/state.c
@@ -14,22 +14,21 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "jalv_config.h"
 #include "jalv_internal.h"
 
-#ifdef HAVE_LV2_STATE
-#    include "lv2/lv2plug.in/ns/ext/state/state.h"
-#endif
-
 #include "lilv/lilv.h"
-
-#include <assert.h>
+#include "lv2/atom/forge.h"
+#include "lv2/core/lv2.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
+#include "zix/common.h"
+#include "zix/ring.h"
+#include "zix/sem.h"
+
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 char*
 jalv_make_path(LV2_State_Make_Path_Handle handle,
diff --git a/src/symap.h b/src/symap.h
index 918d914..e4e736d 100644
--- a/src/symap.h
+++ b/src/symap.h
@@ -27,8 +27,6 @@
 
 #include <stdint.h>
 
-struct SymapImpl;
-
 typedef struct SymapImpl Symap;
 
 /**
diff --git a/src/worker.c b/src/worker.c
index 79bb7b7..3ad3078 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -16,6 +16,15 @@
 
 #include "worker.h"
 
+#include "lv2/worker/worker.h"
+#include "zix/common.h"
+#include "zix/ring.h"
+#include "zix/sem.h"
+#include "zix/thread.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
 static LV2_Worker_Status
 jalv_worker_respond(LV2_Worker_Respond_Handle handle,
                     uint32_t                  size,
diff --git a/src/worker.h b/src/worker.h
index 942b993..dfef35f 100644
--- a/src/worker.h
+++ b/src/worker.h
@@ -16,8 +16,12 @@
 
 #include "jalv_internal.h"
 
+#include "lilv/lilv.h"
 #include "lv2/worker/worker.h"
 
+#include <stdbool.h>
+#include <stdint.h>
+
 void
 jalv_worker_init(Jalv*                       jalv,
                  JalvWorker*                 worker,
diff --git a/src/zix/ring.h b/src/zix/ring.h
index c687667..168f009 100644
--- a/src/zix/ring.h
+++ b/src/zix/ring.h
@@ -17,8 +17,6 @@
 #ifndef ZIX_RING_H
 #define ZIX_RING_H
 
-#include "zix/common.h"
-
 #include <stdint.h>
 
 #ifdef __cplusplus