diff --git a/src/examples/fixedwing_control/module.mk b/src/examples/fixedwing_control/module.mk
index 8707776aef..f6c882ead4 100644
--- a/src/examples/fixedwing_control/module.mk
+++ b/src/examples/fixedwing_control/module.mk
@@ -42,4 +42,4 @@ SRCS		= main.c \
 
 MODULE_STACKSIZE = 1200
 
-EXTRACFLAGS = -Wno-frame-larger-than
+EXTRACFLAGS = -Wframe-larger-than=1200
diff --git a/src/modules/attitude_estimator_ekf/module.mk b/src/modules/attitude_estimator_ekf/module.mk
index 96ba452423..3a3e1cc698 100644
--- a/src/modules/attitude_estimator_ekf/module.mk
+++ b/src/modules/attitude_estimator_ekf/module.mk
@@ -43,6 +43,6 @@ SRCS		 = attitude_estimator_ekf_main.cpp \
 
 MODULE_STACKSIZE = 1200
 
-EXTRACFLAGS = -Wno-float-equal
+EXTRACFLAGS = -Wno-float-equal -Wframe-larger-than=3600
 
-EXTRACXXFLAGS = -Wno-frame-larger-than
+EXTRACXXFLAGS = -Wframe-larger-than=2200
diff --git a/src/modules/commander/module.mk b/src/modules/commander/module.mk
index caec1e8694..dac2ce59a6 100644
--- a/src/modules/commander/module.mk
+++ b/src/modules/commander/module.mk
@@ -52,4 +52,5 @@ MODULE_STACKSIZE = 1200
 
 MAXOPTIMIZATION	 = -Os
 
-EXTRACXXFLAGS = -Wno-error
+EXTRACXXFLAGS = -Wframe-larger-than=1900
+
diff --git a/src/modules/ekf_att_pos_estimator/module.mk b/src/modules/ekf_att_pos_estimator/module.mk
index 07e70ddb3b..4311fb3f9d 100644
--- a/src/modules/ekf_att_pos_estimator/module.mk
+++ b/src/modules/ekf_att_pos_estimator/module.mk
@@ -42,4 +42,5 @@ SRCS		= ekf_att_pos_estimator_main.cpp \
 		  estimator_23states.cpp \
 		  estimator_utilities.cpp
 
-EXTRACXXFLAGS	= -Weffc++ -Wno-error
+EXTRACXXFLAGS	= -Weffc++ -Wframe-larger-than=3000
+
diff --git a/src/modules/position_estimator_inav/module.mk b/src/modules/position_estimator_inav/module.mk
index 5ebdb721c9..45c8762996 100644
--- a/src/modules/position_estimator_inav/module.mk
+++ b/src/modules/position_estimator_inav/module.mk
@@ -42,4 +42,5 @@ SRCS		 	= position_estimator_inav_main.c \
 
 MODULE_STACKSIZE = 1200
 
-EXTRACFLAGS = -Wno-error
+EXTRACFLAGS = -Wframe-larger-than=3500
+
diff --git a/src/modules/sdlog2/module.mk b/src/modules/sdlog2/module.mk
index d7224b77a1..f1118000e8 100644
--- a/src/modules/sdlog2/module.mk
+++ b/src/modules/sdlog2/module.mk
@@ -46,4 +46,5 @@ MODULE_STACKSIZE = 1200
 
 MAXOPTIMIZATION	 = -Os
 
-EXTRACFLAGS = -Wno-error
+EXTRACFLAGS = -Wframe-larger-than=1200
+
diff --git a/src/modules/vtol_att_control/module.mk b/src/modules/vtol_att_control/module.mk
index 02403ef764..0cf3072c8f 100644
--- a/src/modules/vtol_att_control/module.mk
+++ b/src/modules/vtol_att_control/module.mk
@@ -40,4 +40,5 @@ MODULE_COMMAND	= vtol_att_control
 SRCS		= vtol_att_control_main.cpp \
 			  vtol_att_control_params.c
 
-EXTRACXXFLAGS = -Wno-error
+EXTRACXXFLAGS = -Wno-write-strings
+
diff --git a/src/systemcmds/mixer/module.mk b/src/systemcmds/mixer/module.mk
index 40ffb8f12c..0fb899c671 100644
--- a/src/systemcmds/mixer/module.mk
+++ b/src/systemcmds/mixer/module.mk
@@ -42,4 +42,5 @@ MODULE_STACKSIZE = 4096
 
 MAXOPTIMIZATION	 = -Os
 
-EXTRACXXFLAGS = -Wno-error
+EXTRACXXFLAGS = -Wframe-larger-than=2048
+
diff --git a/src/systemcmds/mtd/module.mk b/src/systemcmds/mtd/module.mk
index c3baffc5dd..bca1cdcc18 100644
--- a/src/systemcmds/mtd/module.mk
+++ b/src/systemcmds/mtd/module.mk
@@ -7,4 +7,5 @@ SRCS		 = mtd.c 24xxxx_mtd.c
 
 MAXOPTIMIZATION	 = -Os
 
-EXTRACFLAGS	= -Wno-error
\ No newline at end of file
+EXTRACFLAGS	= -Wno-error
+
diff --git a/src/systemcmds/tests/module.mk b/src/systemcmds/tests/module.mk
index 1ea2a6620d..6eed3922c4 100644
--- a/src/systemcmds/tests/module.mk
+++ b/src/systemcmds/tests/module.mk
@@ -35,4 +35,5 @@ SRCS			 = test_adc.c \
 			   test_mount.c \
 			   test_mtd.c
 
-EXTRACXXFLAGS = -Wno-error
+EXTRACXXFLAGS = -Wframe-larger-than=2500
+