diff --git a/source/renderer/OverlayRenderer.cpp b/source/renderer/OverlayRenderer.cpp
index a26fe8165c..4d55e458bd 100644
--- a/source/renderer/OverlayRenderer.cpp
+++ b/source/renderer/OverlayRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2013 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -233,7 +233,7 @@ void OverlayRenderer::EndFrame()
 	// won't be very large or very variable
 	
 	// Empty the batch rendering data structures, but keep their key mappings around for the next frames
-	for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); it++)
+	for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); ++it)
 	{
 		QuadBatchData& quadBatchData = (it->second);
 		quadBatchData.m_Quads.clear();
@@ -505,7 +505,7 @@ void OverlayRenderer::RenderQuadOverlays()
 		GLsizei indexStride = m->quadIndices.GetStride();
 		GLsizei vertexStride = m->quadVertices.GetStride();
 
-		for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); it++)
+		for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); ++it)
 		{
 			QuadBatchData& batchRenderData = it->second;
 			const size_t batchNumQuads = batchRenderData.m_NumRenderQuads;
diff --git a/source/scriptinterface/DebuggingServer.cpp b/source/scriptinterface/DebuggingServer.cpp
index 1fe53b9c16..93c18d6d02 100644
--- a/source/scriptinterface/DebuggingServer.cpp
+++ b/source/scriptinterface/DebuggingServer.cpp
@@ -40,7 +40,7 @@ void CDebuggingServer::GetAllCallstacks(std::stringstream& response)
 	if (!m_ThreadDebuggers.empty())
 	{
 		response << "[";
-		for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++)
+		for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
 		{
 			if ((*itr)->GetIsInBreak())
 			{
@@ -68,7 +68,7 @@ void CDebuggingServer::GetStackFrameData(std::stringstream& response, uint nesti
 	response.str("");
 	std::stringstream stream;
 	std::list<CThreadDebugger*>::iterator itr;
-	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++)
+	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
 	{
 		if ( (*itr)->GetID() == threadDebuggerID && (*itr)->GetIsInBreak())
 		{
@@ -112,7 +112,7 @@ bool CDebuggingServer::SetNextDbgCmd(uint threadDebuggerID, DBGCMD dbgCmd)
 {
 	CScopeLock lock(m_Mutex);
 	std::list<CThreadDebugger*>::iterator itr;
-	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++)
+	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
 	{
 		if ( (*itr)->GetID() == threadDebuggerID || threadDebuggerID == 0)
 		{
@@ -195,7 +195,7 @@ void CDebuggingServer::EnumVfsJSFiles(std::stringstream& response)
 
 	std::vector<std::string>::iterator itr;
 	response << "[";
-	for (itr = templates.begin(); itr != templates.end(); itr++)
+	for (itr = templates.begin(); itr != templates.end(); ++itr)
 	{
 		if (itr != templates.begin())
 			response << ",";
@@ -477,7 +477,7 @@ void CDebuggingServer::UnRegisterScriptinterface(ScriptInterface* pScriptInterfa
 {
 	CScopeLock lock(m_Mutex);
 	std::list<CThreadDebugger*>::iterator itr;
-	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++)
+	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
 	{
 		if ((*itr)->CompareScriptInterfacePtr(pScriptInterface))
 		{
@@ -496,7 +496,7 @@ void CDebuggingServer::GetThreadDebuggerStatus(std::stringstream& response)
 	std::list<CThreadDebugger*>::iterator itr;
 
 	response << "[";
-	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++)
+	for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
 	{
 		if (itr == m_ThreadDebuggers.begin())
 			response << "{ ";
@@ -519,7 +519,7 @@ void CDebuggingServer::ToggleBreakPoint(std::string filename, uint line)
 	{
 		CScopeLock lock(m_Mutex);
 		std::list<CThreadDebugger*>::iterator itr;
-		for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++)
+		for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
 		{
 			if ((*itr)->ToggleBreakPoint(filename, line))
 				return;
@@ -533,7 +533,7 @@ void CDebuggingServer::ToggleBreakPoint(std::string filename, uint line)
 
 	// If set, delete
 	bool deleted = false;
-	for (itr = pBreakPoints->begin(); itr != pBreakPoints->end(); itr++)
+	for (itr = pBreakPoints->begin(); itr != pBreakPoints->end(); ++itr)
 	{
 		if ((*itr).m_Filename == filename && (*itr).m_UserLine == line)
 		{
diff --git a/source/scriptinterface/ThreadDebugger.cpp b/source/scriptinterface/ThreadDebugger.cpp
index 4d4de1858e..f93b090b07 100644
--- a/source/scriptinterface/ThreadDebugger.cpp
+++ b/source/scriptinterface/ThreadDebugger.cpp
@@ -192,7 +192,7 @@ void CThreadDebugger::ClearTrapsToRemove()
 
 		}
 		else
-			itr++;
+			++itr;
 	}
 }
 
@@ -224,7 +224,7 @@ void CThreadDebugger::SetAllNewTraps()
 			{
 				CScopeLock lock(m->m_Mutex);
 				std::list<CActiveBreakPoint*>::iterator itr1;
-				for (itr1 = m->m_ActiveBreakPoints.begin(); itr1 != m->m_ActiveBreakPoints.end(); itr1++)
+				for (itr1 = m->m_ActiveBreakPoints.begin(); itr1 != m->m_ActiveBreakPoints.end(); ++itr1)
 				{
 					if ((*itr1)->m_ActualLine == (*itr).m_UserLine)
 						trapAlreadySet = true;
@@ -243,7 +243,7 @@ void CThreadDebugger::SetAllNewTraps()
 				continue;
 			}
 		}
-		itr++;
+		++itr;
 	}
 	m->m_pDebuggingServer->ReleaseBreakPointAccess(breakPointsLockID);
 }
@@ -313,7 +313,7 @@ void CThreadDebugger::ReturnActiveBreakPoints(jsbytecode* pBytecode)
 			m->m_pDebuggingServer->ReleaseBreakPointAccess(breakPointsLockID);
 		}
 		else
-			itr++;
+			++itr;
 	}
 }
 
@@ -620,7 +620,7 @@ bool CThreadDebugger::ToggleBreakPoint(std::string filename, uint userLine)
 {
 	CScopeLock lock(m->m_Mutex);
 	std::list<CActiveBreakPoint*>::iterator itr;
-	for (itr = m->m_ActiveBreakPoints.begin(); itr != m->m_ActiveBreakPoints.end(); itr++)
+	for (itr = m->m_ActiveBreakPoints.begin(); itr != m->m_ActiveBreakPoints.end(); ++itr)
 	{
 		if ((*itr)->m_UserLine == userLine && (*itr)->m_Filename == filename)
 		{
diff --git a/source/soundmanager/SoundManager.cpp b/source/soundmanager/SoundManager.cpp
index ea7588e0d1..b89ec6b66c 100644
--- a/source/soundmanager/SoundManager.cpp
+++ b/source/soundmanager/SoundManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2013 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -588,7 +588,7 @@ void CSoundManager::IdleTask()
 					{
 						m_PlaylistGap = 0;
 						PlayList::iterator it = find (m_PlayListItems->begin(), m_PlayListItems->end(), *(m_CurrentTune->GetName()) );
-						it++;
+						++it;
 
 						Path nextPath;
 						if ( it == m_PlayListItems->end() )