diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk
index cae834c..496b58b 100644
--- a/src/board/system76/addw1/board.mk
+++ b/src/board/system76/addw1/board.mk
@@ -24,11 +24,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=12600 \
 	-DCHARGER_INPUT_CURRENT=11800
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk
index 19e99f1..3fadc24 100644
--- a/src/board/system76/addw2/board.mk
+++ b/src/board/system76/addw2/board.mk
@@ -24,11 +24,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=12600 \
 	-DCHARGER_INPUT_CURRENT=11800
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk
index 74ff771..f625f40 100644
--- a/src/board/system76/bonw14/board.mk
+++ b/src/board/system76/bonw14/board.mk
@@ -24,11 +24,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=16800 \
 	-DCHARGER_INPUT_CURRENT=14000
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/common/common.mk b/src/board/system76/common/common.mk
index 93fe9f4..427b3a9 100644
--- a/src/board/system76/common/common.mk
+++ b/src/board/system76/common/common.mk
@@ -24,6 +24,11 @@ SRC+=$(wildcard $(SYSTEM76_COMMON_DIR)/*.c)
 INCLUDE+=$(wildcard $(SYSTEM76_COMMON_DIR)/include/common/*.h) $(SYSTEM76_COMMON_DIR)/common.mk
 CFLAGS+=-I$(SYSTEM76_COMMON_DIR)/include
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Add charger
 CHARGER?=bq24780s
 SRC+=$(SYSTEM76_COMMON_DIR)/charger/$(CHARGER).c
diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk
index 1eda786..af68d3a 100644
--- a/src/board/system76/darp5/board.mk
+++ b/src/board/system76/darp5/board.mk
@@ -22,10 +22,5 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=17600 \
 	-DCHARGER_INPUT_CURRENT=3200
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp7/board.mk b/src/board/system76/darp7/board.mk
index d001b25..48e2097 100644
--- a/src/board/system76/darp7/board.mk
+++ b/src/board/system76/darp7/board.mk
@@ -25,10 +25,5 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=8800 \
 	-DCHARGER_INPUT_CURRENT=1600
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk
index b365bfe..7fe9a7d 100644
--- a/src/board/system76/galp3-c/board.mk
+++ b/src/board/system76/galp3-c/board.mk
@@ -22,10 +22,5 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=13056 \
 	-DCHARGER_INPUT_CURRENT=1920
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp5/board.mk b/src/board/system76/galp5/board.mk
index 66d6ed3..5fd9f6a 100644
--- a/src/board/system76/galp5/board.mk
+++ b/src/board/system76/galp5/board.mk
@@ -30,11 +30,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=17400 \
 	-DCHARGER_INPUT_CURRENT=1600
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk
index ccc7719..3388ad2 100644
--- a/src/board/system76/gaze15/board.mk
+++ b/src/board/system76/gaze15/board.mk
@@ -24,11 +24,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=16800 \
 	-DCHARGER_INPUT_CURRENT=9230
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/lemp10/board.mk b/src/board/system76/lemp10/board.mk
index 0dcf306..f3f2d17 100644
--- a/src/board/system76/lemp10/board.mk
+++ b/src/board/system76/lemp10/board.mk
@@ -26,10 +26,5 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=8800 \
 	-DCHARGER_INPUT_CURRENT=1600
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk
index c2f8d80..26b603c 100644
--- a/src/board/system76/lemp9/board.mk
+++ b/src/board/system76/lemp9/board.mk
@@ -23,10 +23,5 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=8800 \
 	-DCHARGER_INPUT_CURRENT=1600
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/oryp5/board.mk b/src/board/system76/oryp5/board.mk
index 38ff03b..9fea540 100644
--- a/src/board/system76/oryp5/board.mk
+++ b/src/board/system76/oryp5/board.mk
@@ -25,11 +25,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=17120 \
 	-DCHARGER_INPUT_CURRENT=9230
 
-# Set battery charging thresholds
-CFLAGS+=\
-       -DBATTERY_START_THRESHOLD=0 \
-       -DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index 0b14bd7..93b6f55 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -24,11 +24,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=13050 \
 	-DCHARGER_INPUT_CURRENT=9230
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk
index 0b14bd7..93b6f55 100644
--- a/src/board/system76/oryp7/board.mk
+++ b/src/board/system76/oryp7/board.mk
@@ -24,11 +24,6 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=13050 \
 	-DCHARGER_INPUT_CURRENT=9230
 
-# Set battery charging thresholds
-CFLAGS+=\
-	-DBATTERY_START_THRESHOLD=0 \
-	-DBATTERY_END_THRESHOLD=100
-
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \