refactor: remove redundant struct names

A struct can be anonymous if only its typedef is used.

42 files changed, 89 insertions, 92 deletions

diff --git a/src/nvim/arglist_defs.h b/src/nvim/arglist_defs.h
index a79d540a6e..51f184e3b3 100644
--- a/src/nvim/arglist_defs.h
+++ b/src/nvim/arglist_defs.h
@@ -4,7 +4,7 @@
 
 /// Argument list: Array of file names.
 /// Used for the global argument list and the argument lists local to a window.
-typedef struct arglist {
+typedef struct {
   garray_T al_ga;   ///< growarray with the array of file names
   int al_refcount;  ///< number of windows using this arglist
   int id;           ///< id of this arglist
@@ -13,7 +13,7 @@ typedef struct arglist {
 /// For each argument remember the file name as it was given, and the buffer
 /// number that contains the expanded file name (required for when ":cd" is
 /// used).
-typedef struct argentry {
+typedef struct {
   char *ae_fname;  ///< file name as specified
   int ae_fnum;     ///< buffer number with expanded file name
 } aentry_T;
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index afe77b84f5..c6bd5691b1 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -88,7 +88,7 @@ typedef struct frame_S frame_T;
 typedef uint64_t disptick_T;  // display tick type
 
 // The taggy struct is used to store the information about a :tag command.
-typedef struct taggy {
+typedef struct {
   char *tagname;                // tag name
   fmark_T fmark;                // cursor position BEFORE ":tag"
   int cur_match;                // match number
@@ -808,7 +808,7 @@ struct tabpage_S {
 // may not reflect what is actually in the buffer.  When wl_valid is false,
 // the entries can only be used to count the number of displayed lines used.
 // wl_lnum and wl_lastlnum are invalid too.
-typedef struct w_line {
+typedef struct {
   linenr_T wl_lnum;             // buffer line number for logical line
   uint16_t wl_size;             // height in screen lines
   char wl_valid;                // true values are valid for text in buffer
diff --git a/src/nvim/cmdexpand_defs.h b/src/nvim/cmdexpand_defs.h
index 97307c4e50..0bd977daca 100644
--- a/src/nvim/cmdexpand_defs.h
+++ b/src/nvim/cmdexpand_defs.h
@@ -15,7 +15,7 @@ typedef enum {
 enum { EXPAND_BUF_LEN = 256, };
 
 /// used for completion on the command line
-typedef struct expand {
+typedef struct {
   char *xp_pattern;             ///< start of item to expand, guaranteed
                                 ///< to be part of xp_line
   int xp_context;               ///< type of expansion
diff --git a/src/nvim/cmdhist.h b/src/nvim/cmdhist.h
index 489e9d283f..43be397cee 100644
--- a/src/nvim/cmdhist.h
+++ b/src/nvim/cmdhist.h
@@ -20,7 +20,7 @@ typedef enum {
 enum { HIST_COUNT = HIST_DEBUG + 1, };  ///< Number of history tables
 
 /// History entry definition
-typedef struct hist_entry {
+typedef struct {
   int hisnum;           ///< Entry identifier number.
   char *hisstr;         ///< Actual entry, separator char after the NUL.
   Timestamp timestamp;  ///< Time when entry was added.
diff --git a/src/nvim/cursor_shape.h b/src/nvim/cursor_shape.h
index 4c1d6d4eec..21967a81f4 100644
--- a/src/nvim/cursor_shape.h
+++ b/src/nvim/cursor_shape.h
@@ -38,7 +38,7 @@ typedef enum {
 #define SHAPE_MOUSE     1       // used for mouse pointer shape
 #define SHAPE_CURSOR    2       // used for text cursor shape
 
-typedef struct cursor_entry {
+typedef struct {
   char *full_name;        ///< mode description
   CursorShape shape;      ///< cursor shape: one of the SHAPE_ defines
   int mshape;             ///< mouse shape: one of the MSHAPE defines
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 991b82f295..c8c6e5baa0 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -38,7 +38,7 @@
 
 typedef int result_T;
 
-typedef struct digraph {
+typedef struct {
   uint8_t char1;
   uint8_t char2;
   result_T result;
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 80e6648e95..99109e4554 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -64,7 +64,7 @@
 #include "nvim/vim_defs.h"
 #include "nvim/window.h"
 
-typedef struct insert_state {
+typedef struct {
   VimState state;
   cmdarg_T *ca;
   int mincol;
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index 951a6313b6..c46a895c06 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -49,7 +49,7 @@
 //      "exp_name"  NULL or non-NULL, to be freed later.
 //      "tv"        points to the Dictionary typval_T
 //      "newkey"    is the key for the new item.
-typedef struct lval_S {
+typedef struct {
   const char *ll_name;  ///< Start of variable name (can be NULL).
   size_t ll_name_len;   ///< Length of the .ll_name.
   char *ll_exp_name;    ///< NULL or expanded name in allocated memory.
diff --git a/src/nvim/eval/typval_defs.h b/src/nvim/eval/typval_defs.h
index a6a0282fad..9c94542d11 100644
--- a/src/nvim/eval/typval_defs.h
+++ b/src/nvim/eval/typval_defs.h
@@ -74,7 +74,7 @@ typedef struct {
 #define CALLBACK_NONE ((Callback)CALLBACK_INIT)
 
 /// Structure holding dictionary watcher
-typedef struct dict_watcher {
+typedef struct {
   Callback callback;
   char *key_pattern;
   size_t key_pattern_len;
diff --git a/src/nvim/event/libuv_process.h b/src/nvim/event/libuv_process.h
index 3951bb6802..e1e4a6c406 100644
--- a/src/nvim/event/libuv_process.h
+++ b/src/nvim/event/libuv_process.h
@@ -5,7 +5,7 @@
 #include "nvim/event/process.h"
 #include "nvim/types_defs.h"
 
-typedef struct libuv_process {
+typedef struct {
   Process process;
   uv_process_t uv;
   uv_process_options_t uvopts;
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 4abc286a96..89b8999674 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -128,7 +128,7 @@ struct aucmd_executable_t {
 typedef char *(*LineGetter)(int, void *, int, bool);
 
 /// Structure for command definition.
-typedef struct cmdname {
+typedef struct {
   char *cmd_name;                      ///< Name of the command.
   ex_func_T cmd_func;                  ///< Function with implementation of this command.
   ex_preview_func_T cmd_preview_func;  ///< Preview callback function of this command.
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index ddb8beaf6f..b15dc2653d 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -102,7 +102,7 @@ typedef struct {
   optmagic_T magic_overruled_save;
 } incsearch_state_T;
 
-typedef struct command_line_state {
+typedef struct {
   VimState state;
   int firstc;
   int count;
@@ -131,7 +131,7 @@ typedef struct command_line_state {
   buf_T *b_im_ptr_buf;  ///< buffer where b_im_ptr is valid
 } CommandLineState;
 
-typedef struct cmdpreview_undo_info {
+typedef struct {
   u_header_T *save_b_u_oldhead;
   u_header_T *save_b_u_newhead;
   u_header_T *save_b_u_curhead;
@@ -147,7 +147,7 @@ typedef struct cmdpreview_undo_info {
   colnr_T save_b_u_line_colnr;
 } CpUndoInfo;
 
-typedef struct cmdpreview_buf_info {
+typedef struct {
   buf_T *buf;
   OptInt save_b_p_ul;
   int save_b_changed;
@@ -157,7 +157,7 @@ typedef struct cmdpreview_buf_info {
   CpUndoInfo undo_info;
 } CpBufInfo;
 
-typedef struct cmdpreview_win_info {
+typedef struct {
   win_T *win;
   pos_T save_w_cursor;
   viewstate_T save_viewstate;
@@ -165,7 +165,7 @@ typedef struct cmdpreview_win_info {
   int save_w_p_cuc;
 } CpWinInfo;
 
-typedef struct cmdpreview_info {
+typedef struct {
   kvec_t(CpWinInfo) win_info;
   kvec_t(CpBufInfo) buf_info;
   bool save_hls;
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 1cb7afefef..783bbf9d7d 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -157,7 +157,7 @@ typedef struct ff_visited_list_hdr {
 //   ffsc_stopdirs_v:   array of stop directories for upward search
 //   ffsc_find_what:    FINDFILE_BOTH, FINDFILE_DIR or FINDFILE_FILE
 //   ffsc_tagfile:      searching for tags file, don't use 'suffixesadd'
-typedef struct ff_search_ctx_T {
+typedef struct {
   ff_stack_T *ffsc_stack_ptr;
   ff_visited_list_hdr_T *ffsc_visited_list;
   ff_visited_list_hdr_T *ffsc_dir_visited_list;
diff --git a/src/nvim/fold_defs.h b/src/nvim/fold_defs.h
index 68ecd9cc7e..453819d6f1 100644
--- a/src/nvim/fold_defs.h
+++ b/src/nvim/fold_defs.h
@@ -4,7 +4,7 @@
 
 /// Info used to pass info about a fold from the fold-detection code to the
 /// code that displays the foldcolumn.
-typedef struct foldinfo {
+typedef struct {
   linenr_T fi_lnum;  ///< line number where fold starts
   int fi_level;      ///< level of the fold; when this is zero the
                      ///< other fields are invalid
diff --git a/src/nvim/garray_defs.h b/src/nvim/garray_defs.h
index 5f4032884e..4db9667a43 100644
--- a/src/nvim/garray_defs.h
+++ b/src/nvim/garray_defs.h
@@ -5,7 +5,7 @@
 /// Structure used for growing arrays.
 /// This is used to store information that only grows, is deleted all at
 /// once, and needs to be accessed by index.  See ga_clear() and ga_grow().
-typedef struct growarray {
+typedef struct {
   int ga_len;                       // current number of items used
   int ga_maxlen;                    // maximum number of items possible
   int ga_itemsize;                  // sizeof(item)
diff --git a/src/nvim/getchar_defs.h b/src/nvim/getchar_defs.h
index 5e6db7d9f3..abf812fad3 100644
--- a/src/nvim/getchar_defs.h
+++ b/src/nvim/getchar_defs.h
@@ -6,22 +6,19 @@
 
 #include "nvim/api/private/defs.h"
 
-typedef struct buffblock buffblock_T;
-typedef struct buffheader buffheader_T;
-
 /// structure used to store one block of the stuff/redo/recording buffers
-struct buffblock {
-  buffblock_T *b_next;  ///< pointer to next buffblock
+typedef struct buffblock {
+  struct buffblock *b_next;  ///< pointer to next buffblock
   char b_str[1];        ///< contents (actually longer)
-};
+} buffblock_T;
 
 /// header used for the stuff buffer and the redo buffer
-struct buffheader {
+typedef struct {
   buffblock_T bh_first;  ///< first (dummy) block of list
   buffblock_T *bh_curr;  ///< buffblock for appending
   size_t bh_index;       ///< index for reading
   size_t bh_space;       ///< space in bh_curr for appending
-};
+} buffheader_T;
 
 typedef struct {
   buffheader_T sr_redobuff;
diff --git a/src/nvim/hashtab_defs.h b/src/nvim/hashtab_defs.h
index 8888eab972..b0c275fcf0 100644
--- a/src/nvim/hashtab_defs.h
+++ b/src/nvim/hashtab_defs.h
@@ -21,7 +21,7 @@ typedef size_t hash_T;
 /// value, so that you can get a pointer to the value subtracting an offset from
 /// the pointer to the key.
 /// This reduces the size of this item by 1/3.
-typedef struct hashitem_S {
+typedef struct {
   /// Cached hash number for hi_key.
   hash_T hi_hash;
 
@@ -48,7 +48,7 @@ enum {
 /// Values are of any type.
 ///
 /// The hashtable grows to accommodate more entries when needed.
-typedef struct hashtable_S {
+typedef struct {
   hash_T ht_mask;        ///< mask used for hash value
                          ///< (nr of items in array is "ht_mask" + 1)
   size_t ht_used;        ///< number of items used
diff --git a/src/nvim/highlight_defs.h b/src/nvim/highlight_defs.h
index ec77bf7860..7a10e16391 100644
--- a/src/nvim/highlight_defs.h
+++ b/src/nvim/highlight_defs.h
@@ -33,7 +33,7 @@ typedef enum {
 
 /// Stores a complete highlighting entry, including colors and attributes
 /// for both TUI and GUI.
-typedef struct attr_entry {
+typedef struct {
   int16_t rgb_ae_attr, cterm_ae_attr;  ///< HlAttrFlags
   RgbValue rgb_fg_color, rgb_bg_color, rgb_sp_color;
   int cterm_fg_color, cterm_bg_color;
diff --git a/src/nvim/mark_defs.h b/src/nvim/mark_defs.h
index 5028781827..bf4fc8f6ad 100644
--- a/src/nvim/mark_defs.h
+++ b/src/nvim/mark_defs.h
@@ -59,7 +59,7 @@ typedef enum {
 #define TAGSTACKSIZE    20
 
 /// Represents view in which the mark was created
-typedef struct fmarkv {
+typedef struct {
   linenr_T topline_offset;  ///< Amount of lines from the mark lnum to the top of the window.
                             ///< Use MAXLNUM to indicate that the mark does not have a view.
 } fmarkv_T;
@@ -67,7 +67,7 @@ typedef struct fmarkv {
 #define INIT_FMARKV { MAXLNUM }
 
 /// Structure defining single local mark
-typedef struct filemark {
+typedef struct {
   pos_T mark;           ///< Cursor position.
   int fnum;             ///< File number.
   Timestamp timestamp;  ///< Time when this mark was last set.
@@ -78,7 +78,7 @@ typedef struct filemark {
 #define INIT_FMARK { { 0, 0, 0 }, 0, 0, INIT_FMARKV, NULL }
 
 /// Structure defining extended mark (mark with file name attached)
-typedef struct xfilemark {
+typedef struct {
   fmark_T fmark;       ///< Actual mark.
   char *fname;  ///< File name, used when fnum == 0.
 } xfmark_T;
diff --git a/src/nvim/memfile_defs.h b/src/nvim/memfile_defs.h
index db68ecf039..fd8983664b 100644
--- a/src/nvim/memfile_defs.h
+++ b/src/nvim/memfile_defs.h
@@ -26,7 +26,7 @@ typedef int64_t blocknr_T;
 /// The free list is a single linked list, not sorted.
 /// The blocks in the free list have no block of memory allocated and
 /// the contents of the block in the file (if any) is irrelevant.
-typedef struct bhdr {
+typedef struct {
   blocknr_T bh_bnum;                 ///< key used in hash table
 
   void *bh_data;                     ///< pointer to memory (for used block)
@@ -44,7 +44,7 @@ typedef enum {
 } mfdirty_T;
 
 /// A memory file.
-typedef struct memfile {
+typedef struct {
   char *mf_fname;                    ///< name of the file
   char *mf_ffname;                   ///< idem, full path
   int mf_fd;                         ///< file descriptor
diff --git a/src/nvim/memline_defs.h b/src/nvim/memline_defs.h
index f95dc7a2e5..0fde56f0e6 100644
--- a/src/nvim/memline_defs.h
+++ b/src/nvim/memline_defs.h
@@ -7,14 +7,14 @@
 /// are the branches leading to that block. This is stored in ml_stack.  Each
 /// entry is a pointer to info in a block (may be data block or pointer block)
 ///
-typedef struct info_pointer {
+typedef struct {
   blocknr_T ip_bnum;            // block number
   linenr_T ip_low;              // lowest lnum in this block
   linenr_T ip_high;             // highest lnum in this block
   int ip_index;                 // index for block with current lnum
 } infoptr_T;    // block/index pair
 
-typedef struct ml_chunksize {
+typedef struct {
   int mlcs_numlines;
   int mlcs_totalsize;
 } chunksize_T;
@@ -39,7 +39,7 @@ typedef struct ml_chunksize {
 ///             memory.  With this structure it is roughly (N * 128) pointer
 ///             moves, where N is the height (typically 1-3).
 ///
-typedef struct memline {
+typedef struct {
   linenr_T ml_line_count;       // number of lines in the buffer
 
   memfile_T *ml_mfp;          // pointer to associated memfile
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 88ebcbe690..42ae7519c1 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -75,7 +75,7 @@
 #include "nvim/vim_defs.h"
 #include "nvim/window.h"
 
-typedef struct normal_state {
+typedef struct {
   VimState state;
   bool command_finished;
   bool ctrl_w;
diff --git a/src/nvim/normal_defs.h b/src/nvim/normal_defs.h
index 6ea6660a8b..0309f6bc80 100644
--- a/src/nvim/normal_defs.h
+++ b/src/nvim/normal_defs.h
@@ -16,7 +16,7 @@ typedef enum {
 } MotionType;
 
 /// Arguments for operators.
-typedef struct oparg_S {
+typedef struct {
   int op_type;             ///< current pending operator type
   int regname;             ///< register to use for the operator
   MotionType motion_type;  ///< type of the current cursor motion
@@ -42,7 +42,7 @@ typedef struct oparg_S {
 } oparg_T;
 
 /// Arguments for Normal mode commands.
-typedef struct cmdarg_S {
+typedef struct {
   oparg_T *oap;     ///< Operator arguments
   int prechar;      ///< prefix character (optional, always 'g')
   int cmdchar;      ///< command character
diff --git a/src/nvim/ops.h b/src/nvim/ops.h
index 4dab51b15d..a070db7a3b 100644
--- a/src/nvim/ops.h
+++ b/src/nvim/ops.h
@@ -86,7 +86,7 @@ enum GRegFlags {
 };
 
 /// Definition of one register
-typedef struct yankreg {
+typedef struct {
   char **y_array;           ///< Pointer to an array of line pointers.
   size_t y_size;            ///< Number of lines in y_array.
   MotionType y_type;        ///< Register type
diff --git a/src/nvim/option.h b/src/nvim/option.h
index 9dbb176c94..76c76a7245 100644
--- a/src/nvim/option.h
+++ b/src/nvim/option.h
@@ -42,7 +42,7 @@ typedef enum {
 // buffers.  Indicate this by setting "var" to VAR_WIN.
 #define VAR_WIN ((char *)-1)
 
-typedef struct vimoption {
+typedef struct {
   char *fullname;           ///< full option name
   char *shortname;          ///< permissible abbreviation
   uint32_t flags;           ///< see above
diff --git a/src/nvim/os/pty_process_unix.h b/src/nvim/os/pty_process_unix.h
index c04e4c7a20..05603c8e53 100644
--- a/src/nvim/os/pty_process_unix.h
+++ b/src/nvim/os/pty_process_unix.h
@@ -7,7 +7,7 @@
 #include "nvim/event/process.h"
 #include "nvim/types_defs.h"
 
-typedef struct pty_process {
+typedef struct {
   Process process;
   uint16_t width, height;
   struct winsize winsize;
diff --git a/src/nvim/profile.c b/src/nvim/profile.c
index 004454c984..685497a9e3 100644
--- a/src/nvim/profile.c
+++ b/src/nvim/profile.c
@@ -35,7 +35,7 @@
 #endif
 
 /// Struct used in sn_prl_ga for every line of a script.
-typedef struct sn_prl_S {
+typedef struct {
   int snp_count;                ///< nr of times line was executed
   proftime_T sn_prl_total;      ///< time spent in a line + children
   proftime_T sn_prl_self;       ///< time spent in a line itself
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 9d78a570bb..3683679daa 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -107,7 +107,7 @@ typedef enum {
 /// Usually the list contains one or more entries. But an empty list can be
 /// created using setqflist()/setloclist() with a title and/or user context
 /// information and entries can be added later using setqflist()/setloclist().
-typedef struct qf_list_S {
+typedef struct {
   unsigned qf_id;         ///< Unique identifier for this list
   qfltype_T qfl_type;
   qfline_T *qf_start;     ///< pointer to the first error
@@ -232,7 +232,7 @@ typedef struct {
 } qffields_T;
 
 /// :vimgrep command arguments
-typedef struct vgr_args_S {
+typedef struct {
   int tomatch;          ///< maximum number of matches to find
   char *spat;          ///< search pattern
   int flags;             ///< search modifier
diff --git a/src/nvim/search.c b/src/nvim/search.c
index c70aa60c74..067d91be69 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -90,7 +90,7 @@ static const char e_search_hit_bottom_without_match_for_str[]
 // one for other searches.  last_idx points to the one that was used the last
 // time.
 
-static struct spat spats[2] = {
+static SearchPattern spats[2] = {
   // Last used search pattern
   [0] = { NULL, true, false, 0, { '/', false, false, 0 }, NULL },
   // Last used substitute pattern
@@ -106,7 +106,7 @@ static char lastc_bytes[MB_MAXBYTES + 1];
 static int lastc_bytelen = 1;             // >1 for multi-byte char
 
 // copy of spats[], for keeping the search patterns while executing autocmds
-static struct spat saved_spats[2];
+static SearchPattern saved_spats[2];
 static char *saved_mr_pattern = NULL;
 static int saved_spats_last_idx = 0;
 static bool saved_spats_no_hlsearch = false;
@@ -116,7 +116,7 @@ static char *mr_pattern = NULL;
 
 // Type used by find_pattern_in_path() to remember which included files have
 // been searched already.
-typedef struct SearchedFile {
+typedef struct {
   FILE *fp;              // File pointer
   char *name;            // Full name of file
   linenr_T lnum;                // Line we were up to in file
@@ -270,7 +270,7 @@ void restore_search_patterns(void)
   set_no_hlsearch(saved_spats_no_hlsearch);
 }
 
-static inline void free_spat(struct spat *const spat)
+static inline void free_spat(SearchPattern *const spat)
 {
   xfree(spat->pat);
   tv_dict_unref(spat->additional_data);
@@ -291,7 +291,7 @@ void free_search_patterns(void)
 
 // copy of spats[RE_SEARCH], for keeping the search patterns while incremental
 // searching
-static struct spat saved_last_search_spat;
+static SearchPattern saved_last_search_spat;
 static int did_save_last_search_spat = 0;
 static int saved_last_idx = 0;
 static bool saved_no_hlsearch = false;
@@ -1047,7 +1047,7 @@ int do_search(oparg_T *oap, int dirc, int search_delim, char *pat, int count, in
 
   // Save the values for when (options & SEARCH_KEEP) is used.
   // (there is no "if ()" around this because gcc wants them initialized)
-  struct soffset old_off = spats[0].off;
+  SearchOffset old_off = spats[0].off;
 
   pos = curwin->w_cursor;       // start searching at the cursor position
 
diff --git a/src/nvim/search.h b/src/nvim/search.h
index 04a06f75a2..09af34d87e 100644
--- a/src/nvim/search.h
+++ b/src/nvim/search.h
@@ -74,7 +74,7 @@ enum {
 ///
 /// @note Only offset for the last search pattern is used, not for the last
 ///       substitute pattern.
-typedef struct soffset {
+typedef struct {
   char dir;     ///< Search direction: forward ('/') or backward ('?')
   bool line;    ///< True if search has line offset.
   bool end;     ///< True if search sets cursor at the end.
@@ -82,7 +82,7 @@ typedef struct soffset {
 } SearchOffset;
 
 /// Structure containing last search pattern and its attributes.
-typedef struct spat {
+typedef struct {
   char *pat;            ///< The pattern (in allocated memory) or NULL.
   bool magic;           ///< Magicness of the pattern.
   bool no_scs;          ///< No smartcase for this pattern.
@@ -99,7 +99,7 @@ typedef struct {
   int sa_wrapped;    ///< search wrapped around
 } searchit_arg_T;
 
-typedef struct searchstat {
+typedef struct {
   int cur;      // current position of found words
   int cnt;      // total count of found words
   bool exact_match;    // true if matched exactly on specified position
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index bcd00b3b08..0544529304 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -346,25 +346,25 @@ typedef struct {
   PMap(cstr_t) file_marks;  ///< All file marks.
 } WriteMergerState;
 
-struct sd_read_def;
+typedef struct sd_read_def ShaDaReadDef;
 
 /// Function used to close files defined by ShaDaReadDef
-typedef void (*ShaDaReadCloser)(struct sd_read_def *const sd_reader)
+typedef void (*ShaDaReadCloser)(ShaDaReadDef *const sd_reader)
   REAL_FATTR_NONNULL_ALL;
 
 /// Function used to read ShaDa files
-typedef ptrdiff_t (*ShaDaFileReader)(struct sd_read_def *const sd_reader,
+typedef ptrdiff_t (*ShaDaFileReader)(ShaDaReadDef *const sd_reader,
                                      void *const dest,
                                      const size_t size)
   REAL_FATTR_NONNULL_ALL REAL_FATTR_WARN_UNUSED_RESULT;
 
 /// Function used to skip in ShaDa files
-typedef int (*ShaDaFileSkipper)(struct sd_read_def *const sd_reader,
+typedef int (*ShaDaFileSkipper)(ShaDaReadDef *const sd_reader,
                                 const size_t offset)
   REAL_FATTR_NONNULL_ALL REAL_FATTR_WARN_UNUSED_RESULT;