diff --git a/glcd/glcd.c b/glcd/glcd.c
index 432b7c0d..5d8804b5 100644
--- a/glcd/glcd.c
+++ b/glcd/glcd.c
@@ -1,6 +1,4 @@
 #include "glcd.h" 
-#include <stdlib.h>
-#include <math.h>
 
 #define EMSG(a)	const struct a *emsg = (const struct a*)msg
 
diff --git a/glcd/glcd.h b/glcd/glcd.h
index 850d6f35..f6cedfeb 100644
--- a/glcd/glcd.h
+++ b/glcd/glcd.h
@@ -4,7 +4,8 @@
 #include "ch.h"
 #include "hal.h"
 #include "fonts.h"
-#include "worker.h"
+#include "fastMath.h"
+#include "glcdWorker.h"
 
 #if !defined(LCD_USE_FSMC) && !defined(LCD_USE_GPIO) && !defined(LCD_USE_SPI)
 #include "glcdconf.h"
diff --git a/glcd/worker.h b/glcd/worker.h
deleted file mode 100644
index 53d3c09f..00000000
--- a/glcd/worker.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef WORKER_H
-#define WORKER_H
-
-#define GLCD_WORKER_SIZE 512
-
-enum glcd_action {	GLCD_SET_POWERMODE,
-					GLCD_SET_ORIENTATION,
-					GLCD_SET_WINDOW,
-					GLCD_FILL_AREA,
-					GLCD_WRITE_AREA,
-					GLCD_CLEAR,
-					GLCD_GET_PIXEL_COLOR,
-					GLCD_DRAW_PIXEL,
-					GLCD_WRITE_STREAM_START,
-					GLCD_WRITE_STREAM_STOP,
-					GLCD_WRITE_STREAM,
-					GLCD_VERTICAL_SCROLL,
-				};
-
-enum glcd_result {	GLCD_DONE,
-					GLCD_FAILED,
-					GLCD_PROGRESS,
-				};
-
-#define _glcd_msg_base			\
-	enum glcd_action action;	\
-	enum glcd_result result;
-
-struct glcd_msg_base {
-	_glcd_msg_base
-};
-
-struct glcd_msg_powermode {
-	_glcd_msg_base
-
-	uint8_t powermode;
-};
-
-struct glcd_msg_orientation {
-	_glcd_msg_base
-
-	uint8_t newOrientation;
-};
-
-struct glcd_msg_set_window {
-	_glcd_msg_base
-
-	uint16_t x0;
-	uint16_t y0;
-	uint16_t x1;
-	uint16_t y1;
-};
-
-struct glcd_msg_fill_area {
-	_glcd_msg_base
-
-	uint16_t x0;
-	uint16_t y0;
-	uint16_t x1;
-	uint16_t y1;
-	uint16_t color;
-};
-
-struct glcd_msg_write_area {
-	_glcd_msg_base
-
-	uint16_t x0;
-	uint16_t y0;
-	uint16_t x1;
-	uint16_t y1;
-	uint16_t *buffer;
-	size_t size;
-};
-
-struct glcd_msg_clear {
-	_glcd_msg_base
-
-	uint16_t color;
-};
-
-struct glcd_msg_get_pixel_color {
-	_glcd_msg_base
-
-	uint16_t x;
-	uint16_t y;
-	uint16_t color;
-};
-
-struct glcd_msg_draw_pixel {
-	_glcd_msg_base
-
-	uint16_t x;
-	uint16_t y;
-	uint16_t color;
-};
-
-struct glcd_msg_write_stream_start {
-	_glcd_msg_base
-};
-
-struct glcd_msg_write_stream_stop {
-	_glcd_msg_base
-};
-
-struct glcd_msg_write_stream {
-	_glcd_msg_base
-
-	uint16_t *buffer;
-	uint16_t size;
-};
-
-struct glcd_msg_vertical_scroll {
-	_glcd_msg_base
-
-	uint16_t x0;
-	uint16_t y0;
-	uint16_t x1;
-	uint16_t y1;
-	int16_t lines;
-};
-
-#endif
-