diff --git a/src/adiabatic_index.h b/src/adiabatic_index.h
index 6a157a41c54ee8fa912d263b84578a7dcd0d4cc0..f65f2dac13b9cf1a470ded155590cf5e443d0c76 100644
--- a/src/adiabatic_index.h
+++ b/src/adiabatic_index.h
@@ -33,7 +33,6 @@
 #include <math.h>
 
 /* Local headers. */
-#include "debug.h"
 #include "error.h"
 #include "inline.h"
 
diff --git a/src/common_io.h b/src/common_io.h
index 4f6d75fad0482f62b8d5c3f80a632d7eb6f54d60..d9e676db934b58ee476f18894acf55c4d38344f9 100644
--- a/src/common_io.h
+++ b/src/common_io.h
@@ -24,7 +24,6 @@
 #include "../config.h"
 
 /* Local includes. */
-#include "part.h"
 #include "units.h"
 
 #define FIELD_BUFFER_SIZE 200
@@ -33,6 +32,9 @@
 #define IO_BUFFER_ALIGNMENT 1024
 
 /* Avoid cyclic inclusion problems */
+struct part;
+struct gpart;
+struct spart;
 struct io_props;
 struct engine;
 struct threadpool;