diff --git a/configure.ac b/configure.ac
index 19450298..0057c3e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -288,6 +288,8 @@ AC_CHECK_HEADERS([ncurses.h], [], [])
 AM_CFLAGS="-Wall -Wno-deprecated-declarations"
 AS_IF([test "x$PACKAGE_STATUS" = xdevelopment],
     [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"])
+AS_IF([test "x$PLATFORM" = xosx],
+    [AM_CFLAGS="$AM_CFLAGS -Qunused-arguments"])
 AM_LDFLAGS="$AM_LDFLAGS -export-dynamic"
 AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS $PYTHON_CPPFLAGS ${GTK_CFLAGS}"
 AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\" -DICONS_PATH=\"\\\"$ICONS_PATH\\\"\""
diff --git a/src/otr/otr.c b/src/otr/otr.c
index c119e896..b1cf1e16 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -45,6 +45,7 @@
 #include "window_list.h"
 #include "contact.h"
 #include "ui/ui.h"
+#include "xmpp/xmpp.h"
 #include "config/preferences.h"
 #include "chat_session.h"
 
diff --git a/src/tools/http_upload.h b/src/tools/http_upload.h
index a8829666..546eea7f 100644
--- a/src/tools/http_upload.h
+++ b/src/tools/http_upload.h
@@ -41,9 +41,7 @@
 
 #include <sys/select.h>
 #include <curl/curl.h>
-
-// forward -> ui/win_types.h
-typedef struct prof_win_t ProfWin;
+#include "ui/win_types.h"
 
 typedef struct http_upload_t {
     char *filename;
diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index 80ede2dc..1a6c0132 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -50,6 +50,7 @@
 #include "ui/ui.h"
 #include "window_list.h"
 #include "config/preferences.h"
+#include "xmpp/xmpp.h"
 
 static GTimer *remind_timer;
 
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 01ae3953..36a70618 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -40,6 +40,7 @@
 #include "command/commands.h"
 #include "ui/win_types.h"
 #include "muc.h"
+#include "config/tlscerts.h"
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
diff --git a/src/ui/win_types.h b/src/ui/win_types.h
index e241a852..f05f237e 100644
--- a/src/ui/win_types.h
+++ b/src/ui/win_types.h
@@ -45,9 +45,9 @@
 #include <ncurses.h>
 #endif
 
-#include "xmpp/xmpp.h"
 #include "ui/buffer.h"
 #include "chat_state.h"
+#include "tools/autocomplete.h"
 
 #define LAYOUT_SPLIT_MEMCHECK       12345671
 #define PROFCHATWIN_MEMCHECK        22374522
@@ -57,6 +57,48 @@
 #define PROFXMLWIN_MEMCHECK         87333463
 #define PROFPLUGINWIN_MEMCHECK      43434777
 
+typedef enum {
+    FIELD_HIDDEN,
+    FIELD_TEXT_SINGLE,
+    FIELD_TEXT_PRIVATE,
+    FIELD_TEXT_MULTI,
+    FIELD_BOOLEAN,
+    FIELD_LIST_SINGLE,
+    FIELD_LIST_MULTI,
+    FIELD_JID_SINGLE,
+    FIELD_JID_MULTI,
+    FIELD_FIXED,
+    FIELD_UNKNOWN
+} form_field_type_t;
+
+typedef struct form_option_t {
+    char *label;
+    char *value;
+} FormOption;
+
+typedef struct form_field_t {
+    char *label;
+    char *type;
+    form_field_type_t type_t;
+    char *var;
+    char *description;
+    gboolean required;
+    GSList *values;
+    GSList *options;
+    Autocomplete value_ac;
+} FormField;
+
+typedef struct data_form_t {
+    char *type;
+    char *title;
+    char *instructions;
+    GSList *fields;
+    GHashTable *var_to_tag;
+    GHashTable *tag_to_var;
+    Autocomplete tag_ac;
+    gboolean modified;
+} DataForm;
+
 typedef enum {
     LAYOUT_SIMPLE,
     LAYOUT_SPLIT
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index b9d84074..ea8a6e1d 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -101,48 +101,6 @@ typedef struct disco_info_t {
     GHashTable *features;
 } DiscoInfo;
 
-typedef enum {
-    FIELD_HIDDEN,
-    FIELD_TEXT_SINGLE,
-    FIELD_TEXT_PRIVATE,
-    FIELD_TEXT_MULTI,
-    FIELD_BOOLEAN,
-    FIELD_LIST_SINGLE,
-    FIELD_LIST_MULTI,
-    FIELD_JID_SINGLE,
-    FIELD_JID_MULTI,
-    FIELD_FIXED,
-    FIELD_UNKNOWN
-} form_field_type_t;
-
-typedef struct form_option_t {
-    char *label;
-    char *value;
-} FormOption;
-
-typedef struct form_field_t {
-    char *label;
-    char *type;
-    form_field_type_t type_t;
-    char *var;
-    char *description;
-    gboolean required;
-    GSList *values;
-    GSList *options;
-    Autocomplete value_ac;
-} FormField;
-
-typedef struct data_form_t {
-    char *type;
-    char *title;
-    char *instructions;
-    GSList *fields;
-    GHashTable *var_to_tag;
-    GHashTable *tag_to_var;
-    Autocomplete tag_ac;
-    gboolean modified;
-} DataForm;
-
 // connection functions
 void jabber_init(void);
 jabber_conn_status_t jabber_connect_with_details(const char *const jid, const char *const passwd,