[FIX] Include guard stripped of __

[FIX] KDE includes put before Qt includes

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@263 6ecfd1a5-f3ed-3746-8530-beee90d26b22

37 files changed, 74 insertions, 74 deletions

diff --git a/sigscript/AbilityWrapper.h b/sigscript/AbilityWrapper.h
index 7b0faa0f..5304ac39 100644
--- a/sigscript/AbilityWrapper.h
+++ b/sigscript/AbilityWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_ABILITYWRAPPER__
-#define __SIGSCRIPT_ABILITYWRAPPER__
+#ifndef SIGSCRIPT_ABILITYWRAPPER
+#define SIGSCRIPT_ABILITYWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/AuthorWrapper.h b/sigscript/AuthorWrapper.h
index 11e0661c..94488ef2 100644
--- a/sigscript/AuthorWrapper.h
+++ b/sigscript/AuthorWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_AUTHORWRAPPER__
-#define __SIGSCRIPT_AUTHORWRAPPER__
+#ifndef SIGSCRIPT_AUTHORWRAPPER
+#define SIGSCRIPT_AUTHORWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/BadgeWrapper.h b/sigscript/BadgeWrapper.h
index 955e660f..b05311c1 100644
--- a/sigscript/BadgeWrapper.h
+++ b/sigscript/BadgeWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_BADGEWRAPPER__
-#define __SIGSCRIPT_BADGEWRAPPER__
+#ifndef SIGSCRIPT_BADGEWRAPPER
+#define SIGSCRIPT_BADGEWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/CoinListObjectWrapper.h b/sigscript/CoinListObjectWrapper.h
index 31bb915f..618cb9fd 100644
--- a/sigscript/CoinListObjectWrapper.h
+++ b/sigscript/CoinListObjectWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_COINLISTOBJECTWRAPPER__
-#define __SIGSCRIPT_COINLISTOBJECTWRAPPER__
+#ifndef SIGSCRIPT_COINLISTOBJECTWRAPPER
+#define SIGSCRIPT_COINLISTOBJECTWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/CoinListWrapper.h b/sigscript/CoinListWrapper.h
index 63c3712a..05a7fad6 100644
--- a/sigscript/CoinListWrapper.h
+++ b/sigscript/CoinListWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_COINLISTWRAPPER__
-#define __SIGSCRIPT_COINLISTWRAPPER__
+#ifndef SIGSCRIPT_COINLISTWRAPPER
+#define SIGSCRIPT_COINLISTWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/Config.h b/sigscript/Config.h
index d35c487b..064831fe 100644
--- a/sigscript/Config.h
+++ b/sigscript/Config.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_CONFIG__
-#define __SIGSCRIPT_CONFIG__
+#ifndef SIGSCRIPT_CONFIG
+#define SIGSCRIPT_CONFIG
 
 // Sigscript includes
 #include "Global.h"
diff --git a/sigscript/EggGroupWrapper.h b/sigscript/EggGroupWrapper.h
index 7511da3c..e7a6cd70 100644
--- a/sigscript/EggGroupWrapper.h
+++ b/sigscript/EggGroupWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_EGGGROUPWRAPPER__
-#define __SIGSCRIPT_EGGGROUPWRAPPER__
+#ifndef SIGSCRIPT_EGGGROUPWRAPPER
+#define SIGSCRIPT_EGGGROUPWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/Global.h b/sigscript/Global.h
index fcba2b30..9a84749a 100644
--- a/sigscript/Global.h
+++ b/sigscript/Global.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_GLOBAL__
-#define __SIGSCRIPT_GLOBAL__
+#ifndef SIGSCRIPT_GLOBAL
+#define SIGSCRIPT_GLOBAL
 
 // KDE includes
 #include <kdemacros.h>
