--- _oasis.orig	2016-02-25 15:20:15 UTC
+++ _oasis
@@ -32,7 +32,7 @@ Library pcre
   BuildDepends:    bytes
   CCOpt:          -g -O2 -fPIC -DPIC
   if flag(strict) && ccomp_type(cc)
-    CCOpt+:       -Wall -pedantic -Wextra -Wunused -Wno-long-long -Wno-keyword-macro
+    CCOpt+:       -Wall -pedantic -Wextra -Wunused -Wno-long-long
 
 
 # Examples
--- myocamlbuild.ml.orig	2016-02-25 15:20:15 UTC
+++ myocamlbuild.ml
@@ -648,8 +648,6 @@ let package_default =
                       A "-Wunused";
                       A "-ccopt";
-                      A "-Wno-long-long";
-                      A "-ccopt";
-                      A "-Wno-keyword-macro"
+                      A "-Wno-long-long"
                    ])
             ])
        ];
--- setup.ml.orig	2016-02-25 15:20:15 UTC
+++ setup.ml
@@ -6785,8 +6785,7 @@ let setup_t =
                                 "-pedantic";
                                 "-Wextra";
                                 "-Wunused";
-                                "-Wno-long-long";
-                                "-Wno-keyword-macro"
+                                "-Wno-long-long"
                              ])
                         ];
                       bs_cclib = [(OASISExpr.EBool true, [])];