diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.h b/code/ryzom/client/src/client_sheets/attack_id_sheet.h
index 2eaaabed8..1dfe1b790 100644
--- a/code/ryzom/client/src/client_sheets/attack_id_sheet.h
+++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.h
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
 #ifndef CL_ATTACK_ID_H
 #define CL_ATTACK_ID_H
 
diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
index ea08a9747..fb065e6df 100644
--- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
@@ -19,6 +19,7 @@
 #include "stdpch.h"
 //
 #include "body_to_bone_sheet.h"
+#include "client_sheets.h"
 //
 #include "nel/georges/u_form_elm.h"
 
diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h
index f71356c5b..10e59ba72 100644
--- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h
+++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h
@@ -21,6 +21,8 @@
 
 #include "game_share/body.h"
 
+#include <nel/misc/string_mapper.h>
+
 namespace NLGEORGES
 {
 	class UFormElm;
diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.h b/code/ryzom/client/src/client_sheets/faction_sheet.h
index babdb78e9..1b1a3f3e5 100644
--- a/code/ryzom/client/src/client_sheets/faction_sheet.h
+++ b/code/ryzom/client/src/client_sheets/faction_sheet.h
@@ -14,11 +14,10 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
 #ifndef RY_FACTION_SHEET_H
 #define RY_FACTION_SHEET_H
 
+#include "entity_sheet.h"
 
 /** Sheet of a faction
   *  NB : it doesn't derives from CEntitySheet, because its instances are aggragated in a CContinentSheet
diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp
index ce1912897..c58bc601f 100644
--- a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
 #include "stdpch.h"
 #include "item_fx_sheet.h"
+#include "client_sheets.h"
+
 #include "nel/georges/u_form_elm.h"
 
 // *******************************************************************************************
diff --git a/code/ryzom/client/src/client_sheets/outpost_building_sheet.h b/code/ryzom/client/src/client_sheets/outpost_building_sheet.h
index f1bccc371..e753f3352 100644
--- a/code/ryzom/client/src/client_sheets/outpost_building_sheet.h
+++ b/code/ryzom/client/src/client_sheets/outpost_building_sheet.h
@@ -18,7 +18,7 @@
 #define RY_OUTPOST_BUILDING_H
 
 #include "entity_sheet.h"
-
+#include "client_sheets.h"
 
 /**
  * Outpost building definition for client side management (buy building upgrades ...)
diff --git a/code/ryzom/client/src/client_sheets/stdpch.h b/code/ryzom/client/src/client_sheets/stdpch.h
index 6656b4553..3421b031d 100644
--- a/code/ryzom/client/src/client_sheets/stdpch.h
+++ b/code/ryzom/client/src/client_sheets/stdpch.h
@@ -14,7 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <nel/misc/types_nl.h>
+#ifndef CL_STDPCH_H
+#define CL_STDPCH_H
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -33,15 +34,21 @@
 #include <utility>
 #include <deque>
 
+#include <nel/misc/types_nl.h>
 #include <nel/misc/common.h>
 #include <nel/misc/debug.h>
-
 #include <nel/misc/stream.h>
 #include <nel/misc/time_nl.h>
 #include <nel/misc/vector.h>
 #include <nel/misc/matrix.h>
 #include <nel/misc/rgba.h>
 #include <nel/misc/sheet_id.h>
+#include <nel/misc/smart_ptr.h>
+#include <nel/misc/string_mapper.h>
 
-#include "client_sheets.h"
-#include "entity_sheet.h"
+#include <nel/georges/u_form_elm.h>
+#include <nel/georges/u_form.h>
+#include <nel/georges/u_form_loader.h>
+#include <nel/georges/u_form_dfn.h>
+
+#endif
diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h
index ccfdb8f9e..8533e14f5 100644
--- a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h
+++ b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
 #ifndef CL_TEXT_EMOT_LIST_SHEET_H
 #define CL_TEXT_EMOT_LIST_SHEET_H