diff --git a/ebind.h b/ebind.h
index 74570f0..906fc99 100644
--- a/ebind.h
+++ b/ebind.h
@@ -12,6 +12,7 @@
 #include "exec.h"
 #include "file.h"
 #include "line.h"
+#include "spawn.h"
 
 /*
  * Command table.
diff --git a/efunc.h b/efunc.h
index acdb627..922e5e9 100644
--- a/efunc.h
+++ b/efunc.h
@@ -47,9 +47,6 @@
 /* buffer.c */
 #include "buffer.h"
 
-/* spawn.c */
-#include "spawn.h"
-
 /* search.c */
 #include "search.h"
 
diff --git a/names.c b/names.c
index f8b36ca..4f00aec 100644
--- a/names.c
+++ b/names.c
@@ -12,6 +12,7 @@
 #include "efunc.h"
 #include "file.h"
 #include "line.h"
+#include "spawn.h"
 
 struct name_bind names[] = {
 	{"abort-command", ctrlg},