diff --git a/Makefile.mk b/Makefile.mk
index d8e2ee3fe..5f0cd9fcd 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -235,7 +235,8 @@ CFLAGS_CORTEXM4 ?= -mlittle-endian -mcpu=cortex-m4 -march=armv7e-m -mthumb \
 # Common
 #
 
-CFLAGS_COMMON ?= $(INCLUDES) -std=c++11 -nostdlib -fno-exceptions -fno-rtti
+CFLAGS_COMMON ?= $(INCLUDES) -std=c++11 -nostdlib -fno-exceptions -fno-rtti \
+                 -fno-implicit-templates -fno-implicit-inline-templates
 LDFLAGS ?= -lgcc
 
 ifeq ($(OPTION_OPTIMIZE),enable)