diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h
index a883343d0..e5370195d 100644
--- a/Firmware/Marlin.h
+++ b/Firmware/Marlin.h
@@ -282,6 +282,7 @@ extern bool axis_known_position[3];
 extern float zprobe_zoffset;
 extern int fanSpeed;
 extern void homeaxis(int axis, uint8_t cnt = 1, uint8_t* pstep = 0);
+extern int8_t lcd_change_fil_state;
 
 
 #ifdef FAN_SOFT_PWM
diff --git a/Firmware/stepper.h b/Firmware/stepper.h
index d4199247e..6130f3bb1 100644
--- a/Firmware/stepper.h
+++ b/Firmware/stepper.h
@@ -90,6 +90,7 @@ extern bool x_min_endstop;
 extern bool x_max_endstop;
 extern bool y_min_endstop;
 extern bool y_max_endstop;
+extern volatile long count_position[NUM_AXIS];
 
 void quickStop();
 #if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 5c66a0afb..06fc8e2e7 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -37,7 +37,6 @@
 
 #include "mmu.h"
 
-extern int lcd_change_fil_state;
 extern bool fans_check_enabled;
 
 
diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp
index 705e11b7d..18d124b3b 100644
--- a/Firmware/xyzcal.cpp
+++ b/Firmware/xyzcal.cpp
@@ -32,8 +32,6 @@
 
 #define _PI 3.14159265F
 
-extern volatile long count_position[NUM_AXIS];
-
 uint8_t check_pinda_0();
 uint8_t check_pinda_1();
 void xyzcal_update_pos(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de);