diff --git a/sigscript/GlobalScriptWrapper.h b/sigscript/GlobalScriptWrapper.h
index 27a778ae..881e44d9 100644
--- a/sigscript/GlobalScriptWrapper.h
+++ b/sigscript/GlobalScriptWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_GLOBALSCRIPTWRAPPER__
-#define __SIGSCRIPT_GLOBALSCRIPTWRAPPER__
+#ifndef SIGSCRIPT_GLOBALSCRIPTWRAPPER
+#define SIGSCRIPT_GLOBALSCRIPTWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/ItemTypeWrapper.h b/sigscript/ItemTypeWrapper.h
index 8b608456..ad8ed75a 100644
--- a/sigscript/ItemTypeWrapper.h
+++ b/sigscript/ItemTypeWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_ITEMTYPEWRAPPER__
-#define __SIGSCRIPT_ITEMTYPEWRAPPER__
+#ifndef SIGSCRIPT_ITEMTYPEWRAPPER
+#define SIGSCRIPT_ITEMTYPEWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/ItemWrapper.h b/sigscript/ItemWrapper.h
index 45edf11d..99ef693e 100644
--- a/sigscript/ItemWrapper.h
+++ b/sigscript/ItemWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_ITEMWRAPPER__
-#define __SIGSCRIPT_ITEMWRAPPER__
+#ifndef SIGSCRIPT_ITEMWRAPPER
+#define SIGSCRIPT_ITEMWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MapEffectWrapper.h b/sigscript/MapEffectWrapper.h
index 206d0b0e..ae28385a 100644
--- a/sigscript/MapEffectWrapper.h
+++ b/sigscript/MapEffectWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MAPEFFECTWRAPPER__
-#define __SIGSCRIPT_MAPEFFECTWRAPPER__
+#ifndef SIGSCRIPT_MAPEFFECTWRAPPER
+#define SIGSCRIPT_MAPEFFECTWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MapTrainerTeamMemberWrapper.h b/sigscript/MapTrainerTeamMemberWrapper.h
index 58409ea8..f39259d5 100644
--- a/sigscript/MapTrainerTeamMemberWrapper.h
+++ b/sigscript/MapTrainerTeamMemberWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MAPTRAINERTEAMMEMBERWRAPPER__
-#define __SIGSCRIPT_MAPTRAINERTEAMMEMBERWRAPPER__
+#ifndef SIGSCRIPT_MAPTRAINERTEAMMEMBERWRAPPER
+#define SIGSCRIPT_MAPTRAINERTEAMMEMBERWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MapTrainerWrapper.h b/sigscript/MapTrainerWrapper.h
index 0c83843b..892309cf 100644
--- a/sigscript/MapTrainerWrapper.h
+++ b/sigscript/MapTrainerWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MAPTRAINERWRAPPER__
-#define __SIGSCRIPT_MAPTRAINERWRAPPER__
+#ifndef SIGSCRIPT_MAPTRAINERWRAPPER
+#define SIGSCRIPT_MAPTRAINERWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MapWarpWrapper.h b/sigscript/MapWarpWrapper.h
index 422ab073..6f6d2464 100644
--- a/sigscript/MapWarpWrapper.h
+++ b/sigscript/MapWarpWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MAPWARPWRAPPER__
-#define __SIGSCRIPT_MAPWARPWRAPPER__
+#ifndef SIGSCRIPT_MAPWARPWRAPPER
+#define SIGSCRIPT_MAPWARPWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MapWildListEncounterWrapper.h b/sigscript/MapWildListEncounterWrapper.h
index 6bb28ff7..bcb35978 100644
--- a/sigscript/MapWildListEncounterWrapper.h
+++ b/sigscript/MapWildListEncounterWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MAPWILDLISTENCOUNTERWRAPPER__
-#define __SIGSCRIPT_MAPWILDLISTENCOUNTERWRAPPER__
+#ifndef SIGSCRIPT_MAPWILDLISTENCOUNTERWRAPPER
+#define SIGSCRIPT_MAPWILDLISTENCOUNTERWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MapWildListWrapper.h b/sigscript/MapWildListWrapper.h
index 08707e03..a00e8e3c 100644
--- a/sigscript/MapWildListWrapper.h
+++ b/sigscript/MapWildListWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MAPWILDLISTWRAPPER__
-#define __SIGSCRIPT_MAPWILDLISTWRAPPER__
+#ifndef SIGSCRIPT_MAPWILDLISTWRAPPER
+#define SIGSCRIPT_MAPWILDLISTWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MapWrapper.h b/sigscript/MapWrapper.h
index e09520b2..28136f48 100644
--- a/sigscript/MapWrapper.h
+++ b/sigscript/MapWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MAPWRAPPER__
-#define __SIGSCRIPT_MAPWRAPPER__
+#ifndef SIGSCRIPT_MAPWRAPPER
+#define SIGSCRIPT_MAPWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/MoveWrapper.h b/sigscript/MoveWrapper.h
index 8b6d1842..521bd26b 100644
--- a/sigscript/MoveWrapper.h
+++ b/sigscript/MoveWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_MOVEWRAPPER__
-#define __SIGSCRIPT_MOVEWRAPPER__
+#ifndef SIGSCRIPT_MOVEWRAPPER
+#define SIGSCRIPT_MOVEWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/NatureWrapper.h b/sigscript/NatureWrapper.h
index c4b55272..239d7159 100644
--- a/sigscript/NatureWrapper.h
+++ b/sigscript/NatureWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_NATUREWRAPPER__
-#define __SIGSCRIPT_NATUREWRAPPER__
+#ifndef SIGSCRIPT_NATUREWRAPPER
+#define SIGSCRIPT_NATUREWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/ObjectWrapper.h b/sigscript/ObjectWrapper.h
index 91486581..1f1bc5c8 100644
--- a/sigscript/ObjectWrapper.h
+++ b/sigscript/ObjectWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_OBJECTWRAPPER__
-#define __SIGSCRIPT_OBJECTWRAPPER__
+#ifndef SIGSCRIPT_OBJECTWRAPPER
+#define SIGSCRIPT_OBJECTWRAPPER
 
 // Sigscript includes
 #include "Config.h"
