diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 096fa824d..83d19eca2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,6 +121,7 @@ SET (HDRS
 	MobSpawner.h
 	MonsterConfig.h
 	Noise.h
+	OctavedNoise.h
 	ProbabDistrib.h
 	RankManager.h
 	RCONServer.h
diff --git a/src/OctavedNoise.h b/src/OctavedNoise.h
index 86fb0ddb0..272a1051e 100644
--- a/src/OctavedNoise.h
+++ b/src/OctavedNoise.h
@@ -80,7 +80,7 @@ public:
 		}
 	
 		// Add each octave:
-		for (cOctaves::const_iterator itr = m_Octaves.begin() + 1, end = m_Octaves.end(); itr != end; ++itr)
+		for (auto itr = m_Octaves.cbegin() + 1, end = m_Octaves.cend(); itr != end; ++itr)
 		{
 			// Generate the noise for the octave:
 			itr->m_Noise.Generate2D(
@@ -139,7 +139,7 @@ public:
 		}
 	
 		// Add each octave:
-		for (cOctaves::const_iterator itr = m_Octaves.begin() + 1, end = m_Octaves.end(); itr != end; ++itr)
+		for (auto itr = m_Octaves.cbegin() + 1, end = m_Octaves.cend(); itr != end; ++itr)
 		{
 			// Generate the noise for the octave:
 			itr->m_Noise.Generate3D(