diff --git a/std/armour.c b/std/armour.c
index 03546b0..cdb28fb 100644
--- a/std/armour.c
+++ b/std/armour.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma no_clone
 #pragma range_check
-#pragma pedantic
 
 inherit "/std/thing/properties";
 inherit "/std/thing/commands";
diff --git a/std/armour/combat.c b/std/armour/combat.c
index e688131..59d3fdd 100644
--- a/std/armour/combat.c
+++ b/std/armour/combat.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 #define NEED_PROTOTYPES
diff --git a/std/armour/container_description.c b/std/armour/container_description.c
index b1e73ad..23450a7 100644
--- a/std/armour/container_description.c
+++ b/std/armour/container_description.c
@@ -6,7 +6,6 @@
 
 #pragma strict_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/armour/description.c b/std/armour/description.c
index 2e26294..bd740e7 100644
--- a/std/armour/description.c
+++ b/std/armour/description.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/clothing/description";
diff --git a/std/armour/moving.c b/std/armour/moving.c
index de598a8..a44a1cd 100644
--- a/std/armour/moving.c
+++ b/std/armour/moving.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 // Dies muss eigentlich nix ueber clothing/moving hinausgehendes koennen.
diff --git a/std/armour/wear.c b/std/armour/wear.c
index fef87c5..a870bd1 100644
--- a/std/armour/wear.c
+++ b/std/armour/wear.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/clothing/wear";
diff --git a/std/armourHG.c b/std/armourHG.c
index 352e75c..0aad15b 100644
--- a/std/armourHG.c
+++ b/std/armourHG.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/armour";
diff --git a/std/armour_container.c b/std/armour_container.c
index bc45280..f127bb0 100644
--- a/std/armour_container.c
+++ b/std/armour_container.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/properties";
diff --git a/std/clothing.c b/std/clothing.c
index 2486111..8209ea0 100644
--- a/std/clothing.c
+++ b/std/clothing.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma no_clone
 #pragma range_check
-#pragma pedantic
 
 inherit "/std/thing/properties";
 inherit "/std/thing/commands";
diff --git a/std/clothing/container_description.c b/std/clothing/container_description.c
index f7942bc..ca0d9c6 100644
--- a/std/clothing/container_description.c
+++ b/std/clothing/container_description.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/description";
diff --git a/std/clothing/description.c b/std/clothing/description.c
index fa226fd..484eb15 100644
--- a/std/clothing/description.c
+++ b/std/clothing/description.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 #pragma warn_empty_casts
 
diff --git a/std/clothing/moving.c b/std/clothing/moving.c
index ba2e05f..1c103b5 100644
--- a/std/clothing/moving.c
+++ b/std/clothing/moving.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/moving";
diff --git a/std/clothing/wear.c b/std/clothing/wear.c
index bb189e8..1555b4e 100644
--- a/std/clothing/wear.c
+++ b/std/clothing/wear.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 #define NEED_PROTOTYPES
diff --git a/std/clothingHG.c b/std/clothingHG.c
index fbd265a..314e8e0 100644
--- a/std/clothingHG.c
+++ b/std/clothingHG.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/clothing";
diff --git a/std/clothing_container.c b/std/clothing_container.c
index 995e675..91572b7 100644
--- a/std/clothing_container.c
+++ b/std/clothing_container.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/properties";
diff --git a/std/container.c b/std/container.c
index a39beee..9b09c9c 100644
--- a/std/container.c
+++ b/std/container.c
@@ -15,7 +15,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/properties";
diff --git a/std/container/description.c b/std/container/description.c
index ef36d49..1de834e 100644
--- a/std/container/description.c
+++ b/std/container/description.c
@@ -10,7 +10,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/container/inventory.c b/std/container/inventory.c
index 0a057b7..5b6e257 100644
--- a/std/container/inventory.c
+++ b/std/container/inventory.c
@@ -8,7 +8,6 @@
 #pragma save_types
 //#pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/container/items.c b/std/container/items.c
index 282ebcc..d25aa0b 100644
--- a/std/container/items.c
+++ b/std/container/items.c
@@ -27,7 +27,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/container/light.c b/std/container/light.c
index 7de4c43..d0e2e4c 100644
--- a/std/container/light.c
+++ b/std/container/light.c
@@ -10,7 +10,6 @@
 #pragma save_types,rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/container/moneyhandler.c b/std/container/moneyhandler.c
index ae25453..cc075ab 100644
--- a/std/container/moneyhandler.c
+++ b/std/container/moneyhandler.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/container/restrictions.c b/std/container/restrictions.c
index 294d7a7..30b8df1 100644
--- a/std/container/restrictions.c
+++ b/std/container/restrictions.c
@@ -25,7 +25,6 @@
 #pragma save_types
 //#pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/container/vitems.c b/std/container/vitems.c
