diff --git a/include/Engine/Core/EntityXMLFile.h b/include/Engine/Core/EntityXMLFile.h
index 6dcc74c5..6f24154d 100644
--- a/include/Engine/Core/EntityXMLFile.h
+++ b/include/Engine/Core/EntityXMLFile.h
@@ -1,5 +1,5 @@
-#ifndef EntityFile_h__
-#define EntityFile_h__
+#ifndef EntityXMLFile_h__
+#define EntityXMLFile_h__
 
 #include <stack>
 #include <boost/lexical_cast.hpp>
diff --git a/include/Engine/Core/EntityXMLFileParser.h b/include/Engine/Core/EntityXMLFileParser.h
index c058640f..984f9e46 100644
--- a/include/Engine/Core/EntityXMLFileParser.h
+++ b/include/Engine/Core/EntityXMLFileParser.h
@@ -1,5 +1,5 @@
-#ifndef EntityFileParser_h__
-#define EntityFileParser_h__
+#ifndef EntityXMLFileParser_h__
+#define EntityXMLFileParser_h__
 
 #include "EntityXMLFile.h"
 #include "World.h"
diff --git a/include/Engine/Core/EntityXMLFilePreprocessor.h b/include/Engine/Core/EntityXMLFilePreprocessor.h
index 45880835..e102ef79 100644
--- a/include/Engine/Core/EntityXMLFilePreprocessor.h
+++ b/include/Engine/Core/EntityXMLFilePreprocessor.h
@@ -1,5 +1,5 @@
-#ifndef EntityFilePreprocessor_h__
-#define EntityFilePreprocessor_h__
+#ifndef EntityXMLFilePreprocessor_h__
+#define EntityXMLFilePreprocessor_h__
 
 #include <xercesc/framework/psvi/XSElementDeclaration.hpp>
 #include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
diff --git a/include/Engine/Core/EntityXMLFileWriter.h b/include/Engine/Core/EntityXMLFileWriter.h
index 9b100670..da073a73 100644
--- a/include/Engine/Core/EntityXMLFileWriter.h
+++ b/include/Engine/Core/EntityXMLFileWriter.h
@@ -1,5 +1,5 @@
-#ifndef EntityFileWriter_h__
-#define EntityFileWriter_h__
+#ifndef EntityXMLFileWriter_h__
+#define EntityXMLFileWriter_h__
 
 #include <boost/filesystem.hpp>
 #include <xercesc/dom/DOM.hpp>