diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp
index 0bb9d10f15..18e5a2b493 100644
--- a/source/graphics/MapReader.cpp
+++ b/source/graphics/MapReader.cpp
@@ -44,8 +44,6 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-#define LOG_CATEGORY L"graphics"
-
 
 CMapReader::CMapReader()
 	: xml_reader(0), m_PatchesPerSide(0)
diff --git a/source/gui/CGUIScrollBarVertical.cpp b/source/gui/CGUIScrollBarVertical.cpp
index e51cc5c6b6..8f260dc72b 100644
--- a/source/gui/CGUIScrollBarVertical.cpp
+++ b/source/gui/CGUIScrollBarVertical.cpp
@@ -24,7 +24,6 @@ IGUIScrollBar
 #include "CGUIScrollBarVertical.h"
 
 #include "ps/CLogger.h"
-#define LOG_CATEGORY L"gui"
 
 
 CGUIScrollBarVertical::CGUIScrollBarVertical()
diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp
index 355c0bdf49..3a872ae56f 100644
--- a/source/gui/CInput.cpp
+++ b/source/gui/CInput.cpp
@@ -34,8 +34,6 @@ CInput
 #include "ps/CLogger.h"
 #include "ps/Globals.h"
 
-#define LOG_CATEGORY L"gui"
-
 
 //-------------------------------------------------------------------
 //  Constructor / Destructor
diff --git a/source/main.cpp b/source/main.cpp
index fa785b6a11..0c634ab35f 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -71,8 +71,6 @@ that of Atlas depending on commandline parameters.
 #include "scripting/ScriptingHost.h"
 #include "simulation2/Simulation2.h"
 
-#define LOG_CATEGORY L"main"
-
 extern bool g_GameRestarted;
 
 void kill_mainloop();
diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp
index 44e81fbcd9..7faded1d91 100644
--- a/source/ps/CConsole.cpp
+++ b/source/ps/CConsole.cpp
@@ -39,8 +39,6 @@
 #include "scripting/ScriptingHost.h"
 #include "scriptinterface/ScriptInterface.h"
 
-#define LOG_CATEGORY L"Console"
-
 CConsole* g_Console = 0;
 
 CConsole::CConsole()
diff --git a/source/ps/Font.cpp b/source/ps/Font.cpp
index ac23622810..af4e5e8cf3 100644
--- a/source/ps/Font.cpp
+++ b/source/ps/Font.cpp
@@ -23,7 +23,6 @@
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
 #include "ps/CLogger.h"
-#define LOG_CATEGORY L"graphics"
 
 #include <map>
 #include <string>
diff --git a/source/renderer/FixedFunctionModelRenderer.cpp b/source/renderer/FixedFunctionModelRenderer.cpp
index 7ac4068609..6e9a4a7319 100644
--- a/source/renderer/FixedFunctionModelRenderer.cpp
+++ b/source/renderer/FixedFunctionModelRenderer.cpp
@@ -37,9 +37,6 @@
 #include "renderer/VertexArray.h"
 
 
-#define LOG_CATEGORY L"graphics"
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // FixedFunctionModelRenderer implementation
 
diff --git a/source/renderer/HWLightingModelRenderer.cpp b/source/renderer/HWLightingModelRenderer.cpp
index f1d96cb953..b37475240f 100644
--- a/source/renderer/HWLightingModelRenderer.cpp
+++ b/source/renderer/HWLightingModelRenderer.cpp
@@ -40,9 +40,6 @@
 #include "renderer/VertexArray.h"
 
 
-#define LOG_CATEGORY L"graphics"
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // HWLightingModelRenderer implementation
 
diff --git a/source/renderer/InstancingModelRenderer.cpp b/source/renderer/InstancingModelRenderer.cpp
index e4b72fad2a..7f08e202a9 100644
--- a/source/renderer/InstancingModelRenderer.cpp
+++ b/source/renderer/InstancingModelRenderer.cpp
@@ -40,9 +40,6 @@
 #include "renderer/VertexArray.h"
 
 
-#define LOG_CATEGORY L"graphics"
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // InstancingModelRenderer implementation
 
diff --git a/source/scripting/ScriptGlue.cpp b/source/scripting/ScriptGlue.cpp
index e0185836b5..3aa46ae01c 100644
--- a/source/scripting/ScriptGlue.cpp
+++ b/source/scripting/ScriptGlue.cpp
@@ -54,8 +54,6 @@
 #include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
 
-#define LOG_CATEGORY L"script"
-
 // rationale: the function table is now at the end of the source file to
 // avoid the need for forward declarations for every function.
 
diff --git a/source/scripting/ScriptingHost.cpp b/source/scripting/ScriptingHost.cpp
index 36b961e88e..c64668900d 100644
--- a/source/scripting/ScriptingHost.cpp
+++ b/source/scripting/ScriptingHost.cpp
@@ -27,8 +27,6 @@
 #include "ps/Filesystem.h"
 #include "scriptinterface/ScriptInterface.h"
 
-#define LOG_CATEGORY L"scriptinghost"
-
 ScriptingHost::ScriptingHost()
 {
 	m_ScriptInterface = new ScriptInterface("Engine", "GUI");
diff --git a/source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp b/source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp
index ebd79125d6..eebd5371e2 100644
--- a/source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp
@@ -30,7 +30,6 @@
 #include "maths/Quaternion.h"
 #include "lib/res/graphics/ogl_tex.h"
 
-#define LOG_CATEGORY L"Cinema"
 
 namespace AtlasMessage {
 
diff --git a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
index 21a86bc7f8..1ccea72e5c 100644
--- a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
@@ -46,7 +46,6 @@
 #include "simulation2/components/ICmpSelectable.h"
 #include "simulation2/components/ICmpTemplateManager.h"
 
-#define LOG_CATEGORY L"editor"
 
 namespace AtlasMessage {
 
@@ -234,7 +233,7 @@ BEGIN_COMMAND(SetObjectSettings)
 	}
 
 private:
-	void Set(player_id_t player, const std::set<CStr>& selections)
+	void Set(player_id_t player, const std::set<CStr>& UNUSED(selections))
 	{
 		View* view = View::GetView(msg->view);
 		CSimulation2* simulation = view->GetSimulation2();