diff --git a/include/nc4internal.h b/include/nc4internal.h
index 2dda4d34e5..2a1b3558b0 100644
--- a/include/nc4internal.h
+++ b/include/nc4internal.h
@@ -10,6 +10,7 @@
 
 #ifndef _NC4INTERNAL_
 #define _NC4INTERNAL_
+#include "netcdf.h"
 
 #include "config.h"
 #include <stdio.h>
@@ -23,12 +24,12 @@
 #include "ncindex.h"
 #include "nc_provenance.h"
 
+
+#include "netcdf_f.h"
+#include "netcdf_mem.h"
 #ifdef USE_PARALLEL
 #include "netcdf_par.h"
 #endif /* USE_PARALLEL */
-#include "netcdf.h"
-#include "netcdf_f.h"
-#include "netcdf_mem.h"
 
 /* Always needed */
 #include "nc.h"
diff --git a/include/nc_tests.h b/include/nc_tests.h
index 8d8a4d880d..1020c8cb13 100644
--- a/include/nc_tests.h
+++ b/include/nc_tests.h
@@ -17,11 +17,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "netcdf.h"
 #include "nc_logging.h"
 #ifdef USE_PARALLEL
 #include "netcdf_par.h"
 #endif
-#include "netcdf.h"
+
 
 /** NC_MAX_DIMS for tests.  Allows different NC_MAX_DIMS values
  * without breaking this test with a heap or stack overflow. */
diff --git a/libdap2/dapdump.c b/libdap2/dapdump.c
index 0c967ce57a..5109e37138 100644
--- a/libdap2/dapdump.c
+++ b/libdap2/dapdump.c
@@ -4,6 +4,7 @@
  *********************************************************************/
 
 #include "config.h"
+#include "netcdf.h"
 #ifdef USE_PARALLEL
 #include "netcdf_par.h"
 #endif
@@ -91,7 +92,7 @@ dumpmetadata(int ncid, NChdr** hdrp)
         CHECK(stat);
 	fprintf(stdout,"dim[%d]: name=%s size=%lu\n",
 		i,hdr->dims[i].name,(unsigned long)hdr->dims[i].size);
-    }    
+    }
     hdr->vars = (Var*)malloc(hdr->nvars*sizeof(Var));
     MEMCHECK(hdr->vars,NC_ENOMEM);
     for(i=0;i<hdr->nvars;i++) {
@@ -145,7 +146,7 @@ dumpmetadata(int ncid, NChdr** hdrp)
 	    }
 	    fprintf(stdout,"\n");
 	}
-    }    
+    }
     fflush(stdout);
     return NC_NOERR;
 }
@@ -338,7 +339,7 @@ dumptreer(CDFnode* root, NCbytes* buf, int indent, int visible)
 	ncbytescat(buf," ");
         ncbytescat(buf,(root->ncbasename?root->ncbasename:"<?>"));
 	break;
-    default: break;    
+    default: break;
     }
 
     if(nclistlength(root->array.dimsetplus) > 0) dimset = root->array.dimsetplus;
@@ -415,7 +416,7 @@ dumpnode(CDFnode* node)
 	default: break;
 	}
 	break;
-    default: break;    
+    default: break;
     }
     snprintf(tmp,sizeof(tmp),"%s %s {\n",
 		(nctype?nctype:primtype),node->ocname);