diff --git a/BuildTests/ModuleTest/makefile.avr8 b/BuildTests/ModuleTest/makefile.avr8
index c05852bc61..b4c319540a 100644
--- a/BuildTests/ModuleTest/makefile.avr8
+++ b/BuildTests/ModuleTest/makefile.avr8
@@ -220,16 +220,35 @@ CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -fno-split-wide-types
-CFLAGS += -Wall
-CFLAGS += -Wstrict-prototypes
-#CFLAGS += -mshort-calls
-#CFLAGS += -fno-unit-at-a-time
-#CFLAGS += -Wundef
-#CFLAGS += -Wunreachable-code
-#CFLAGS += -Wsign-compare
 CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
+CFLAGS += -Werror
+CFLAGS += -Wall
+CFLAGS += -Wextra
+CFLAGS += -Wstrict-prototypes
+CFLAGS += -Wformat=2
+CFLAGS += -Winit-self
+CFLAGS += -Wswitch-enum
+CFLAGS += -Wunused
+CFLAGS += -Wundef
+CFLAGS += -Wpointer-arith
+CFLAGS += -Wcast-align
+CFLAGS += -Wwrite-strings
+CFLAGS += -Wlogical-op
+CFLAGS += -Wmissing-parameter-type
+CFLAGS += -Wmissing-declarations
+CFLAGS += -Wmissing-field-initializers
+CFLAGS += -Wmissing-format-attribute
+CFLAGS += -Wredundant-decls
+CFLAGS += -Wnested-externs
+CFLAGS += -Woverlength-strings
+#CFLAGS += -Wswitch-default
+#CFLAGS += -Wc++-compat
+#CFLAGS += -Wcast-qual
+#CFLAGS += -Wconversion
+#CFLAGS += -Wjump-misses-init
+#CFLAGS += -pedantic
 
 
 #---------------- Compiler Options C++ ----------------
@@ -249,14 +268,8 @@ CPPFLAGS += -fshort-enums
 CPPFLAGS += -fno-exceptions
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-#CPPFLAGS += -mshort-calls
-#CPPFLAGS += -fno-unit-at-a-time
-#CPPFLAGS += -Wstrict-prototypes
-#CPPFLAGS += -Wunreachable-code
-#CPPFLAGS += -Wsign-compare
 CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
-#CPPFLAGS += $(CSTANDARD)
 
 
 #---------------- Assembler Options ----------------
diff --git a/BuildTests/ModuleTest/makefile.uc3 b/BuildTests/ModuleTest/makefile.uc3
index 610de46ede..fe26832348 100644
--- a/BuildTests/ModuleTest/makefile.uc3
+++ b/BuildTests/ModuleTest/makefile.uc3
@@ -186,12 +186,36 @@ CFLAGS += -funsigned-char
 CFLAGS += -funsigned-bitfields
 CFLAGS += -ffunction-sections
 CFLAGS += -fno-strict-aliasing
-CFLAGS += -Wall
-CFLAGS += -Wstrict-prototypes
 CFLAGS += -masm-addr-pseudos
 CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
+CFLAGS += -Werror
+CFLAGS += -Wall
+CFLAGS += -Wextra
+CFLAGS += -Wstrict-prototypes
+CFLAGS += -Wformat=2
+CFLAGS += -Winit-self
+CFLAGS += -Wswitch-enum
+CFLAGS += -Wunused
+CFLAGS += -Wundef
+CFLAGS += -Wpointer-arith
+#CFLAGS += -Wcast-align
+CFLAGS += -Wwrite-strings
+CFLAGS += -Wlogical-op
+CFLAGS += -Wmissing-parameter-type
+CFLAGS += -Wmissing-declarations
+CFLAGS += -Wmissing-field-initializers
+CFLAGS += -Wmissing-format-attribute
+#CFLAGS += -Wredundant-decls
+CFLAGS += -Wnested-externs
+CFLAGS += -Woverlength-strings
+#CFLAGS += -Wswitch-default
+#CFLAGS += -Wc++-compat
+#CFLAGS += -Wcast-qual
+#CFLAGS += -Wconversion
+#CFLAGS += -Wjump-misses-init
+#CFLAGS += -pedantic
 
 
 #---------------- Compiler Options C++ ----------------
diff --git a/BuildTests/ModuleTest/makefile.xmega b/BuildTests/ModuleTest/makefile.xmega
index fd54a57c9a..e666704e38 100644
--- a/BuildTests/ModuleTest/makefile.xmega
+++ b/BuildTests/ModuleTest/makefile.xmega
@@ -209,11 +209,35 @@ CFLAGS += -fno-inline-small-functions
 CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
-CFLAGS += -Wall
-CFLAGS += -Wstrict-prototypes
 CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
+CFLAGS += -Werror
+CFLAGS += -Wall
+CFLAGS += -Wextra
+CFLAGS += -Wstrict-prototypes
+CFLAGS += -Wformat=2
+CFLAGS += -Winit-self
+CFLAGS += -Wswitch-enum
+CFLAGS += -Wunused
+CFLAGS += -Wundef
+CFLAGS += -Wpointer-arith
+CFLAGS += -Wcast-align
+CFLAGS += -Wwrite-strings
+CFLAGS += -Wlogical-op
+CFLAGS += -Wmissing-parameter-type
+CFLAGS += -Wmissing-declarations
+CFLAGS += -Wmissing-field-initializers
+CFLAGS += -Wmissing-format-attribute
+CFLAGS += -Wredundant-decls
+CFLAGS += -Wnested-externs
+CFLAGS += -Woverlength-strings
+#CFLAGS += -Wswitch-default
+#CFLAGS += -Wc++-compat
+#CFLAGS += -Wcast-qual
+#CFLAGS += -Wconversion
+#CFLAGS += -Wjump-misses-init
+#CFLAGS += -pedantic
 
 
 #---------------- Compiler Options C++ ----------------