diff --git a/SConscript.firmware b/SConscript.firmware
index c3792b4b9..5744102e8 100644
--- a/SConscript.firmware
+++ b/SConscript.firmware
@@ -477,10 +477,9 @@ env.Replace(
     '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard '
     '-fsingle-precision-constant -fdata-sections -ffunction-sections ' +
     CCFLAGS_MOD,
-    CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB -DN_ARM -DN_XTENSA',
+    CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
     LINKFLAGS='-nostdlib -T embed/firmware/memory.ld --gc-sections',
     CPPPATH=[
-        '.',
         'embed/firmware',
         'embed/trezorhal',
         'embed/trezorhal/hal',
diff --git a/SConscript.unix b/SConscript.unix
index aa3a4e903..6ac8493c8 100644
--- a/SConscript.unix
+++ b/SConscript.unix
@@ -240,7 +240,7 @@ env.Replace(
     '-g3 '
     '-std=gnu99 -Wall -Werror -Wuninitialized '
     '-fdata-sections -ffunction-sections ' + CCFLAGS_MOD,
-    CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB -DN_ARM -DN_XTENSA',
+    CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
     LIBS=LIBS_MOD,
     CPPPATH=[
         '.',