diff --git a/basic.c b/basic.c
index 69d0c92..2447355 100644
--- a/basic.c
+++ b/basic.c
@@ -21,6 +21,7 @@
 #include "line.h"
 #include "random.h"
 #include "utf8.h"
+#include "word.h"
 
 /*
  * This routine, given a pointer to a struct line, and the current cursor goal
diff --git a/ebind.h b/ebind.h
index f527d8f..5c3af81 100644
--- a/ebind.h
+++ b/ebind.h
@@ -16,6 +16,7 @@
 #include "random.h"
 #include "search.h"
 #include "spawn.h"
+#include "word.h"
 
 /*
  * Command table.
diff --git a/efunc.h b/efunc.h
index 129857a..9b79dfb 100644
--- a/efunc.h
+++ b/efunc.h
@@ -14,9 +14,6 @@
 
 /* External function declarations. */
 
-/* word.c */
-#include "word.h"
-
 /* window.c */
 #include "window.h"
 
diff --git a/names.c b/names.c
index f8a498a..3c35bad 100644
--- a/names.c
+++ b/names.c
@@ -16,6 +16,7 @@
 #include "random.h"
 #include "search.h"
 #include "spawn.h"
+#include "word.h"
 
 struct name_bind names[] = {
 	{"abort-command", ctrlg},