src/cdf_lazy_grid.c

@@ -3,7 +3,9 @@
 #endif
 
 #ifdef HAVE_LIBNETCDF
+#include "dmemory.h"
 #include "stream_cdf.h"
+#include "cdf_int.h"
 #include "cdf_lazy_grid.h"
 
 static struct gridVirtTable cdfLazyGridVtable;

src/cdf_lazy_grid.h

@@ -19,8 +19,6 @@
 
 #include <string.h>
 
-#include "dmemory.h"
-#include "cdf_int.h"
 #include "grid.h"
 
 struct xyValGet

src/cdf_read.c

@@ -15,7 +15,6 @@
 #include "stream_cdf.h"
 #include "cdf_int.h"
 #include "vlist.h"
-#include "vlist_var.h"
 
 static void
 cdfReadGridTraj(stream_t *streamptr, int gridID)

src/cdf_util.c

@@ -13,7 +13,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "dmemory.h"
 #include "cdi.h"
 #include "cdi_int.h"
 #include "cdf_util.h"

src/cdf_util.h

 #ifndef CDF_UTIL_H_
 #define CDF_UTIL_H_
 
+#include <stdlib.h>
 #include <stdbool.h>
 
 bool xtypeIsText(int xtype);

src/cdf_write.c

@@ -13,7 +13,6 @@
 #include "cdf.h"
 #include "cdf_int.h"
 #include "vlist.h"
-#include "vlist_var.h"
 
 void
 cdfDefVarDeflate(int ncid, int ncvarID, int shuffle, int compLevel)

src/cdi_util.c

@@ -2,7 +2,9 @@
 #include "config.h"
 #endif
 
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

src/extra.h

@@ -5,6 +5,8 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+
 enum
 {
   EXT_REAL = 1,

src/extralib.c

@@ -11,7 +11,6 @@
  * next to find out what happened */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

src/ieg.h

 #ifndef _IEG_H
 #define _IEG_H
 
+#include <stdlib.h>
+
 // clang-format off
 
 /* Level Types */

src/ieglib.c

@@ -11,7 +11,6 @@
  * next to find out what happened */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

src/institution.c

@@ -15,7 +15,6 @@
 #include <limits.h>
 
 #include "cdi.h"
-#include "cdi_int.h"
 #include "resource_handle.h"
 #include "resource_unpack.h"
 #include "namespace.h"

src/service.h

 #ifndef _SERVICE_H
 #define _SERVICE_H
 
+#include <stdlib.h>
+
 typedef struct
 {
   int checked;

src/servicelib.c

@@ -11,7 +11,6 @@
  * next to find out what happened */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>

src/stream_cdf_time.c

@@ -10,10 +10,8 @@
 
 #include "cdi.h"
 #include "cdi_int.h"
-#include "dmemory.h"
 #include "stream_cdf.h"
 #include "cdf_int.h"
-#include "vlist.h"
 
 static int
 cdfDefTimeBounds(int fileID, int nctimevarid, int nctimedimid, const char *taxis_name, taxis_t *taxis)