diff --git a/Makefile b/Makefile
index bc0056be1a..00e0258c00 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,8 @@ else
    DEF_FLAGS += -ffast-math
 endif
 
+DEF_FLAGS += -Wall
+
 ifneq ($(findstring BSD,$(OS)),)
    DEF_FLAGS += -DBSD
    LDFLAGS += -L/usr/local/lib
@@ -68,7 +70,7 @@ endif
 include Makefile.common
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
-   DEFINES +=  -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
+   DEF_FLAGS += -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
 endif
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
@@ -80,7 +82,7 @@ endif
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
 
 ifeq ($(MISSING_DECLS), 1)
-   DEFINES += -Werror=missing-declarations
+   DEF_FLAGS += -Werror=missing-declarations
 endif
 
 ifeq ($(HAVE_DYLIB), 1)
@@ -116,7 +118,7 @@ ifneq ($(CXX_BUILD), 1)
    CFLAGS += -D_GNU_SOURCE
 endif
 
-DEF_FLAGS += -Wall $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
+DEF_FLAGS += $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
 
 CFLAGS += $(DEF_FLAGS)
 CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS
@@ -137,15 +139,6 @@ else
    LINK = $(CC)
 endif
 
-ifeq ($(NOUNUSED), yes)
-   CFLAGS += -Wno-unused-result
-   CXXFLAGS += -Wno-unused-result
-endif
-ifeq ($(NOUNUSED_VARIABLE), yes)
-   CFLAGS += -Wno-unused-variable
-   CXXFLAGS += -Wno-unused-variable
-endif
-
 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 
 ifneq ($(X86),)
diff --git a/Makefile.common b/Makefile.common
index 883fc79fc4..ee7dcf175d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -7,6 +7,14 @@ ifeq ($(HAVE_STACK_USAGE), 1)
    DEF_FLAGS += -fstack-usage
 endif
 
+ifeq ($(HAVE_NOUNUSED), 1)
+   DEF_FLAGS += $(NOUNUSED_CFLAGS)
+endif
+
+ifeq ($(HAVE_NOUNUSED_VARIABLE), 1)
+   DEF_FLAGS += $(NOUNUSED_VARIABLE_CFLAGS)
+endif
+
 ifeq ($(HAVE_CXX11), 1)
    CXXFLAGS += $(CXX11_CFLAGS)
 endif
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 19b58bffa4..4c63f102a1 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -13,9 +13,7 @@ fi
 
 check_switch cxx CXX11 -std=c++11 ''
 check_switch '' NOUNUSED -Wno-unused-result ''
-add_define MAKEFILE NOUNUSED "$HAVE_NOUNUSED"
 check_switch '' NOUNUSED_VARIABLE -Wno-unused-variable ''
-add_define MAKEFILE NOUNUSED_VARIABLE "$HAVE_NOUNUSED_VARIABLE"
 
 # There are still broken 64-bit Linux distros out there. :)
 [ -z "$CROSS_COMPILE" ] && [ -d /usr/lib64 ] && add_dirs LIBRARY /usr/lib64