diff --git a/ebind.h b/ebind.h
index 906fc99..2eab1b6 100644
--- a/ebind.h
+++ b/ebind.h
@@ -12,6 +12,7 @@
 #include "exec.h"
 #include "file.h"
 #include "line.h"
+#include "search.h"
 #include "spawn.h"
 
 /*
diff --git a/efunc.h b/efunc.h
index 922e5e9..4b7ef22 100644
--- a/efunc.h
+++ b/efunc.h
@@ -47,9 +47,6 @@
 /* buffer.c */
 #include "buffer.h"
 
-/* search.c */
-#include "search.h"
-
 /* isearch.c */
 #include "isearch.h"
 
diff --git a/eval.c b/eval.c
index 13e98a9..d80513a 100644
--- a/eval.c
+++ b/eval.c
@@ -16,6 +16,7 @@
 #include "exec.h"
 #include "fileio.h"
 #include "line.h"
+#include "search.h"
 #include "version.h"
 
 #define	MAXVARS	255
diff --git a/isearch.c b/isearch.c
index 0fbe9e6..97375f7 100644
--- a/isearch.c
+++ b/isearch.c
@@ -30,6 +30,7 @@
 #include "edef.h"
 #include "efunc.h"
 #include "line.h"
+#include "search.h"
 
 #if	ISRCH
 
diff --git a/names.c b/names.c
index 4f00aec..94e82b5 100644
--- a/names.c
+++ b/names.c
@@ -12,6 +12,7 @@
 #include "efunc.h"
 #include "file.h"
 #include "line.h"
+#include "search.h"
 #include "spawn.h"
 
 struct name_bind names[] = {
diff --git a/random.c b/random.c
index 5a2321e..a2c8357 100644
--- a/random.c
+++ b/random.c
@@ -15,6 +15,7 @@
 #include "edef.h"
 #include "efunc.h"
 #include "line.h"
+#include "search.h"
 
 int tabsize; /* Tab size (0: use real tabs) */