diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 61eee7362..c498d9fd3 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -34,6 +34,7 @@
 #include "libguile/generalized-vectors.h"
 #include "libguile/list.h"
 #include "libguile/arrays.h"
+#include "libguile/ports.h"
 #include "libguile/srfi-4.h"
 
 /* Bit vectors. Would be nice if they were implemented on top of bytevectors,
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index cec02490d..eb590d2fa 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -43,6 +43,7 @@
 #include "libguile/generalized-vectors.h"
 #include "libguile/list.h"
 #include "libguile/pairs.h"
+#include "libguile/ports.h"
 #include "libguile/strings.h"
 #include "libguile/arrays.h"
 #include "libguile/array-handle.h"
diff --git a/libguile/foreign.c b/libguile/foreign.c
index db52032ab..050c489c2 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -41,6 +41,7 @@
 #include "libguile/list.h"
 #include "libguile/instructions.h"
 #include "libguile/pairs.h"
+#include "libguile/ports.h"
 #include "libguile/stacks.h"
 #include "libguile/threads.h"
 #include "libguile/weak-table.h"
diff --git a/libguile/frames.c b/libguile/frames.c
index 14735f40f..0ae858f05 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -27,6 +27,7 @@
 #include "eval.h"
 #include "extensions.h"
 #include "frames.h"
+#include "ports.h"
 #include "vm.h"
 
 SCM
diff --git a/libguile/goops.h b/libguile/goops.h
index b9d2aa572..a3c32b8e3 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -34,6 +34,7 @@
 #include "libguile/__scm.h"
 #include "libguile/boolean.h"
 #include "libguile/list.h"
+#include "libguile/ports.h"
 
 
 /* {Class flags}
diff --git a/libguile/inline.h b/libguile/inline.h
index f37b7eb46..daf1f2882 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -29,7 +29,6 @@
 
 #include "libguile/__scm.h"
 
-#include "libguile/ports.h"
 #include "libguile/numbers.h"
 #include "libguile/error.h"
 
diff --git a/libguile/programs.c b/libguile/programs.c
index 5c9612702..267969a55 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -29,6 +29,7 @@
 #include "extensions.h"
 #include "modules.h"
 #include "pairs.h"
+#include "ports.h"
 #include "programs.h"
 #include "procprop.h" /* scm_sym_name */
 #include "vm.h"
diff --git a/libguile/smob.c b/libguile/smob.c
index a9f041196..141cb0605 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -33,6 +33,7 @@
 #include "libguile/goops.h"
 #include "libguile/finalizers.h"
 #include "libguile/instructions.h"
+#include "libguile/ports.h"
 #include "libguile/programs.h"
 
 #include "libguile/smob.h"
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index d7f17aba5..c7b55a141 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -34,6 +34,7 @@
 #include "libguile/chars.h"
 #include "libguile/eval.h"
 #include "libguile/list.h"
+#include "libguile/ports.h"
 #include "libguile/procs.h"
 #include "libguile/srfi-14.h"
 #include "libguile/strings.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 0e4e3c0c7..da095f9ac 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -60,6 +60,7 @@
 #include "libguile/instructions.h"
 #include "libguile/intrinsics.h"
 #include "libguile/loader.h"
+#include "libguile/ports.h"
 #include "libguile/programs.h"
 #include "libguile/simpos.h"
 #include "libguile/vectors.h"