diff --git a/src/main.cpp b/src/main.cpp
index 9c7cf2e28b85c12666e8e1f167db61e492019803..9fb17e2112c74db887615684ecf3a0c36bb7ddcf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -427,6 +427,7 @@ TODO: Use MapBlock::resetUsageTimer() in appropriate places
 #include "materials.h"
 #include "game.h"
 #include "keycode.h"
+#include "tile.h"
 
 // This makes textures
 ITextureSource *g_texturesource = NULL;
diff --git a/src/main.h b/src/main.h
index 450525c26e2d53f37433f2e3ad1c6eefdabed259..b2dee149469e5bbcc84cd94b7debfad7de347322 100644
--- a/src/main.h
+++ b/src/main.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 extern Settings g_settings;
 
 // This makes and maps textures
-#include "tile.h"
+class ITextureSource;
 extern ITextureSource *g_texturesource;
 
 // Global profiler
diff --git a/src/map.cpp b/src/map.cpp
index a20cd9910e45952aed21ab91cda324bc58f30860..5bf278667f8ea136a05411569fe18c8f894a9961 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -755,6 +755,25 @@ void Map::updateLighting(enum LightBank bank,
 
 		}
 	}
+	
+	/*
+		Enable this to disable proper lighting for speeding up map
+		generation for testing or whatever
+	*/
+#if 0
+	//if(g_settings.get(""))
+	{
+		core::map<v3s16, MapBlock*>::Iterator i;
+		i = blocks_to_update.getIterator();
+		for(; i.atEnd() == false; i++)
+		{
+			MapBlock *block = i.getNode()->getValue();
+			v3s16 p = block->getPos();
+			block->setLightingExpired(false);
+		}
+		return;
+	}
+#endif
 
 #if 0
 	{
diff --git a/src/mineral.h b/src/mineral.h
index 970ff1f7868773a1cf2d194a0bc085d609eb4d5c..61776e669c5d7711f4af23aec4c73a16ead74db6 100644
--- a/src/mineral.h
+++ b/src/mineral.h
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MINERAL_HEADER
 
 #include "inventory.h"
-#include "tile.h"
 
 /*
 	Minerals