diff --git a/make/defs.mk b/make/defs.mk
index ec440fff..9a731698 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -108,6 +108,10 @@ else
 endif
 endif
 
+CFLAGS                += -Wall -Wno-unused-value -fexceptions
+CPPFLAGS              += -Wall -Wno-unused-value
+LDFLAGS               += -Wall
+
 ifeq ($(CATCH_ONLY_YERROR),true)
 CFLAGS                += -DCATCH_ONLY_YERROR
 CPPFLAGS              += -DCATCH_ONLY_YERROR
@@ -640,9 +644,9 @@ ifeq ($(USE_STACK_CHECK),true)
 endif
 
 ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
-	CFLAGS      += -Wall -g3 -fexceptions
-	CPPFLAGS    += -Wall -g3
-	LDFLAGS     += -Wall -g3
+	CFLAGS      += -g3
+	CPPFLAGS    += -g3
+	LDFLAGS     += -g3
 endif
 
 ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)