Merge branch 'cb/maint-orphan-merge-noclobber' into maint

diff --git a/compat/regex/regex.h b/compat/regex/regex.h
index de9332788359ed127e3a613b0d4c676836f0416e..61c96838721501031935dd560eb86d8dbcedd2b0 100644 (file)
--- a/compat/regex/regex.h
+++ b/compat/regex/regex.h
@@ -1,3 +1,6 @@
+#include <stdio.h>
+#include <stddef.h>
+
 /* Definitions for data structures and routines for the regular
    expression library.
    Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008