diff --git a/src/mapnode.h b/src/mapnode.h
index a93589c41fb75fbaa3dbbb48d49482e15d3fe9a1..35920c5a66f0d0c2ee1727a642121a9208a26dcb 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -21,11 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPNODE_HEADER
 
 #include <iostream>
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include "light.h"
 #include "exceptions.h"
 #include "serialization.h"
-#include "materials.h"
 #ifndef SERVER
 #include "tile.h"
 #endif
diff --git a/src/mapnode_contentfeatures.h b/src/mapnode_contentfeatures.h
index 7dd9df13b6ea951e498d5cadac63e47b4a2715ee..835d95c33e2219a96e521d310bdac05cb1daad2a 100644
--- a/src/mapnode_contentfeatures.h
+++ b/src/mapnode_contentfeatures.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVER
 #include "tile.h"
 #endif
+#include "materials.h" // DiggingProperties
 
 /*
 	Content feature list