diff --git a/common/battery_pack.h b/include/battery_pack.h
similarity index 96%
rename from common/battery_pack.h
rename to include/battery_pack.h
index bff4481751..c119c673c0 100644
--- a/common/battery_pack.h
+++ b/include/battery_pack.h
@@ -38,5 +38,4 @@ const struct battery_info *battery_get_info(void);
 /* Vendor provided parameters for battery charging */
 void battery_vendor_params(struct batt_params *batt);
 
-#endif //__CROS_EC_BATTERY_PACK_H
-
+#endif
diff --git a/common/charge_state.h b/include/charge_state.h
similarity index 100%
rename from common/charge_state.h
rename to include/charge_state.h
diff --git a/common/charger_bq24725.h b/include/charger_bq24725.h
similarity index 100%
rename from common/charger_bq24725.h
rename to include/charger_bq24725.h