diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp
index e298e6035..9736d6343 100644
--- a/Firmware/Filament_sensor.cpp
+++ b/Firmware/Filament_sensor.cpp
@@ -5,7 +5,9 @@
 #include "Filament_sensor.h"
 #include "Timer.h"
 #include "eeprom.h"
+#include "language.h"
 #include "menu.h"
+#include "messages.h"
 #include "planner.h"
 #include "temperature.h"
 #include "ultralcd.h"
diff --git a/Firmware/Prusa_farm.cpp b/Firmware/Prusa_farm.cpp
index c82989ad5..5ff6a8c66 100644
--- a/Firmware/Prusa_farm.cpp
+++ b/Firmware/Prusa_farm.cpp
@@ -7,6 +7,7 @@
 #include "util.h"
 #include "ultralcd.h"
 #include "Filament_sensor.h"
+#include "language.h"
 
 #ifdef PRUSA_FARM
 uint8_t farm_mode = 0;
diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp
index e332cacef..39030cb10 100755
--- a/Firmware/cmdqueue.cpp
+++ b/Firmware/cmdqueue.cpp
@@ -5,6 +5,8 @@
 #include "ultralcd.h"
 #include "Prusa_farm.h"
 #include "meatpack.h"
+#include "messages.h"
+#include "language.h"
 
 // Reserve BUFSIZE lines of length MAX_CMD_SIZE plus CMDBUFFER_RESERVE_FRONT.
 char cmdbuffer[BUFSIZE * (MAX_CMD_SIZE + 1) + CMDBUFFER_RESERVE_FRONT];
diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h
index bf512e09f..96ec6d772 100644
--- a/Firmware/cmdqueue.h
+++ b/Firmware/cmdqueue.h
@@ -2,8 +2,6 @@
 #define CMDQUEUE_H
 
 #include "Marlin.h"
-#include "language.h"
-
 
 // String circular buffer. Commands may be pushed to the buffer from both sides:
 // Chained commands will be pushed to the front, interactive (from LCD menu) 
diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp
index 520dcf377..06b860d21 100644
--- a/Firmware/eeprom.cpp
+++ b/Firmware/eeprom.cpp
@@ -8,9 +8,6 @@
 #include <avr/eeprom.h>
 #include <stdint.h>
 
-
-#include "language.h"
-
 void eeprom_init()
 {
     eeprom_init_default_byte((uint8_t*)EEPROM_POWER_COUNT, 0);
diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp
index 65ceaf678..e4f3187a3 100644
--- a/Firmware/first_lay_cal.cpp
+++ b/Firmware/first_lay_cal.cpp
@@ -5,8 +5,8 @@
 
 #include "first_lay_cal.h"
 #include "Configuration_var.h"
-#include "language.h"
 #include "Marlin.h"
+#include "messages.h"
 #include "cmdqueue.h"
 #include "mmu2.h"
 #include <avr/pgmspace.h>
diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp
index 9e7b9a7d5..e85b5fad7 100644
--- a/Firmware/stepper.cpp
+++ b/Firmware/stepper.cpp
@@ -26,7 +26,6 @@
 #include "planner.h"
 #include "temperature.h"
 #include "ultralcd.h"
-#include "language.h"
 #include "cardreader.h"
 #include "speed_lookuptable.h"
 #if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1