diff --git a/Makefile b/Makefile
index 456dc49dbc..7be4e6a6d2 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,7 @@ EXTRA_WARNING_FLAGS := -Wold-style-definition
 CFLAGS     += $(ARCH_FLAGS) \
               $(addprefix -D,$(OPTIONS)) \
               $(addprefix -I,$(INCLUDE_DIRS)) \
+              $(addprefix -isystem,$(SYS_INCLUDE_DIRS)) \
               $(DEBUG_FLAGS) \
               -std=gnu17 \
               -Wall -Wextra -Werror -Wunsafe-loop-optimizations -Wdouble-promotion \
@@ -331,6 +332,7 @@ ASFLAGS     = $(ARCH_FLAGS) \
               $(DEBUG_FLAGS) \
               -x assembler-with-cpp \
               $(addprefix -I,$(INCLUDE_DIRS)) \
+              $(addprefix -isystem,$(SYS_INCLUDE_DIRS)) \
               -MMD -MP
 
 ifeq ($(LD_FLAGS),)
@@ -359,6 +361,7 @@ endif
 CPPCHECK        = cppcheck $(CSOURCES) --enable=all --platform=unix64 \
                   --std=c99 --inline-suppr --quiet --force \
                   $(addprefix -I,$(INCLUDE_DIRS)) \
+                  $(addprefix -isystem,$(SYS_INCLUDE_DIRS)) \
                   -I/usr/include -I/usr/include/linux
 
 TARGET_NAME := $(TARGET)
diff --git a/src/config b/src/config
index 53e2e0aa71..3377c6c462 160000
--- a/src/config
+++ b/src/config
@@ -1 +1 @@
-Subproject commit 53e2e0aa717c138ae46a20a373f32da1e871ee2a
+Subproject commit 3377c6c462425267f009f4609e75fbe005655e12
diff --git a/src/main/pg/motor.c b/src/main/pg/motor.c
index d546ed1137..b9c65a69f8 100644
--- a/src/main/pg/motor.c
+++ b/src/main/pg/motor.c
@@ -75,7 +75,6 @@ void pgResetFn_motorConfig(motorConfig_t *motorConfig)
     motorConfig->mincommand = 1000;
     motorConfig->kv = 1960;
 
-#ifdef USE_TIMER
 #ifdef MOTOR1_PIN
     motorConfig->dev.ioTags[0] = IO_TAG(MOTOR1_PIN);
 #endif
@@ -99,7 +98,6 @@ void pgResetFn_motorConfig(motorConfig_t *motorConfig)
 #endif
 #ifdef MOTOR8_PIN
     motorConfig->dev.ioTags[7] = IO_TAG(MOTOR8_PIN);
-#endif
 #endif
 
     motorConfig->motorPoleCount = 14;   // Most brushless motors that we use are 14 poles