diff --git a/src/buffer.c b/src/buffer.c
index 65ab22f..99d23ec 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -743,11 +743,12 @@
 #ifdef FEAT_JOB_CHANNEL
     channel_buffer_free(buf);
 #endif
-#ifdef FEAT_AUTOCMD
-    aubuflocal_remove(buf);
 
     buf_hashtab_remove(buf);
 
+#ifdef FEAT_AUTOCMD
+    aubuflocal_remove(buf);
+
     if (autocmd_busy)
     {
 	/* Do not free the buffer structure while autocommands are executing,
diff --git a/src/globals.h b/src/globals.h
index 566d6e1..b89cac2 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -325,11 +325,9 @@
 EXTERN scid_T	current_SID INIT(= 0);
 #endif
 
-#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL)
 /* Magic number used for hashitem "hi_key" value indicating a deleted item.
  * Only the address is used. */
 EXTERN char_u	hash_removed;
-#endif
 
 
 EXTERN int	scroll_region INIT(= FALSE); /* term supports scroll region */
diff --git a/src/version.c b/src/version.c
index 45aada0..e840be8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2038,
+/**/
     2037,
 /**/
     2036,