diff --git a/code/ryzom/common/src/game_share/generate_client_db.xslt b/code/ryzom/common/src/game_share/generate_client_db.xslt
index 699630569..728bd7aec 100644
--- a/code/ryzom/common/src/game_share/generate_client_db.xslt
+++ b/code/ryzom/common/src/game_share/generate_client_db.xslt
@@ -151,8 +151,6 @@ void CBankAccessor_<xsl:value-of select="@name"/>::init()
 	<!-- ######################################################### -->
 	<xsl:template match="database_description" mode="header-server">
 
-#ifndef INCLUDED_<xsl:value-of select="concat($filename, '_', $bank)"/>_H
-#define INCLUDED_<xsl:value-of select="concat($filename, '_', $bank)"/>_H
 // Ryzom - MMORPG Framework &lt;http://dev.ryzom.com/projects/ryzom/&gt;
 // Copyright (C) 2010  Winch Gate Property Limited
 //
@@ -184,6 +182,9 @@ void CBankAccessor_<xsl:value-of select="@name"/>::init()
 //
 /////////////////////////////////////////////////////////////////
 
+#ifndef INCLUDED_DATABASE_<xsl:value-of select="concat($filename, '_', $bank)"/>_H
+#define INCLUDED_DATABASE_<xsl:value-of select="concat($filename, '_', $bank)"/>_H
+
 #include "nel/misc/string_common.h"
 #include "cdb_group.h"
 #include "player_manager/cdb.h"
@@ -343,7 +344,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	</xsl:for-each>
 <xsl:call-template name="myApplyTemplate"/>
 
-#endif // INCLUDED_<xsl:value-of select="concat($filename, '_', $bank)"/><xsl:text>_H
+#endif // INCLUDED_DATABASE_<xsl:value-of select="concat($filename, '_', $bank)"/><xsl:text>_H
 </xsl:text>
 
 	</xsl:template>
diff --git a/code/ryzom/server/src/entities_game_service/database_guild.cpp b/code/ryzom/server/src/entities_game_service/database_guild.cpp
index 3f5cc03df..4314580fe 100644
Binary files a/code/ryzom/server/src/entities_game_service/database_guild.cpp and b/code/ryzom/server/src/entities_game_service/database_guild.cpp differ
diff --git a/code/ryzom/server/src/entities_game_service/database_guild.h b/code/ryzom/server/src/entities_game_service/database_guild.h
index 13bec33d6..91bba02b4 100644
Binary files a/code/ryzom/server/src/entities_game_service/database_guild.h and b/code/ryzom/server/src/entities_game_service/database_guild.h differ
diff --git a/code/ryzom/server/src/entities_game_service/database_outpost.cpp b/code/ryzom/server/src/entities_game_service/database_outpost.cpp
index 2c2f3f8e0..95a16b1f8 100644
Binary files a/code/ryzom/server/src/entities_game_service/database_outpost.cpp and b/code/ryzom/server/src/entities_game_service/database_outpost.cpp differ
diff --git a/code/ryzom/server/src/entities_game_service/database_outpost.h b/code/ryzom/server/src/entities_game_service/database_outpost.h
index 1e472c40d..25116b439 100644
Binary files a/code/ryzom/server/src/entities_game_service/database_outpost.h and b/code/ryzom/server/src/entities_game_service/database_outpost.h differ
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.cpp b/code/ryzom/server/src/entities_game_service/database_plr.cpp
index e76c9f0b4..fbefa3f5a 100644
Binary files a/code/ryzom/server/src/entities_game_service/database_plr.cpp and b/code/ryzom/server/src/entities_game_service/database_plr.cpp differ
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.h b/code/ryzom/server/src/entities_game_service/database_plr.h
index bef0cb796..eaf0f2041 100644
Binary files a/code/ryzom/server/src/entities_game_service/database_plr.h and b/code/ryzom/server/src/entities_game_service/database_plr.h differ