diff --git a/source/graphics/ShaderManager.cpp b/source/graphics/ShaderManager.cpp
index 8a6e2344ad..77c99cda71 100644
--- a/source/graphics/ShaderManager.cpp
+++ b/source/graphics/ShaderManager.cpp
@@ -38,7 +38,8 @@
 #define USE_SHADER_XML_VALIDATION 1
 
 #if USE_SHADER_XML_VALIDATION
-# include "ps/XML/RelaxNG.h"
+#include "ps/XML/RelaxNG.h"
+#include "ps/XML/XMLWriter.h"
 #endif
 
 #include <vector>
diff --git a/source/graphics/ShaderProgram.cpp b/source/graphics/ShaderProgram.cpp
index f0e62ce9f8..6a3bfea79e 100644
--- a/source/graphics/ShaderProgram.cpp
+++ b/source/graphics/ShaderProgram.cpp
@@ -33,8 +33,17 @@
 #include "renderer/backend/gl/DeviceCommandContext.h"
 #include "renderer/Renderer.h"
 
+#define USE_SHADER_XML_VALIDATION 1
+
+#if USE_SHADER_XML_VALIDATION
+#include "ps/XML/RelaxNG.h"
+#include "ps/XML/XMLWriter.h"
+#endif
+
 #include <algorithm>
 
+TIMER_ADD_CLIENT(tc_ShaderProgramValidation);
+
 namespace
 {
 
@@ -754,7 +763,7 @@ CShaderProgramPtr CShaderProgram::Create(const char* name, const CShaderDefines&
 
 #if USE_SHADER_XML_VALIDATION
 	{
-		TIMER_ACCRUE(tc_ShaderValidation);
+		TIMER_ACCRUE(tc_ShaderProgramValidation);
 
 		// Serialize the XMB data and pass it to the validator
 		XMLWriter_File shaderFile;