9 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 9bea1a50..14fddcca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,10 +95,10 @@ git_sources = \
     src/gitversion.c
 
 otr3_sources = \
-    src/otr3.c src/otr.h
+    src/otr/otr3.c src/otr/otr.h
 
 otr4_sources = \
-    src/otr4.c src/otr.h
+    src/otr/otr4.c src/otr/otr.h
 
 if INCLUDE_GIT_VERSION
 with_git_sources = $(git_sources) $(core_sources)
diff --git a/src/command/command.c b/src/command/command.c
index e76027c1..d8f55205 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -41,7 +41,7 @@
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#include "otr.h"
+#include "otr/otr.h"
 #include "profanity.h"
 #include "tools/autocomplete.h"
 #include "tools/parser.h"
diff --git a/src/command/commands.c b/src/command/commands.c
index d0dda7ec..75a5523e 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -38,7 +38,7 @@
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#include "otr.h"
+#include "otr/otr.h"
 #include "profanity.h"
 #include "tools/autocomplete.h"
 #include "tools/parser.h"
diff --git a/src/otr.h b/src/otr/otr.h
index 85ae09cc..85ae09cc 100644
--- a/src/otr.h
+++ b/src/otr/otr.h
diff --git a/src/otr3.c b/src/otr/otr3.c
index 6d5c9496..6d5c9496 100644
--- a/src/otr3.c
+++ b/src/otr/otr3.c
diff --git a/src/otr4.c b/src/otr/otr4.c
index ddd4aeeb..ddd4aeeb 100644
--- a/src/otr4.c
+++ b/src/otr/otr4.c
diff --git a/src/profanity.c b/src/profanity.c
index ea3e35b9..c1a9aa9d 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -45,7 +45,7 @@
 #include "log.h"
 #include "muc.h"
 #ifdef HAVE_LIBOTR
-#include "otr.h"
+#include "otr/otr.h"
 #endif
 #include "resource.h"
 #include "ui/ui.h"
diff --git a/src/server_events.c b/src/server_events.c
index f0ec4975..b4919ee3 100644
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -34,7 +34,7 @@
 #include "ui/windows.h"
 
 #ifdef HAVE_LIBOTR
-#include "otr.h"
+#include "otr/otr.h"
 #endif
 
 // handle presence stanza errors
diff --git a/src/ui/core.c b/src/ui/core.c
index 77bc2005..783b369e 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -48,7 +48,7 @@
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#include "otr.h"
+#include "otr/otr.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "ui/windows.h"