diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
index 7b1388b3099..86d3a2df237 100644
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -91,7 +91,6 @@
-Wno-non-virtual-dtor
-gstabs+
-gstabs+
- -m32 --win32
diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index 5567697b398..6f295ee8dbf 100644
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -25,6 +25,7 @@
-momit-leaf-frame-pointer
-mpreferred-stack-boundary=2
+ -m32 --win32