index fbee29b..ad86d52 100644
--- a/std/container/vitems.c
+++ b/std/container/vitems.c
@@ -2,7 +2,7 @@
 //
 // container/vitems.c -- managing virtually present automatic items
 //
-#pragma strict_types,rtt_checks, range_check, pedantic
+#pragma strict_types,rtt_checks, range_check
 #pragma no_clone
 
 #include <properties.h>
diff --git a/std/corpse.c b/std/corpse.c
index c611af0..5025ad8 100644
--- a/std/corpse.c
+++ b/std/corpse.c
@@ -17,7 +17,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma range_check
-#pragma pedantic
 
 //#define NEED_PROTOTYPES
 
diff --git a/std/def_workroom.c b/std/def_workroom.c
index db29608..a06a81e 100644
--- a/std/def_workroom.c
+++ b/std/def_workroom.c
@@ -5,7 +5,7 @@
 // $Id: def_workroom.c 7423 2010-02-07 22:56:38Z Zesstra $
 
 #pragma strong_types,save_types,rtt_checks
-#pragma pedantic, range_check
+#pragma range_check
 
 inherit "/std/room";
 
diff --git a/std/food.c b/std/food.c
index c7198ef..c2220b3 100644
--- a/std/food.c
+++ b/std/food.c
@@ -5,7 +5,7 @@
 // $Id: food.c 8248 2012-11-23 21:28:04Z Zesstra $
 #pragma strict_types,save_types,rtt_checks
 #pragma no_clone
-#pragma pedantic,range_check
+#pragma range_check
 
 inherit "/std/thing";
 
diff --git a/std/gilde.c b/std/gilde.c
index de82122..f195a82 100644
--- a/std/gilde.c
+++ b/std/gilde.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/room";
 inherit "/std/room/gilde";
diff --git a/std/gilden_ob.c b/std/gilden_ob.c
index 6805acc..51a4b88 100644
--- a/std/gilden_ob.c
+++ b/std/gilden_ob.c
@@ -8,7 +8,6 @@
 #pragma no_shadow
 #pragma no_clone
 #pragma range_check
-#pragma pedantic
 
 inherit "/std/restriction_checker";
 #include <properties.h>
diff --git a/std/gilden_room.c b/std/gilden_room.c
index 763de59..efea6e1 100644
--- a/std/gilden_room.c
+++ b/std/gilden_room.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 // #define NEED_PROTOTYPES
 inherit "/std/gilde";
diff --git a/std/hook_consumer.c b/std/hook_consumer.c
index 1da03b3..3674ebb 100644
--- a/std/hook_consumer.c
+++ b/std/hook_consumer.c
@@ -7,7 +7,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 #include <hook.h>
diff --git a/std/hook_provider.c b/std/hook_provider.c
index 321ea8a..46b015d 100644
--- a/std/hook_provider.c
+++ b/std/hook_provider.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma no_clone
 #pragma range_check
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <hook.h>
diff --git a/std/hook_surveyor.c b/std/hook_surveyor.c
index bafb193..d9806ee 100644
--- a/std/hook_surveyor.c
+++ b/std/hook_surveyor.c
@@ -6,7 +6,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 #include <hook.h>
diff --git a/std/inpc.c b/std/inpc.c
index f748969..82468e6 100644
--- a/std/inpc.c
+++ b/std/inpc.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/npc";
 inherit "/std/inpc/nobank";
diff --git a/std/inpc/boozing.c b/std/inpc/boozing.c
index 4f24f52..854e457 100644
--- a/std/inpc/boozing.c
+++ b/std/inpc/boozing.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing.h>
diff --git a/std/inpc/eval.c b/std/inpc/eval.c
index f755576..24e1337 100644
--- a/std/inpc/eval.c
+++ b/std/inpc/eval.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/inpc/items.c b/std/inpc/items.c
index fafdd04..0b9e586 100644
--- a/std/inpc/items.c
+++ b/std/inpc/items.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/inpc/nobank.c b/std/inpc/nobank.c
index 6f04aef..19b3ee4 100644
--- a/std/inpc/nobank.c
+++ b/std/inpc/nobank.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/moneyhandler";
 
diff --git a/std/inpc/select.c b/std/inpc/select.c
index d73ebed..8607682 100644
--- a/std/inpc/select.c
+++ b/std/inpc/select.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/inpc/walking.c b/std/inpc/walking.c
index f24aae6..1fe19a4 100644
--- a/std/inpc/walking.c
+++ b/std/inpc/walking.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/lightsource.c b/std/lightsource.c
index d2ff3aa..37828b7 100644
--- a/std/lightsource.c
+++ b/std/lightsource.c
@@ -33,7 +33,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "std/thing" ;
diff --git a/std/living/attributes.c b/std/living/attributes.c
index 90027a4..e1d88fc 100644
--- a/std/living/attributes.c
+++ b/std/living/attributes.c
@@ -26,7 +26,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/living/clothing.c b/std/living/clothing.c
index 56aff44..aa11d99 100644
--- a/std/living/clothing.c
+++ b/std/living/clothing.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/living/combat.c b/std/living/combat.c
index 8f547a6..053691a 100644
--- a/std/living/combat.c
+++ b/std/living/combat.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/skill_utils";
 inherit "/std/living/inventory";
