4 files changed, 16 insertions, 11 deletions
diff --git a/src/gtk2_in_qt5.cpp b/src/gtk2_in_qt5.cpp
index f6bf48e..8fb7be7 100644
--- a/src/gtk2_in_qt5.cpp
+++ b/src/gtk2_in_qt5.cpp
@@ -33,10 +33,10 @@
 #include <gdk/gdk.h>
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <gobject/gclosure.h>
+#include <gtk/gtk.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 extern "C" {
 
diff --git a/src/qt5_in_gtk.cpp b/src/qt5_in_gtk.cpp
index 6d0c001..5ce395d 100644
--- a/src/qt5_in_gtk.cpp
+++ b/src/qt5_in_gtk.cpp
@@ -17,30 +17,31 @@
 
 #include "suil_internal.h"
 
-#include "suil/suil.h"
-#include "lv2/options/options.h"
-#include "lv2/urid/urid.h"
 #include "lv2/core/lv2.h"
+#include "lv2/options/options.h"
 #include "lv2/ui/ui.h"
+#include "lv2/urid/urid.h"
+#include "suil/suil.h"
 
 #include <QVBoxLayout>
 #include <QWidget>
 #include <QWindow>
+#include <Qt>
 #include <QtGui>
 
 #undef signals
 
-#include <gtk/gtk.h>
 #include <glib-object.h>
 #include <glib.h>
 #include <gobject/gclosure.h>
+#include <gtk/gtk.h>
 
 #if GTK_MAJOR_VERSION == 3
 #include <gtk/gtkx.h>
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 extern "C" {
 
diff --git a/src/suil_internal.h b/src/suil_internal.h
index c55e2ee..bc67bf3 100644
--- a/src/suil_internal.h
+++ b/src/suil_internal.h
@@ -20,10 +20,14 @@
 #include "dylib.h"
 #include "suil_config.h"
 
+#include "lv2/core/lv2.h"
 #include "lv2/ui/ui.h"
 #include "suil/suil.h"
 
-#include <assert.h>
+#ifndef _WIN32
+#	include <dlfcn.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/x11_in_qt5.cpp b/src/x11_in_qt5.cpp
index 8b96d50..87ddc2b 100644
--- a/src/x11_in_qt5.cpp
+++ b/src/x11_in_qt5.cpp
@@ -31,8 +31,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 #undef signals