6 files changed, 31 insertions, 31 deletions
diff --git a/eval.c b/eval.c
index 8dd8f75..b5dfeed 100644
--- a/eval.c
+++ b/eval.c
@@ -37,6 +37,7 @@
 #include "time.h"
 #include "trie.h"
 #include "util.h"
+#include "regexp.h"
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -54,12 +55,6 @@
 #include <unistd.h>
 #include <wchar.h>
 
-#ifdef USE_ONIGURUMA
-	#include <onigposix.h>
-#else
-	#include <regex.h>
-#endif
-
 struct eval_state {
 	/** Data about the current file. */
 	const struct BFTW *ftwbuf;
diff --git a/expr.h b/expr.h
index 82df7bf..a4e6c0d 100644
--- a/expr.h
+++ b/expr.h
@@ -25,18 +25,13 @@
 #include "eval.h"
 #include "exec.h"
 #include "printf.h"
+#include "regexp.h"
 #include "stat.h"
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <time.h>
 
-#ifdef USE_ONIGURUMA
-	#include <onigposix.h>
-#else
-	#include <regex.h>
-#endif
-
 /**
  * Possible types of numeric comparison.
  */
diff --git a/parse.c b/parse.c
index 9ff2c2a..2bf5992 100644
--- a/parse.c
+++ b/parse.c
@@ -41,6 +41,7 @@
 #include "time.h"
 #include "typo.h"
 #include "util.h"
+#include "regexp.h"
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -59,12 +60,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#ifdef USE_ONIGURUMA
-	#include <onigposix.h>
-#else
-	#include <regex.h>
-#endif
-
 // Strings printed by -D tree for "fake" expressions
 static char *fake_and_arg = "-a";
 static char *fake_false_arg = "-false";
diff --git a/regexp.h b/regexp.h
new file mode 100644
index 0000000..14da4d5
--- /dev/null
+++ b/regexp.h
@@ -0,0 +1,26 @@
+/****************************************************************************
+ * bfs                                                                      *
+ * Copyright (C) 2016-2022 Tavian Barnes <tavianator@tavianator.com>        *
+ *                                                                          *
+ * Permission to use, copy, modify, and/or distribute this software for any *
+ * purpose with or without fee is hereby granted.                           *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES *
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF         *
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR  *
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES   *
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN    *
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF  *
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.           *
+ ****************************************************************************/
+
+#ifndef BFS_REGEXP_H
+#define BFS_REGEXP_H
+
+#ifdef USE_ONIGURUMA
+	#include <onigposix.h>
+#else
+	#include <regex.h>
+#endif
+
+#endif // BFS_REGEXP_H
diff --git a/util.c b/util.c
index b5ef8f8..9e221a8 100644
--- a/util.c
+++ b/util.c
@@ -16,6 +16,7 @@
 
 #include "util.h"
 #include "dstring.h"
+#include "regexp.h"
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -29,12 +30,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef USE_ONIGURUMA
-	#include <onigposix.h>
-#else
-	#include <regex.h>
-#endif
-
 #if BFS_HAS_SYS_PARAM
 #	include <sys/param.h>
 #endif
diff --git a/util.h b/util.h
index 213d514..893651e 100644
--- a/util.h
+++ b/util.h
@@ -20,7 +20,7 @@
 
 #ifndef BFS_UTIL_H
 #define BFS_UTIL_H
-
+#include "regexp.h"
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <stdbool.h>
@@ -28,12 +28,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#ifdef USE_ONIGURUMA
-	#include <onigposix.h>
-#else
-	#include <regex.h>
-#endif
-
 // Some portability concerns
 
 #ifdef __has_feature