diff --git a/sigscript/RulesWrapper.h b/sigscript/RulesWrapper.h
index b5aeaad8..45383ee6 100644
--- a/sigscript/RulesWrapper.h
+++ b/sigscript/RulesWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_RULESWRAPPER__
-#define __SIGSCRIPT_RULESWRAPPER__
+#ifndef SIGSCRIPT_RULESWRAPPER
+#define SIGSCRIPT_RULESWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/SigmodWrapper.h b/sigscript/SigmodWrapper.h
index 1e946ac0..1d9093b5 100644
--- a/sigscript/SigmodWrapper.h
+++ b/sigscript/SigmodWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SIGMODWRAPPER__
-#define __SIGSCRIPT_SIGMODWRAPPER__
+#ifndef SIGSCRIPT_SIGMODWRAPPER
+#define SIGSCRIPT_SIGMODWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/SkinWrapper.h b/sigscript/SkinWrapper.h
index 75ee337e..ca3b1315 100644
--- a/sigscript/SkinWrapper.h
+++ b/sigscript/SkinWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SKINWRAPPER__
-#define __SIGSCRIPT_SKINWRAPPER__
+#ifndef SIGSCRIPT_SKINWRAPPER
+#define SIGSCRIPT_SKINWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/SoundWrapper.h b/sigscript/SoundWrapper.h
index a225f728..92594405 100644
--- a/sigscript/SoundWrapper.h
+++ b/sigscript/SoundWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SOUNDWRAPPER__
-#define __SIGSCRIPT_SOUNDWRAPPER__
+#ifndef SIGSCRIPT_SOUNDWRAPPER
+#define SIGSCRIPT_SOUNDWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/SpeciesAbilityWrapper.h b/sigscript/SpeciesAbilityWrapper.h
index b51980cc..4e3b2cad 100644
--- a/sigscript/SpeciesAbilityWrapper.h
+++ b/sigscript/SpeciesAbilityWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SPECIESABILITYWRAPPER__
-#define __SIGSCRIPT_SPECIESABILITYWRAPPER__
+#ifndef SIGSCRIPT_SPECIESABILITYWRAPPER
+#define SIGSCRIPT_SPECIESABILITYWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/SpeciesItemWrapper.h b/sigscript/SpeciesItemWrapper.h
index a02a6d3c..6412175c 100644
--- a/sigscript/SpeciesItemWrapper.h
+++ b/sigscript/SpeciesItemWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SPECIESITEMWRAPPER__
-#define __SIGSCRIPT_SPECIESITEMWRAPPER__
+#ifndef SIGSCRIPT_SPECIESITEMWRAPPER
+#define SIGSCRIPT_SPECIESITEMWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/SpeciesMoveWrapper.h b/sigscript/SpeciesMoveWrapper.h
index bfc91613..c5ab76b5 100644
--- a/sigscript/SpeciesMoveWrapper.h
+++ b/sigscript/SpeciesMoveWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SPECIESMOVEWRAPPER__
-#define __SIGSCRIPT_SPECIESMOVEWRAPPER__
+#ifndef SIGSCRIPT_SPECIESMOVEWRAPPER
+#define SIGSCRIPT_SPECIESMOVEWRAPPER
 
 // Sigscript includes
 #include "MoveWrapper.h"
