diff --git a/CMakeLists.txt b/CMakeLists.txt
index 213f81af..18c76aa4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ add_subdirectory(doc)
 
 add_compile_definitions(HAVE_CMAKE_H)
 
+include_directories(terminal)
+
 add_library(utils STATIC
   ${GENERATED_COMMIT_C})
 add_dependencies(utils cmake_commit_c)
@@ -41,7 +43,8 @@ add_library(agent STATIC
   sshpubk.c pageant.c aqsync.c)
 
 add_library(guiterminal STATIC
-  terminal.c ldisc.c minibidi.c config.c dialog.c
+  terminal/terminal.c terminal/bidi.c
+  ldisc.c config.c dialog.c
   $<TARGET_OBJECTS:logging>)
 
 add_library(noterminal STATIC
diff --git a/putty.h b/putty.h
index caca09f3..334b588b 100644
--- a/putty.h
+++ b/putty.h
@@ -2352,7 +2352,7 @@ void setup_config_box(struct controlbox *b, bool midsession,
                       int protocol, int protcfginfo);
 
 /*
- * Exports from minibidi.c.
+ * Exports from bidi.c.
  */
 #define BIDI_CHAR_INDEX_NONE ((unsigned short)-1)
 typedef struct bidi_char {
diff --git a/minibidi.c b/terminal/bidi.c
similarity index 100%
rename from minibidi.c
rename to terminal/bidi.c
diff --git a/terminal.c b/terminal/terminal.c
similarity index 100%
rename from terminal.c
rename to terminal/terminal.c
diff --git a/terminal.h b/terminal/terminal.h
similarity index 100%
rename from terminal.h
rename to terminal/terminal.h