diff --git a/src/pdumper.c b/src/pdumper.c
index ae2ed045775..5fc58f8e8e6 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -3159,7 +3159,7 @@ dump_vectorlike (struct dump_context *ctx,
                  Lisp_Object lv,
                  dump_off offset)
 {
-#if CHECK_STRUCTS && !defined HASH_pvec_type_EB32C4E83D
+#if CHECK_STRUCTS && !defined HASH_pvec_type_86BEDC7D5F
 # error "pvec_type changed. See CHECK_STRUCTS comment in config.h."
 #endif
   const struct Lisp_Vector *v = XVECTOR (lv);
diff --git a/src/search.c b/src/search.c
index b092d5b7fef..9ee3d7338e2 100644
--- a/src/search.c
+++ b/src/search.c
@@ -34,6 +34,11 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "regex-emacs.h"
 
+#if defined ENABLE_CHECKING && defined HAVE_OPEN_MEMSTREAM
+# include <stdlib.h>
+#endif
+
+
 #define REGEXP_CACHE_SIZE 20
 
 /* If the regexp is non-nil, then the buffer contains the compiled form