diff --git a/src/game/Creature.h b/src/game/Creature.h
index d3826db89..07ae15551 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -161,23 +161,6 @@ struct CreatureInfo
     }
 };
 
-struct CreatureLocale
-{
-    std::vector<std::string> Name;
-    std::vector<std::string> SubName;
-};
-
-struct GossipMenuItemsLocale
-{
-    std::vector<std::string> OptionText;
-    std::vector<std::string> BoxText;
-};
-
-struct PointOfInterestLocale
-{
-    std::vector<std::string> IconName;
-};
-
 struct EquipmentInfo
 {
     uint32  entry;
@@ -242,6 +225,30 @@ struct CreatureModelRace
     uint32 modelid_racial;                                  // Explicit modelid. Used if creature_template entry is not defined
 };
 
+// GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
+#if defined( __GNUC__ )
+#pragma pack()
+#else
+#pragma pack(pop)
+#endif
+
+struct CreatureLocale
+{
+    std::vector<std::string> Name;
+    std::vector<std::string> SubName;
+};
+
+struct GossipMenuItemsLocale
+{
+    std::vector<std::string> OptionText;
+    std::vector<std::string> BoxText;
+};
+
+struct PointOfInterestLocale
+{
+    std::vector<std::string> IconName;
+};
+
 enum InhabitTypeValues
 {
     INHABIT_GROUND = 1,
@@ -275,13 +282,6 @@ enum AttackingTarget
     */
 };
 
-// GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
-#if defined( __GNUC__ )
-#pragma pack()
-#else
-#pragma pack(pop)
-#endif
-
 // Vendors
 struct VendorItem
 {
diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
index fa973f63a..8cf299d3c 100644
--- a/src/game/DBCStructure.h
+++ b/src/game/DBCStructure.h
@@ -1501,11 +1501,6 @@ struct SpellEntry
         SpellEntry(SpellEntry const&);                      // DON'T must have implementation
 };
 
-typedef std::set<uint32> SpellCategorySet;
-typedef std::map<uint32,SpellCategorySet > SpellCategoryStore;
-typedef std::set<uint32> PetFamilySpellsSet;
-typedef std::map<uint32,PetFamilySpellsSet > PetFamilySpellsStore;
-
 struct SpellCastTimesEntry
 {
     uint32    ID;                                           // 0
@@ -1856,6 +1851,11 @@ struct WorldSafeLocsEntry
 #pragma pack(pop)
 #endif
 
+typedef std::set<uint32> SpellCategorySet;
+typedef std::map<uint32,SpellCategorySet > SpellCategoryStore;
+typedef std::set<uint32> PetFamilySpellsSet;
+typedef std::map<uint32,PetFamilySpellsSet > PetFamilySpellsStore;
+
 // Structures not used for casting to loaded DBC data and not required then packing
 struct MapDifficulty
 {
diff --git a/src/game/GameObject.h b/src/game/GameObject.h
index 689bfe975..1f405f8ce 100644
--- a/src/game/GameObject.h
+++ b/src/game/GameObject.h
@@ -516,13 +516,6 @@ struct GameObjectInfo
     }
 };
 
-// By unknown reason GCC generate wrong code for locale structures declared in header after pack pragma
-struct GameObjectLocale
-{
-    std::vector<std::string> Name;
-    std::vector<std::string> CastBarCaption;
-};
-
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
@@ -530,6 +523,12 @@ struct GameObjectLocale
 #pragma pack(pop)
 #endif
 
+struct GameObjectLocale
+{
+    std::vector<std::string> Name;
+    std::vector<std::string> CastBarCaption;
+};
+
 // client side GO show states
 enum GOState
 {
diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h
index 10e60d85e..20b29e62f 100644
--- a/src/game/ItemPrototype.h
+++ b/src/game/ItemPrototype.h
@@ -656,17 +656,17 @@ struct ItemPrototype
     bool IsConjuredConsumable() const { return Class == ITEM_CLASS_CONSUMABLE && (Flags & ITEM_FLAGS_CONJURED); }
 };
 
-// By unknown reason GCC generate wrong code for locale structures declared in header after pack pragma
-struct ItemLocale
-{
-    std::vector<std::string> Name;
-    std::vector<std::string> Description;
-};
-
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
 #else
 #pragma pack(pop)
 #endif
+
+struct ItemLocale
+{
+    std::vector<std::string> Name;
+    std::vector<std::string> Description;
+};
+
 #endif
diff --git a/src/game/NPCHandler.h b/src/game/NPCHandler.h
index 680188cd1..9e4f4e99a 100644
--- a/src/game/NPCHandler.h
+++ b/src/game/NPCHandler.h
@@ -34,7 +34,13 @@ struct PageText
     uint32 Next_Page;
 };
 
-// By unknown reason GCC generate wrong code for locale structures declared in header after pack pragma
+// GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
+#if defined( __GNUC__ )
+#pragma pack()
+#else
+#pragma pack(pop)
+#endif
+
 struct PageTextLocale
 {
     std::vector<std::string> Text;
@@ -48,13 +54,6 @@ struct NpcTextLocale
     std::vector<std::vector<std::string> > Text_1;
 };
 
-// GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
-#if defined( __GNUC__ )
-#pragma pack()
-#else
-#pragma pack(pop)
-#endif
-
 struct QEmote
 {
     uint32 _Emote;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 55b83908e..213ce5295 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10600"
+ #define REVISION_NR "10601"
 #endif // __REVISION_NR_H__