diff --git a/secure/master.c b/secure/master.c
index 92405f4..f4aff53 100644
--- a/secure/master.c
+++ b/secure/master.c
@@ -3,13 +3,9 @@
 // master.c -- master object
 //
 // $Id: master.c 9530 2016-03-17 19:59:01Z Zesstra $
-#pragma strict_types
-#pragma no_clone
-#pragma no_shadow
-#pragma no_inherit
-#pragma verbose_errors
-#pragma combine_strings
-//#pragma pedantic
+#pragma strict_types,rtt_checks
+#pragma no_clone,no_shadow,no_inherit
+#pragma pedantic
 #pragma range_check
 #pragma warn_deprecated
 
diff --git a/secure/master/domain.c b/secure/master/domain.c
index 99ec6f6..4e2bc5c 100644
--- a/secure/master/domain.c
+++ b/secure/master/domain.c
@@ -4,7 +4,7 @@
 //
 // $Id: domain.c 7162 2009-02-26 21:14:43Z Zesstra $
 
-#pragma strict_types
+#pragma strict_types,rtt_checks,pedantic
 
 #include "/secure/master.h"
 #include "/sys/files.h"
diff --git a/secure/master/file_access.c b/secure/master/file_access.c
index d050c58..04cd53e 100644
--- a/secure/master/file_access.c
+++ b/secure/master/file_access.c
@@ -1,4 +1,4 @@
-#pragma strict_types, no_warn_deprecated
+#pragma strict_types,rtt_checks,pedantic
 
 #include "/secure/master.h"
 
diff --git a/secure/master/guild.c b/secure/master/guild.c
index 9eaaa8b..b8b71fa 100644
--- a/secure/master/guild.c
+++ b/secure/master/guild.c
@@ -10,7 +10,7 @@
  * Bisher werden nur Gildenmagier verwaltet.
  */
 
-#pragma strict_types
+#pragma strict_types,rtt_checks,pedantic
 
 #include "/secure/master.h"
 
diff --git a/secure/master/misc.c b/secure/master/misc.c
index d7d8eb5..82ec5e3 100644
--- a/secure/master/misc.c
+++ b/secure/master/misc.c
@@ -4,7 +4,7 @@
 //
 // $Id: misc.c 9467 2016-02-19 19:48:24Z Zesstra $
 
-#pragma strict_types,rtt_checks
+#pragma strict_types,rtt_checks,pedantic
 
 #include "/sys/functionlist.h"
 #include "/sys/lpctypes.h"
diff --git a/secure/master/network.c b/secure/master/network.c
index 26767a5..695f1f8 100644
--- a/secure/master/network.c
+++ b/secure/master/network.c
@@ -4,7 +4,7 @@
 //
 // $Id: network.c 8934 2014-09-10 21:57:12Z Zesstra $
 
-#pragma strict_types
+#pragma strict_types,rtt_checks,pedantic
 
 #include "/secure/master.h"
 #define BBMASTER "/secure/bbmaster"
diff --git a/secure/master/players_deny.c b/secure/master/players_deny.c
index 7528e74..a66e4e9 100644
--- a/secure/master/players_deny.c
+++ b/secure/master/players_deny.c
@@ -3,14 +3,8 @@
 // master.c -- master object
 //
 // $Id: master.c 7041 2008-10-13 18:18:27Z Zesstra $
-#pragma strict_types
-#pragma no_clone
-#pragma no_shadow
-#pragma verbose_errors
-#pragma combine_strings
-//#pragma pedantic
-#pragma range_check
-#pragma warn_deprecated
+#pragma strict_types,no_clone,no_shadow
+#pragma pedantic,range_check,warn_deprecated
 
 #include "/secure/config.h"
 #define WHITELIST "/"LIBDATADIR"/secure/ARCH/players_deny_whitelist.o"
diff --git a/secure/master/userinfo.c b/secure/master/userinfo.c
index 9e6a06b..b17561b 100644
--- a/secure/master/userinfo.c
+++ b/secure/master/userinfo.c
@@ -4,7 +4,7 @@
 //
 // $Id: userinfo.c 9467 2016-02-19 19:48:24Z Zesstra $
 
-#pragma strict_types
+#pragma strict_types,rtt_checks,pedantic
 
 #include "/secure/master.h"
 #include "/sys/files.h"