diff --git a/src/cdf_lazy_grid.c b/src/cdf_lazy_grid.c
index 5af2914aa0132c2fafa26348491da9ad63cfdc65..65339aec2935a81ef74454466783376f90ac989d 100644
--- a/src/cdf_lazy_grid.c
+++ b/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;
diff --git a/src/cdf_lazy_grid.h b/src/cdf_lazy_grid.h
index ac0184ffd2854bb33c15571e67b02989ed7d7074..3788e2622c534999a991e8b302c4254b1f7143a6 100644
--- a/src/cdf_lazy_grid.h
+++ b/src/cdf_lazy_grid.h
@@ -19,8 +19,6 @@
 
 #include <string.h>
 
-#include "dmemory.h"
-#include "cdf_int.h"
 #include "grid.h"
 
 struct xyValGet
diff --git a/src/cdf_read.c b/src/cdf_read.c
index e786713859e0f0804d119120191d654cc669bdad..487ec7fad907651fbbac8fb578e3c08e341c641e 100644
--- a/src/cdf_read.c
+++ b/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)
diff --git a/src/cdf_util.c b/src/cdf_util.c
index 3f529d185cbfc8ddf7052a00993c8107885ad0f9..f4779e3f4d51e8a10f43af53571d7dfc54a90932 100644
--- a/src/cdf_util.c
+++ b/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"
diff --git a/src/cdf_util.h b/src/cdf_util.h
index 021f0467a32740a3c326272291a62dd21b9c24c6..8ac9d7158926d2150cdcc58b9fbba22c95366f72 100644
--- a/src/cdf_util.h
+++ b/src/cdf_util.h
@@ -1,6 +1,7 @@
 #ifndef CDF_UTIL_H_
 #define CDF_UTIL_H_
 
+#include <stdlib.h>
 #include <stdbool.h>
 
 bool xtypeIsText(int xtype);
diff --git a/src/cdf_write.c b/src/cdf_write.c
index 84bec8bc3b00e48d81d5b922a3609eabf9affd07..4e5ece4fbaca9d08a7ee32710e8535ba80d2a990 100644
--- a/src/cdf_write.c
+++ b/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)
diff --git a/src/extra.h b/src/extra.h
index 1c586432db021af78776419ad4debe01e81ffbef..0c046b399015b44b8c738da5272e2d283d5ff81b 100644
--- a/src/extra.h
+++ b/src/extra.h
@@ -5,6 +5,8 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+
 enum
 {
   EXT_REAL = 1,
diff --git a/src/extralib.c b/src/extralib.c
index cf3b0a72645b35cc23648603df86b7e9fd25230a..0bcc85454fd26586f1f8393b87ff439a4e08700a 100644
--- a/src/extralib.c
+++ b/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>
 
diff --git a/src/ieg.h b/src/ieg.h
index df110c2d5edc2c34853efe6591cfe66a12aa38ca..cb07281d67a51e8841c0403cfb28bacb8cf57569 100644
--- a/src/ieg.h
+++ b/src/ieg.h
@@ -1,6 +1,8 @@
 #ifndef _IEG_H
 #define _IEG_H
 
+#include <stdlib.h>
+
 // clang-format off
 
 /* Level Types */
diff --git a/src/ieglib.c b/src/ieglib.c
index 067ce68abc22b6c4b118febf91cde188a44d27dd..b5e08e2cf245c7638efa8cb48f0cc6267a91214e 100644
--- a/src/ieglib.c
+++ b/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>
 
diff --git a/src/institution.c b/src/institution.c
index 0250a7dc7045fbe51bbec18d9d3a7eba1a428bfa..6484ddb0601aad0ad1065975ef8bcb2139e8c973 100644
--- a/src/institution.c
+++ b/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"
diff --git a/src/service.h b/src/service.h
index 9c9a5d14b39cd85e57340cd2d8f94170258d253f..edc06842ea2e1fd3de959f67cb4fb73aa5fa6499 100644
--- a/src/service.h
+++ b/src/service.h
@@ -1,6 +1,8 @@
 #ifndef _SERVICE_H
 #define _SERVICE_H
 
+#include <stdlib.h>
+
 typedef struct
 {
   int checked;
diff --git a/src/servicelib.c b/src/servicelib.c
index 70a649f968393f12fdf25cd8c0fd206e4fdee784..5c0bd113caf78434894f0b6e75d14610236cc32c 100644
--- a/src/servicelib.c
+++ b/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>
diff --git a/src/stream_cdf_time.c b/src/stream_cdf_time.c
index 8b5e662a99bdec5b897c928e9daa94477331bb9b..1a9adac28daffac1c1e89c7987129fbaec9fc31b 100644
--- a/src/stream_cdf_time.c
+++ b/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)