includes

21 files changed, 59 insertions, 4 deletions

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index c6f82e9d85..41d7d8ba6b 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -15,6 +15,7 @@
 #include "nvim/lua/executor.h"
 #include "nvim/vim.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/getchar.h"
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 89f1e33a86..a545112360 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -32,6 +32,7 @@
 #include "nvim/channel.h"
 #include "nvim/vim.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
diff --git a/src/nvim/change.c b/src/nvim/change.c
index 3a216fec02..340471836d 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -3,7 +3,33 @@
 
 /// change.c: functions related to changing text
 
-#include "nvim/vim.h"
+#include "nvim/assert.h"
+#include "nvim/buffer.h"
+#include "nvim/buffer_updates.h"
+#include "nvim/change.h"
+#include "nvim/charset.h"
+#include "nvim/cursor.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/indent.h"
+#include "nvim/indent_c.h"
+#include "nvim/mark.h"
+#include "nvim/memline.h"
+#include "nvim/misc1.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/state.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "change.c.generated.h"
+#endif
 
 /// If the file is readonly, give a warning message with the first change.
 /// Don't do this for autocommands.
@@ -510,7 +536,6 @@ void ins_char(int c)
   if (buf[0] == 0) {
     buf[0] = '\n';
   }
-
   ins_char_bytes(buf, n);
 }
 
diff --git a/src/nvim/change.h b/src/nvim/change.h
new file mode 100644
index 0000000000..e1a1bfba17
--- /dev/null
+++ b/src/nvim/change.h
@@ -0,0 +1,11 @@
+#ifndef NVIM_CHANGE_H
+#define NVIM_CHANGE_H
+
+#include "nvim/buffer_defs.h"  // for buf_T
+#include "nvim/pos.h"  // for linenr_T
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "change.h.generated.h"
+#endif
+
+#endif  // NVIM_CHANGE_H
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index bc14761877..f2b3cfe690 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -5,6 +5,7 @@
 #include <inttypes.h>
 
 #include "nvim/assert.h"
+#include "nvim/change.h"
 #include "nvim/cursor.h"
 #include "nvim/charset.h"
 #include "nvim/fold.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 4176769f85..7328b88a40 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -18,6 +18,7 @@
 #include "nvim/ascii.h"
 #include "nvim/diff.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 5a9549cc89..2ac429cf9e 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -14,6 +14,7 @@
 #include "nvim/ascii.h"
 #include "nvim/edit.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/digraph.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 7ffa59f298..fabd26ce47 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -24,6 +24,7 @@
 #endif
 #include "nvim/eval.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/channel.h"
 #include "nvim/charset.h"
 #include "nvim/context.h"
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 2ea6937126..e256351de2 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -20,6 +20,7 @@
 #include "nvim/ascii.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 73e6f85627..7c28461f4c 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -18,6 +18,7 @@
 #endif
 #include "nvim/ex_cmds2.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
 #include "nvim/ex_cmds.h"
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index b315639681..85952a6cbf 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -16,6 +16,7 @@
 #include "nvim/ascii.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index d03b9138d0..9531c13356 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -15,6 +15,7 @@
 #include "nvim/ascii.h"
 #include "nvim/fileio.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 72d8c14468..ad0bfe29e2 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -13,6 +13,7 @@
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/fold.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index 0c9ae51ce4..efbfea33aa 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -7,6 +7,7 @@
 
 #include "nvim/ascii.h"
 #include "nvim/assert.h"
+#include "nvim/change.h"
 #include "nvim/indent.h"
 #include "nvim/eval.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index 4051354d65..6f1d7996a5 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -23,6 +23,7 @@
 #include "nvim/cursor.h"
 #include "nvim/undo.h"
 #include "nvim/ascii.h"
+#include "nvim/change.h"
 
 #ifdef WIN32
 #include "nvim/os/os.h"
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 3220c7d9b8..34774055c1 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -47,6 +47,7 @@
 #include "nvim/vim.h"
 #include "nvim/memline.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/cursor.h"
 #include "nvim/eval.h"
 #include "nvim/getchar.h"
@@ -1178,7 +1179,7 @@ void ml_recover(void)
     /* Recovering an empty file results in two lines and the first line is
      * empty.  Don't set the modified flag then. */
     if (!(curbuf->b_ml.ml_line_count == 2 && *ml_get(1) == NUL)) {
-      changed_int();
+      changed_internal();
       buf_inc_changedtick(curbuf);
     }
   } else {
@@ -1188,7 +1189,7 @@ void ml_recover(void)
       i = STRCMP(p, ml_get(idx + lnum));
       xfree(p);
       if (i != 0) {
-        changed_int();
+        changed_internal();
         buf_inc_changedtick(curbuf);
         break;
       }
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index eeb41a5d13..73841cf449 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -18,6 +18,7 @@
 #include "nvim/ascii.h"
 #include "nvim/normal.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 35ab9c4d84..4f1709bb1f 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -15,6 +15,7 @@
 #include "nvim/ascii.h"
 #include "nvim/ops.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/assert.h"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index cc214616f4..5bf315cdc3 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -84,6 +84,7 @@
 #include "nvim/ascii.h"
 #include "nvim/spell.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index d8d529d0f6..e503efe46e 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -53,6 +53,7 @@
 #include "nvim/macros.h"
 #include "nvim/mbyte.h"
 #include "nvim/buffer.h"
+#include "nvim/change.h"
 #include "nvim/ascii.h"
 #include "nvim/getchar.h"
 #include "nvim/ui.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 1305e013ad..1a31f6a6c7 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -85,6 +85,7 @@
 
 #include "nvim/buffer.h"
 #include "nvim/ascii.h"
+#include "nvim/change.h"
 #include "nvim/undo.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"