diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index d6f91b10e4f..9df292df7c6 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -77,9 +77,8 @@ ifneq ($(strip $(ALLOW_WARNINGS)), yes)
 endif
 CFLAGS += $(CSTANDARD)
 
-# This fixes lots of keyboards linking errors but SHOULDN'T BE A FINAL SOLUTION
-# Fixing of multiple variable definitions must be made.
-CFLAGS += -fcommon
+# While default on newer compilers, force consistent behaviour
+CFLAGS += -fno-common
 
 #---------------- C++ Compiler Options ----------------