diff --git a/std/living/comm.c b/std/living/comm.c
index 6001ffd..c893e2d 100644
--- a/std/living/comm.c
+++ b/std/living/comm.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types,save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 #include <defines.h>
diff --git a/std/living/description.c b/std/living/description.c
index 4802a1b..113f3c4 100644
--- a/std/living/description.c
+++ b/std/living/description.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/container/description";
 
diff --git a/std/living/helpers.c b/std/living/helpers.c
index e029827..91c480f 100644
--- a/std/living/helpers.c
+++ b/std/living/helpers.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <living/helpers.h>
 #define NEED_PROTOTYPES
diff --git a/std/living/inventory.c b/std/living/inventory.c
index e3027e4..6c897fa 100644
--- a/std/living/inventory.c
+++ b/std/living/inventory.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/container/inventory";
 
diff --git a/std/living/life.c b/std/living/life.c
index 2d86bb5..d868cdd 100644
--- a/std/living/life.c
+++ b/std/living/life.c
@@ -20,7 +20,6 @@
 #pragma strong_types,save_types,rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <hook.h>
diff --git a/std/living/light.c b/std/living/light.c
index 9f1b104..90c3aef 100644
--- a/std/living/light.c
+++ b/std/living/light.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <living/description.h>
diff --git a/std/living/moneyhandler.c b/std/living/moneyhandler.c
index 7a22226..b7f37e6 100644
--- a/std/living/moneyhandler.c
+++ b/std/living/moneyhandler.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/container/moneyhandler";
 
diff --git a/std/living/moving.c b/std/living/moving.c
index c6149ff..b05262c 100644
--- a/std/living/moving.c
+++ b/std/living/moving.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/thing/moving";
 
diff --git a/std/living/put_and_get.c b/std/living/put_and_get.c
index d290f31..936fad0 100644
--- a/std/living/put_and_get.c
+++ b/std/living/put_and_get.c
@@ -92,7 +92,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <language.h>
diff --git a/std/living/skill_attributes.c b/std/living/skill_attributes.c
index ad90aa0..c88b4f4 100644
--- a/std/living/skill_attributes.c
+++ b/std/living/skill_attributes.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/util/executer";
 
diff --git a/std/living/skill_utils.c b/std/living/skill_utils.c
index 24caf75..3365ed0 100644
--- a/std/living/skill_utils.c
+++ b/std/living/skill_utils.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <new_skills.h>
 
diff --git a/std/living/skills.c b/std/living/skills.c
index 93c9dcc..b9b7bfe 100644
--- a/std/living/skills.c
+++ b/std/living/skills.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/std_skills";
 
diff --git a/std/living/std_skills.c b/std/living/std_skills.c
index d132efc..cc65d0d 100644
--- a/std/living/std_skills.c
+++ b/std/living/std_skills.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <living/skills.h>
diff --git a/std/living/team.c b/std/living/team.c
index 2b31db9..a14e535 100644
--- a/std/living/team.c
+++ b/std/living/team.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/more.c b/std/more.c
index 8518981..e2cf039 100644
--- a/std/more.c
+++ b/std/more.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/util/pager";
diff --git a/std/newsclient.c b/std/newsclient.c
index 8dc359f..eac517e 100644
--- a/std/newsclient.c
+++ b/std/newsclient.c
@@ -9,7 +9,6 @@
 #pragma save_types
 #pragma no_clone
 #pragma range_check
-#pragma pedantic
 
 inherit "/std/thing";
 inherit "/std/more";
diff --git a/std/npc.c b/std/npc.c
index 5cb7fcf..8ec29f4 100644
--- a/std/npc.c
+++ b/std/npc.c
@@ -10,7 +10,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/thing/properties";
 inherit "/std/hook_provider";
diff --git a/std/npc/chat.c b/std/npc/chat.c
index 59f7006..ff6990e 100644
--- a/std/npc/chat.c
+++ b/std/npc/chat.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <properties.h>
 #define NEED_PROTOTYPES
diff --git a/std/npc/combat.c b/std/npc/combat.c
index d4b9448..99f30a0 100644
--- a/std/npc/combat.c
+++ b/std/npc/combat.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "std/living/combat";
 
diff --git a/std/npc/comm.c b/std/npc/comm.c
index 892d8fa..c1b13af 100644
--- a/std/npc/comm.c
+++ b/std/npc/comm.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/comm";
 
