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 0e78fc24..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);
 
@@ -79,6 +84,7 @@ chatwin_receipt_received(ProfChatWin *chatwin, const char *const id)
     win_mark_received(win, id);
 }
 
+#ifdef HAVE_LIBOTR
 void
 chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted)
 {
@@ -201,6 +207,7 @@ chatwin_otr_untrust(ProfChatWin *chatwin)
         title_bar_switch();
     }
 }
+#endif
 
 void
 chatwin_recipient_gone(ProfChatWin *chatwin)
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 088a5953..70c02da0 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -35,10 +35,14 @@
 #ifndef UI_UI_H
 #define UI_UI_H
 
+#include "config.h"
+
 #include "command/commands.h"
 #include "ui/win_types.h"
 #include "muc.h"
+#ifdef HAVE_LIBOTR
 #include "otr/otr.h"
+#endif
 
 #define NO_ME           1
 #define NO_DATE         2
@@ -65,11 +69,15 @@ void ui_sigwinch_handler(int sig);
 
 ProfChatWin* chatwin_new(const char *const barejid);
 void chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource,  const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
+
+#ifdef HAVE_LIBOTR
 void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted);
 void chatwin_otr_unsecured(ProfChatWin *chatwin);
 void chatwin_otr_trust(ProfChatWin *chatwin);
 void chatwin_otr_untrust(ProfChatWin *chatwin);
 void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data);
+#endif
+
 void chatwin_receipt_received(ProfChatWin *chatwin, const char *const id);
 void chatwin_recipient_gone(ProfChatWin *chatwin);
 void chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 5e0ac484..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"
 
@@ -66,11 +71,13 @@ GSList* ui_get_chat_recipients(void)
 
 void ui_switch_win(ProfWin *win) {}
 
+#ifdef HAVE_LIBOTR
 void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted) {}
 void chatwin_otr_unsecured(ProfChatWin *chatwin) {}
 void chatwin_otr_trust(ProfChatWin *chatwin) {}
 void chatwin_otr_untrust(ProfChatWin *chatwin) {}
 void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data) {}
+#endif
 
 void ui_sigwinch_handler(int sig) {}