diff --git a/Makefile b/Makefile
index bd20f733ea9a77f8bb7e96cd8e0c643e97d0e00b..5333e490341176967d18698fd43c2beb703c1bd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 default: build/system.elf
 
 INCLUDES = -Iinclude -Iinclude/arch/${arch}
-COMMON_FLAGS = -g -Os -Wall -Wextra -fno-rtti -fno-threadsafe-statics
+COMMON_FLAGS = -g -Os -Wall -Wextra
 CFLAGS = -std=c99
-CXXFLAGS = -std=c++14
+CXXFLAGS = -std=c++14 -fno-rtti -fno-threadsafe-statics
 
 C_TARGETS =
 CXX_TARGETS = src/app/${app}/main.cc src/os/object/cpp_helpers.cc src/os/object/outputstream.cc
diff --git a/src/arch/esp8266/Makefile.inc b/src/arch/esp8266/Makefile.inc
index ed9f05affe715aee8cc046efbf236862cbbc06ad..1df3e5a9b1affcce46839568cda43324256acddd 100644
--- a/src/arch/esp8266/Makefile.inc
+++ b/src/arch/esp8266/Makefile.inc
@@ -17,7 +17,7 @@ endif
 
 INCLUDES += -I${SDK_BASE}/include
 COMMON_FLAGS += -nostdlib -mlongcalls -D__ets__ -DICACHE_FLASH -DMULTIPASS_ARCH_esp8266
-CXXFLAGS = -std=c++11
+CXXFLAGS = -std=c++11 -fno-rtti -fno-threadsafe-statics
 LDFLAGS += -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
 
 CXX_TARGETS += src/arch/esp8266/arch.cc src/arch/esp8266/driver/gpio.cc