diff --git a/std/npc/info.c b/std/npc/info.c
index e7b8325..c66d71a 100644
--- a/std/npc/info.c
+++ b/std/npc/info.c
@@ -48,7 +48,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/description.h>
diff --git a/std/npc/items.c b/std/npc/items.c
index c879768..c49771c 100644
--- a/std/npc/items.c
+++ b/std/npc/items.c
@@ -9,7 +9,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/npc/moving.c b/std/npc/moving.c
index f06e0da..ac62e96 100644
--- a/std/npc/moving.c
+++ b/std/npc/moving.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/moving";
 
diff --git a/std/npc/put_and_get.c b/std/npc/put_and_get.c
index 8b72cf4..416c4c5 100644
--- a/std/npc/put_and_get.c
+++ b/std/npc/put_and_get.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "std/living/put_and_get";
 #include <moving.h>
diff --git a/std/pile.c b/std/pile.c
index c201548..4f58d50 100644
--- a/std/pile.c
+++ b/std/pile.c
@@ -5,7 +5,6 @@
 
 #pragma strict_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 
 inherit "std/container";
diff --git a/std/player/base.c b/std/player/base.c
index 63cdfe0..abcfa79 100644
--- a/std/player/base.c
+++ b/std/player/base.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <sys_debug.h>
 #include <regexp.h>
diff --git a/std/player/channel.c b/std/player/channel.c
index 58ee739..6784d50 100644
--- a/std/player/channel.c
+++ b/std/player/channel.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-//#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <util.h>
diff --git a/std/player/combat.c b/std/player/combat.c
index 64d945c..c81a508 100644
--- a/std/player/combat.c
+++ b/std/player/combat.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/combat";
 inherit "/std/player/pklog";
diff --git a/std/player/comm.c b/std/player/comm.c
index bdf7f40..560c64a 100644
--- a/std/player/comm.c
+++ b/std/player/comm.c
@@ -6,7 +6,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 //#pragma range_check
 
 inherit "/std/living/comm";
