diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 5266c7501e8..7d1dd7ca685 100644
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -643,16 +643,6 @@ ifneq ($(TARGET_TYPE),kernel)
 endif
 endif
 
-#
-# Enable Tree-Wide Optimization if Debug is on.
-# Protect uncompatible files here with an ifneq
-# if needed, until their problems can be found
-#
-ifneq ($(DBG),1)
-  MK_CFLAGS += -O2 -Wno-strict-aliasing
-  MK_CPPFLAGS += -O2 -Wno-strict-aliasing
-endif
-
 #
 # Force Optimization for w3seek
 #
@@ -664,6 +654,19 @@ ifeq ($(OPTIMIZE),yes)
     endif
 endif
 
+#
+# Enable Tree-Wide Optimization if Debug is on.
+# Protect uncompatible files here with an ifneq
+# if needed, until their problems can be found
+#
+ifneq ($(DBG),1)
+  MK_CFLAGS += -Os -Wno-strict-aliasing -funit-at-a-time -fweb -ftracer -momit-leaf-frame-pointer
+  TARGET_LFLAGS += -Wl,-O1 -Wl,--sort-common -s
+  MK_CFLAGS += -mpreferred-stack-boundary=2
+  MK_CPPFLAGS += -O2 -Wno-strict-aliasing
+  MK_CPPFLAGS += -mpreferred-stack-boundary=2
+endif
+
 ifneq ($(TARGET_LIBS),)
   MK_LIBS := $(TARGET_LIBS) $(MK_LIBS)
 endif