diff --git a/sigscript/SpeciesWrapper.h b/sigscript/SpeciesWrapper.h
index ec157266..54e4203b 100644
--- a/sigscript/SpeciesWrapper.h
+++ b/sigscript/SpeciesWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SPECIESWRAPPER__
-#define __SIGSCRIPT_SPECIESWRAPPER__
+#ifndef SIGSCRIPT_SPECIESWRAPPER
+#define SIGSCRIPT_SPECIESWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/SpriteWrapper.h b/sigscript/SpriteWrapper.h
index 0b58c066..5d35563b 100644
--- a/sigscript/SpriteWrapper.h
+++ b/sigscript/SpriteWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_SPRITEWRAPPER__
-#define __SIGSCRIPT_SPRITEWRAPPER__
+#ifndef SIGSCRIPT_SPRITEWRAPPER
+#define SIGSCRIPT_SPRITEWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/StatusWrapper.h b/sigscript/StatusWrapper.h
index ef8bb2e8..512e1a26 100644
--- a/sigscript/StatusWrapper.h
+++ b/sigscript/StatusWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_STATUSWRAPPER__
-#define __SIGSCRIPT_STATUSWRAPPER__
+#ifndef SIGSCRIPT_STATUSWRAPPER
+#define SIGSCRIPT_STATUSWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/StoreWrapper.h b/sigscript/StoreWrapper.h
index 4938fb51..eeb312b4 100644
--- a/sigscript/StoreWrapper.h
+++ b/sigscript/StoreWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_STOREWRAPPER__
-#define __SIGSCRIPT_STOREWRAPPER__
+#ifndef SIGSCRIPT_STOREWRAPPER
+#define SIGSCRIPT_STOREWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/TileWrapper.h b/sigscript/TileWrapper.h
index b75352e9..2cc500cc 100644
--- a/sigscript/TileWrapper.h
+++ b/sigscript/TileWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_TILEWRAPPER__
-#define __SIGSCRIPT_TILEWRAPPER__
+#ifndef SIGSCRIPT_TILEWRAPPER
+#define SIGSCRIPT_TILEWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/TimeWrapper.h b/sigscript/TimeWrapper.h
index 23835653..33a159a5 100644
--- a/sigscript/TimeWrapper.h
+++ b/sigscript/TimeWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_TIMEWRAPPER__
-#define __SIGSCRIPT_TIMEWRAPPER__
+#ifndef SIGSCRIPT_TIMEWRAPPER
+#define SIGSCRIPT_TIMEWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/TrainerWrapper.h b/sigscript/TrainerWrapper.h
index 96894f67..5e0b7662 100644
--- a/sigscript/TrainerWrapper.h
+++ b/sigscript/TrainerWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_TRAINERWRAPPER__
-#define __SIGSCRIPT_TRAINERWRAPPER__
+#ifndef SIGSCRIPT_TRAINERWRAPPER
+#define SIGSCRIPT_TRAINERWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/TypeWrapper.h b/sigscript/TypeWrapper.h
index 57a62bcd..370eaa89 100644
--- a/sigscript/TypeWrapper.h
+++ b/sigscript/TypeWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_TYPEWRAPPER__
-#define __SIGSCRIPT_TYPEWRAPPER__
+#ifndef SIGSCRIPT_TYPEWRAPPER
+#define SIGSCRIPT_TYPEWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"
diff --git a/sigscript/WeatherWrapper.h b/sigscript/WeatherWrapper.h
index 97b683f9..89a22126 100644
--- a/sigscript/WeatherWrapper.h
+++ b/sigscript/WeatherWrapper.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGSCRIPT_WEATHERWRAPPER__
-#define __SIGSCRIPT_WEATHERWRAPPER__
+#ifndef SIGSCRIPT_WEATHERWRAPPER
+#define SIGSCRIPT_WEATHERWRAPPER
 
 // Sigscript includes
 #include "ObjectWrapper.h"