diff --git a/std/player/comm_structs.c b/std/player/comm_structs.c
index 5f268eb..dcb38da 100644
--- a/std/player/comm_structs.c
+++ b/std/player/comm_structs.c
@@ -7,7 +7,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 struct msg_s {
diff --git a/std/player/command.c b/std/player/command.c
index 0abad0f..5bde2b2 100644
--- a/std/player/command.c
+++ b/std/player/command.c
@@ -7,7 +7,6 @@
 #pragma save_types
 //#pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <player/command.h>
diff --git a/std/player/description.c b/std/player/description.c
index 914898f..acd4200 100644
--- a/std/player/description.c
+++ b/std/player/description.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/description";
 
diff --git a/std/player/exploration.c b/std/player/exploration.c
index 8a1976e..3990e54 100644
--- a/std/player/exploration.c
+++ b/std/player/exploration.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <player/life.h>
diff --git a/std/player/guide.c b/std/player/guide.c
index 6c329b5..f4ef332 100644
--- a/std/player/guide.c
+++ b/std/player/guide.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <config.h>
 #include <wizlevels.h>
diff --git a/std/player/invmaster/invmaster.c b/std/player/invmaster/invmaster.c
index e75f1f6..49c3c38 100644
--- a/std/player/invmaster/invmaster.c
+++ b/std/player/invmaster/invmaster.c
@@ -5,7 +5,6 @@
 #pragma save_types,rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <input_to.h>
 #include <properties.h>
diff --git a/std/player/life.c b/std/player/life.c
index 93250fc..e62b015 100644
--- a/std/player/life.c
+++ b/std/player/life.c
@@ -13,7 +13,6 @@
 #pragma strong_types, save_types, rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/life";
 
diff --git a/std/player/moneyhandler.c b/std/player/moneyhandler.c
index 86a17db..e22705d 100644
--- a/std/player/moneyhandler.c
+++ b/std/player/moneyhandler.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/container/moneyhandler";
 
diff --git a/std/player/moving.c b/std/player/moving.c
index c669a2e..020cfdc 100644
--- a/std/player/moving.c
+++ b/std/player/moving.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "std/living/moving";
 
diff --git a/std/player/pklog.c b/std/player/pklog.c
index 4613ebe..fe394ae 100644
--- a/std/player/pklog.c
+++ b/std/player/pklog.c
@@ -11,7 +11,6 @@
 #pragma save_types
 #pragma no_clone
 #pragma no_shadow
-#pragma pedantic
 #pragma range_check
 
 #include <defines.h>
diff --git a/std/player/protocols/gmcp.c b/std/player/protocols/gmcp.c
index 3731514..c9925f9 100644
--- a/std/player/protocols/gmcp.c
+++ b/std/player/protocols/gmcp.c
@@ -8,7 +8,6 @@
 #pragma range_check
 #pragma no_clone
 #pragma no_shadow
-#pragma pedantic
 
 #include <regexp.h>
 #include <telnet.h>
diff --git a/std/player/quests.c b/std/player/quests.c
index aae566d..5b299db 100644
--- a/std/player/quests.c
+++ b/std/player/quests.c
@@ -9,7 +9,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <player/life.h>
diff --git a/std/player/reputation.c b/std/player/reputation.c
index 9fb3d17..792c386 100644
--- a/std/player/reputation.c
+++ b/std/player/reputation.c
@@ -2,7 +2,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <wizlevels.h>
 #include <reputation.h>
diff --git a/std/player/restrictions.c b/std/player/restrictions.c
index 9f6c095..dc00415 100644
--- a/std/player/restrictions.c
+++ b/std/player/restrictions.c
@@ -24,7 +24,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/container/restrictions";
 
diff --git a/std/player/skills.c b/std/player/skills.c
index 03755da..fa60d1d 100644
--- a/std/player/skills.c
+++ b/std/player/skills.c
@@ -11,7 +11,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/living/skills";
 
diff --git a/std/player/soul.c b/std/player/soul.c
index 08e8af5..244af9e 100644
--- a/std/player/soul.c
+++ b/std/player/soul.c
@@ -119,7 +119,6 @@
 #pragma save_types
 //#pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define SOULHELP "/std/player/soulhelp"
 #define LF "\n"
diff --git a/std/player/travel.c b/std/player/travel.c
index cb297fd..1b41d59 100644
--- a/std/player/travel.c
+++ b/std/player/travel.c
@@ -10,7 +10,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <player.h>
diff --git a/std/player/util.c b/std/player/util.c
index a6c8fa9..0d7ca18 100644
--- a/std/player/util.c
+++ b/std/player/util.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/player/viewcmd.c b/std/player/viewcmd.c
index 5c03ccc..d6383f4 100644
--- a/std/player/viewcmd.c
+++ b/std/player/viewcmd.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 //#include <player.h>
 #include <properties.h>
diff --git a/std/player/vitems.c b/std/player/vitems.c
index 88c5e9b..7c35013 100644
--- a/std/player/vitems.c
+++ b/std/player/vitems.c
@@ -2,7 +2,7 @@
 //
 // player/vitems.c -- no vitems for players
 //
-#pragma strict_types,rtt_checks, range_check, pedantic
+#pragma strict_types,rtt_checks, range_check
 #pragma no_clone
 
 protected object *GetVItemClones()
diff --git a/std/post.c b/std/post.c
index d0dbbb1..cb2fdd3 100644
--- a/std/post.c
+++ b/std/post.c
@@ -5,7 +5,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/room";
 
diff --git a/std/pub.c b/std/pub.c
index 53b019a..07fa69b 100644
--- a/std/pub.c
+++ b/std/pub.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/room";
 inherit "/std/room/pub";
diff --git a/std/ranged_weapon.c b/std/ranged_weapon.c
index 5578483..ec6f189 100644
--- a/std/ranged_weapon.c
+++ b/std/ranged_weapon.c
@@ -11,7 +11,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/living/skill_utils";
diff --git a/std/restriction_checker.c b/std/restriction_checker.c
index a88f630..51654d1 100644
--- a/std/restriction_checker.c
+++ b/std/restriction_checker.c
@@ -6,7 +6,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 //#pragma range_check
 #pragma no_shadow
 
diff --git a/std/room.c b/std/room.c
index 718528a..65332ce 100644
--- a/std/room.c
+++ b/std/room.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/thing/properties";
 inherit "/std/thing/language";
diff --git a/std/room/commands.c b/std/room/commands.c
index bb4a293..ca43efe 100644
--- a/std/room/commands.c
+++ b/std/room/commands.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/description.c b/std/room/description.c
index 6738e29..b09fdfa 100644
--- a/std/room/description.c
+++ b/std/room/description.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/doors.c b/std/room/doors.c
index d9eded0..a9bab7d 100644
--- a/std/room/doors.c
+++ b/std/room/doors.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/exits.c b/std/room/exits.c
index d0ead0b..20253bc 100644
--- a/std/room/exits.c
+++ b/std/room/exits.c
@@ -17,7 +17,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/gilde.c b/std/room/gilde.c
index a153b96..3086fe1 100644
--- a/std/room/gilde.c
+++ b/std/room/gilde.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <properties.h>
 #include <defines.h>
diff --git a/std/room/items.c b/std/room/items.c
index 1d4005a..f799570 100644
--- a/std/room/items.c
+++ b/std/room/items.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/light.c b/std/room/light.c
index a372047..80c80c6 100644
--- a/std/room/light.c
+++ b/std/room/light.c
@@ -10,7 +10,6 @@
 #pragma save_types,rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/room/moving.c b/std/room/moving.c
index 0f7c2b1..9a10f2f 100644
--- a/std/room/moving.c
+++ b/std/room/moving.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/para.c b/std/room/para.c
index 4666782..e2b7762 100644
--- a/std/room/para.c
+++ b/std/room/para.c
@@ -11,7 +11,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/pub.c b/std/room/pub.c
index d5789ab..b331452 100644
--- a/std/room/pub.c
+++ b/std/room/pub.c
@@ -5,7 +5,6 @@
 // spendiere ueberarbeitet, 22.05.2007 - Miril
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/restrictions.c b/std/room/restrictions.c
index aa50c9e..c5bd65f 100644
--- a/std/room/restrictions.c
+++ b/std/room/restrictions.c
@@ -7,7 +7,6 @@
 inherit "std/container/restrictions";
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/room/shop.c b/std/room/shop.c
index 504c72d..c1681d5 100644
--- a/std/room/shop.c
+++ b/std/room/shop.c
@@ -1,6 +1,5 @@
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/secure_thing.c b/std/secure_thing.c
index 7219529..805c7df 100644
--- a/std/secure_thing.c
+++ b/std/secure_thing.c
@@ -13,7 +13,6 @@
 #pragma no_clone
 #pragma no_shadow
 #pragma range_check
-#pragma pedantic
 
 inherit "/std/thing";
 #include <properties.h>
diff --git a/std/shells/magier/admin.c b/std/shells/magier/admin.c
index a41d1b7..7e86dc9 100644
--- a/std/shells/magier/admin.c
+++ b/std/shells/magier/admin.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <udp.h>
 #include <wizlevels.h>
diff --git a/std/shells/magier/comm.c b/std/shells/magier/comm.c
index 0cbd266..5263979 100644
--- a/std/shells/magier/comm.c
+++ b/std/shells/magier/comm.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <wizlevels.h>
 #include <magier.h>
diff --git a/std/shells/magier/fileedit.c b/std/shells/magier/fileedit.c
index d34b3be..b558585 100644
--- a/std/shells/magier/fileedit.c
+++ b/std/shells/magier/fileedit.c
@@ -7,7 +7,6 @@
 #pragma save_types
 //#pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 protected functions virtual inherit "/std/util/path";
 
diff --git a/std/shells/magier/fileview.c b/std/shells/magier/fileview.c
index becc162..f96d6e3 100644
--- a/std/shells/magier/fileview.c
+++ b/std/shells/magier/fileview.c
@@ -4,7 +4,7 @@
 //
 // $Id: fileview.c 9142 2015-02-04 22:17:29Z Zesstra $
 #pragma strict_types, rtt_checks
-#pragma range_check, pedantic
+#pragma range_check
 #pragma no_clone
 
 #include <ansi.h>
diff --git a/std/shells/magier/magier_ext.c b/std/shells/magier/magier_ext.c
index e563ca9..9660015 100644
--- a/std/shells/magier/magier_ext.c
+++ b/std/shells/magier/magier_ext.c
@@ -3,7 +3,6 @@
 #pragma save_types
 //#pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 protected functions virtual inherit "/std/util/path";
 
diff --git a/std/shells/magier/moving.c b/std/shells/magier/moving.c
index 0f15b98..4d99b32 100644
--- a/std/shells/magier/moving.c
+++ b/std/shells/magier/moving.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 protected functions virtual inherit "/std/util/path";
 
diff --git a/std/shells/magier/objects.c b/std/shells/magier/objects.c
index 57462f1..1968de6 100644
--- a/std/shells/magier/objects.c
+++ b/std/shells/magier/objects.c
@@ -3,7 +3,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <wizlevels.h>
 #include <moving.h>
diff --git a/std/shells/magier/parsing.c b/std/shells/magier/parsing.c
index 074aaa2..d719550 100644
--- a/std/shells/magier/parsing.c
+++ b/std/shells/magier/parsing.c
@@ -1,6 +1,6 @@
 // $Id: parsing.c 9142 2015-02-04 22:17:29Z Zesstra $
 #pragma strict_types, rtt_checks
-#pragma range_check, pedantic
+#pragma range_check
 #pragma no_clone
 
 protected functions virtual inherit "/std/util/path";
diff --git a/std/shells/magier/players.c b/std/shells/magier/players.c
index a7fe63a..a3fb249 100644
--- a/std/shells/magier/players.c
+++ b/std/shells/magier/players.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <wizlevels.h>
 #include <ansi.h>
diff --git a/std/shells/magier/todo.c b/std/shells/magier/todo.c
index f4120e7..c87d17d 100644
--- a/std/shells/magier/todo.c
+++ b/std/shells/magier/todo.c
@@ -3,7 +3,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <wizlevels.h>
 #include <defines.h>
diff --git a/std/shells/magier/upd.c b/std/shells/magier/upd.c
index 9c9af5f..cd86d33 100644
--- a/std/shells/magier/upd.c
+++ b/std/shells/magier/upd.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <magier.h>
diff --git a/std/shop.c b/std/shop.c
index d4cf690..5321a41 100644
--- a/std/shop.c
+++ b/std/shop.c
@@ -2,7 +2,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/room";
 inherit "/std/room/shop";
diff --git a/std/spellbook.c b/std/spellbook.c
index c67c114..5c835f1 100644
--- a/std/spellbook.c
+++ b/std/spellbook.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma no_shadow
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 //#define NEED_PROTOTYPES
diff --git a/std/store.c b/std/store.c
index 51625f2..a1dc82a 100644
--- a/std/store.c
+++ b/std/store.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define ANZ 3
 #include <properties.h>
diff --git a/std/thing.c b/std/thing.c
index eb197f3..ada73fb 100644
--- a/std/thing.c
+++ b/std/thing.c
@@ -6,7 +6,6 @@
 
 #pragma strict_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 //#pragma no_clone
 
diff --git a/std/thing/commands.c b/std/thing/commands.c
index 72f50cd..5bfa386 100644
--- a/std/thing/commands.c
+++ b/std/thing/commands.c
@@ -38,7 +38,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <moving.h>
 #include <thing/language.h>
diff --git a/std/thing/description.c b/std/thing/description.c
index 5f760fb..15d6afc 100644
--- a/std/thing/description.c
+++ b/std/thing/description.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <tls.h>
 #include <thing/description.h>
diff --git a/std/thing/envchk.c b/std/thing/envchk.c
index 3c63dff..9fef94f 100644
--- a/std/thing/envchk.c
+++ b/std/thing/envchk.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <moving.h>
 #define NEED_PROTOTYPES
diff --git a/std/thing/language.c b/std/thing/language.c
index 9ec70af..4b23c8a 100644
--- a/std/thing/language.c
+++ b/std/thing/language.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <thing/language.h>
 #include <thing/description.h>
diff --git a/std/thing/light.c b/std/thing/light.c
index bd6f9b6..465eea7 100644
--- a/std/thing/light.c
+++ b/std/thing/light.c
@@ -8,7 +8,6 @@
 #pragma save_types,rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/thing/moving.c b/std/thing/moving.c
index 26d0240..978fe97 100644
--- a/std/thing/moving.c
+++ b/std/thing/moving.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <defines.h>
 #include <moving.h>
diff --git a/std/thing/properties.c b/std/thing/properties.c
index 04dfd66..b965358 100644
--- a/std/thing/properties.c
+++ b/std/thing/properties.c
@@ -16,7 +16,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 
diff --git a/std/thing/restrictions.c b/std/thing/restrictions.c
index e8d0f83..83b541d 100644
--- a/std/thing/restrictions.c
+++ b/std/thing/restrictions.c
@@ -8,7 +8,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #include <defines.h>
 #include <properties.h>
diff --git a/std/thing/sockets.c b/std/thing/sockets.c
index 64d9899..38edc59 100644
--- a/std/thing/sockets.c
+++ b/std/thing/sockets.c
@@ -13,7 +13,6 @@
 #pragma save_types
 #pragma no_clone
 #pragma no_shadow
-#pragma pedantic
 #pragma range_check
 
 #define NEED_PROTOTYPES
diff --git a/std/thing/util.c b/std/thing/util.c
index d434642..0a0d1ff 100644
--- a/std/thing/util.c
+++ b/std/thing/util.c
@@ -12,7 +12,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 public void ShowPropList(string *props) 
 {
diff --git a/std/trading_price.c b/std/trading_price.c
index 4bfc96c..2a713dc 100644
--- a/std/trading_price.c
+++ b/std/trading_price.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 #define NEED_PROTOTYPES
 #include <thing/properties.h>
diff --git a/std/transport.c b/std/transport.c
index 253ef94..2f46927 100644
--- a/std/transport.c
+++ b/std/transport.c
@@ -6,7 +6,6 @@
 #pragma strong_types,rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/thing/moving";
 inherit "/std/room";
diff --git a/std/tray.c b/std/tray.c
index 3f5aebb..d9c0292 100644
--- a/std/tray.c
+++ b/std/tray.c
@@ -14,7 +14,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/properties";
diff --git a/std/tray/description.c b/std/tray/description.c
index 9079712..d3ffd37 100644
--- a/std/tray/description.c
+++ b/std/tray/description.c
@@ -6,7 +6,6 @@
 #pragma strong_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "std/container/description";
diff --git a/std/unit.c b/std/unit.c
index fd3820a..415c71e 100644
--- a/std/unit.c
+++ b/std/unit.c
@@ -7,7 +7,6 @@
 #pragma strong_types,save_types,rtt_checks
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/thing";
 
diff --git a/std/user_filter.c b/std/user_filter.c
index 7647816..111dfcb 100644
--- a/std/user_filter.c
+++ b/std/user_filter.c
@@ -6,7 +6,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 #include <properties.h>
diff --git a/std/util/cidr.c b/std/util/cidr.c
index 85a00e5..d829c18 100644
--- a/std/util/cidr.c
+++ b/std/util/cidr.c
@@ -11,7 +11,6 @@
 #pragma save_types
 #pragma no_clone
 #pragma no_shadow
-#pragma pedantic
 #pragma range_check
 
 // Never do this at home. ;-)
diff --git a/std/util/ex.c b/std/util/ex.c
index eae9e27..aa8509d 100644
--- a/std/util/ex.c
+++ b/std/util/ex.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/util/executer.c b/std/util/executer.c
index 0c24a92..bdd4b81 100644
--- a/std/util/executer.c
+++ b/std/util/executer.c
@@ -7,7 +7,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 protected mixed execute_anything(mixed fun, varargs mixed args)
 {
diff --git a/std/util/input.c b/std/util/input.c
index e65bc84..1e1a6f5 100644
--- a/std/util/input.c
+++ b/std/util/input.c
@@ -8,7 +8,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/util/pager.c b/std/util/pager.c
index 9d71b85..54980c3 100644
--- a/std/util/pager.c
+++ b/std/util/pager.c
@@ -6,7 +6,6 @@
 
 #pragma strong_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/util/path.c b/std/util/path.c
index 3ae07b8..193a865 100644
--- a/std/util/path.c
+++ b/std/util/path.c
@@ -1,4 +1,4 @@
-#pragma strict_types, rtt_checks, pedantic, range_check, no_clone
+#pragma strict_types, rtt_checks, range_check, no_clone
 
 #include <config.h>
 #include <shells.h>
diff --git a/std/util/pl_iterator.c b/std/util/pl_iterator.c
index 8c87baf..c2f4bd2 100644
--- a/std/util/pl_iterator.c
+++ b/std/util/pl_iterator.c
@@ -10,7 +10,7 @@
 */
 #pragma strong_types, save_types, rtt_checks
 #pragma no_clone, no_shadow
-#pragma pedantic, range_check
+#pragma range_check
 #pragma warn_deprecated
 
 private void check_all_player(mapping allplayer, closure check_cl,
diff --git a/std/util/rand-glfsr.c b/std/util/rand-glfsr.c
index 2a6e5c8..8adae0e 100644
--- a/std/util/rand-glfsr.c
+++ b/std/util/rand-glfsr.c
@@ -18,7 +18,7 @@
  * feedback polynomials (M-Sequence Feedback Taps), falls jemand braucht.
  *
 */
-#pragma strong_types,rtt_checks,pedantic
+#pragma strong_types,rtt_checks
 
 #include <tls.h>
 
diff --git a/std/util/ringbuffer.c b/std/util/ringbuffer.c
index 19338e1..b7143af 100644
--- a/std/util/ringbuffer.c
+++ b/std/util/ringbuffer.c
@@ -21,7 +21,6 @@
 #pragma no_clone
 #pragma no_inherit
 #pragma no_shadow
-#pragma pedantic
 #pragma range_check
 
 #include <util/ringbuffer.h>
diff --git a/std/util/testedit.c b/std/util/testedit.c
index f31f6ed..4b7ec19 100644
--- a/std/util/testedit.c
+++ b/std/util/testedit.c
@@ -5,7 +5,6 @@
 // $Id: testedit.c 6371 2007-07-17 22:46:50Z Zesstra $
 #pragma strict_types
 #pragma save_types
-#pragma pedantic
 #pragma range_check
 #pragma no_clone
 
diff --git a/std/virtual/v_compiler.c b/std/virtual/v_compiler.c
index 6c16c47..a6bb773 100644
--- a/std/virtual/v_compiler.c
+++ b/std/virtual/v_compiler.c
@@ -19,7 +19,6 @@
 #pragma save_types
 #pragma range_check
 #pragma no_clone
-#pragma pedantic
 
 inherit "/std/thing/properties";
 
diff --git a/std/weapon.c b/std/weapon.c
index 6ccc886..b871e80 100644
--- a/std/weapon.c
+++ b/std/weapon.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 //#pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/properties";
diff --git a/std/weapon/combat.c b/std/weapon/combat.c
index 1b73402..4cddc50 100644
--- a/std/weapon/combat.c
+++ b/std/weapon/combat.c
@@ -9,7 +9,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 #define NEED_PROTOTYPES
diff --git a/std/weapon/description.c b/std/weapon/description.c
index aad2938..b200caa 100644
--- a/std/weapon/description.c
+++ b/std/weapon/description.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 //#define NEED_PROTOTYPES
diff --git a/std/weapon/moving.c b/std/weapon/moving.c
index ce81770..95955cd 100644
--- a/std/weapon/moving.c
+++ b/std/weapon/moving.c
@@ -7,7 +7,6 @@
 #pragma strict_types
 #pragma save_types
 #pragma no_clone
-#pragma pedantic
 #pragma range_check
 
 inherit "/std/thing/moving";