diff --git a/src/command/command.c b/src/command/command.c
index 9e8ebe02..31d063e6 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -32,6 +32,8 @@
  *
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
@@ -41,8 +43,6 @@
 
 #include <glib.h>
 
-#include "config.h"
-
 #include "chat_session.h"
 #include "command/command.h"
 #include "command/commands.h"
diff --git a/src/event/client_events.c b/src/event/client_events.c
index 0579b07d..f1872202 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -32,10 +32,11 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <glib.h>
 
-#include "config.h"
 #include "log.h"
 #include "ui/ui.h"
 #include "window_list.h"
diff --git a/src/event/server_events.c b/src/event/server_events.c
index b607c4f8..aea6a4ea 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -32,12 +32,12 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
 
-#include "config.h"
-
 #include "chat_session.h"
 #include "log.h"
 #include "muc.h"
diff --git a/src/main.c b/src/main.c
index 968ddf8a..0a49180b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,10 +31,12 @@
  * source files in the program, then also delete it here.
  *
  */
+
+#include "config.h"
+
 #include <string.h>
 #include <glib.h>
 
-#include "config.h"
 #ifdef HAVE_GIT_VERSION
 #include "gitversion.h"
 #endif
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 047352c5..c34cc1fc 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -32,6 +32,8 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -44,6 +46,9 @@
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "ui/titlebar.h"
+#ifdef HAVE_LIBOTR
+#include "otr/otr.h"
+#endif
 
 static void _chatwin_history(ProfChatWin *chatwin, const char *const contact);
 
diff --git a/src/ui/ui.h b/src/ui/ui.h
index cf3bff01..70c02da0 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -35,6 +35,8 @@
 #ifndef UI_UI_H
 #define UI_UI_H
 
+#include "config.h"
+
 #include "command/commands.h"
 #include "ui/win_types.h"
 #include "muc.h"
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index e232fab0..39f4445a 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <glib.h>
 #include <wchar.h>
 
@@ -6,6 +8,9 @@
 
 #include "ui/window.h"
 #include "ui/ui.h"
+#ifdef HAVE_LIBOTR
+#include "otr/otr.h"
+#endif
 
 #include "tests/unittests/ui/stub_ui.h"