diff --git a/libdap4/d4file.c b/libdap4/d4file.c
index 9f48cbc45f..e8ae665b1b 100644
--- a/libdap4/d4file.c
+++ b/libdap4/d4file.c
@@ -3,6 +3,7 @@
  *   See netcdf/COPYRIGHT file for copying and redistribution conditions.
  *********************************************************************/
 
+#include "config.h"
 #include "ncdispatch.h"
 #include "ncd4dispatch.h"
 #include "d4includes.h"
diff --git a/libhdf5/hdf5create.c b/libhdf5/hdf5create.c
index 78fe558ddb..6d96a35a38 100644
--- a/libhdf5/hdf5create.c
+++ b/libhdf5/hdf5create.c
@@ -10,6 +10,7 @@
 
 #include "config.h"
 #include "netcdf.h"
+#include "ncdispatch.h"
 #include "ncpathmgr.h"
 #include "ncpathmgr.h"
 #include "hdf5internal.h"
diff --git a/libhdf5/hdf5open.c b/libhdf5/hdf5open.c
index 63a1273002..26e132c2b1 100644
--- a/libhdf5/hdf5open.c
+++ b/libhdf5/hdf5open.c
@@ -10,6 +10,7 @@
  */
 
 #include "config.h"
+#include "ncdispatch.h"
 #include "hdf5internal.h"
 #include "hdf5err.h"
 #include "hdf5debug.h"
diff --git a/ncdump/tst_rcapi.c b/ncdump/tst_rcapi.c
index a7bd0f2393..052ce7aa3a 100644
--- a/ncdump/tst_rcapi.c
+++ b/ncdump/tst_rcapi.c
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "netcdf.h"
+#include "ncdispatch.h"
 
 #undef DEBUG
 
diff --git a/ncdump/tst_rcmerge.c b/ncdump/tst_rcmerge.c
index 047b3ebe05..f421de78c5 100644
--- a/ncdump/tst_rcmerge.c
+++ b/ncdump/tst_rcmerge.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include "netcdf.h"
 #include "ncrc.h"
+#include "ncdispatch.h"
 #include "nc4internal.h"
 
 static void
diff --git a/oc2/ocinternal.c b/oc2/ocinternal.c
index 681a010105..ab654066b7 100644
--- a/oc2/ocinternal.c
+++ b/oc2/ocinternal.c
@@ -25,7 +25,8 @@
 #endif
 
 #include <errno.h>
-
+#include "config.h"
+#include "ncdispatch.h"
 #include "nc4internal.h"
 #include "ocinternal.h"
 #include "ocdebug.h"