diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp
index 9f90e46e5e..84a334d8b0 100644
--- a/src/servers/app/drawing/Painter/Painter.cpp
+++ b/src/servers/app/drawing/Painter/Painter.cpp
@@ -22,7 +22,6 @@
 #include "AGGTextRenderer.h"
 #include "DrawingMode.h"
 #include "DrawingModeFactory.h"
-#include "FontManager.h"
 #include "PatternHandler.h"
 #include "RenderingBuffer.h"
 #include "ShapeConverter.h"
diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
index 7c945cc205..d5d3001818 100644
--- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
+++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
@@ -244,14 +244,6 @@ AGGTextRenderer::RenderString(const char* string,
 				}
 				if (glyphBounds.IsValid())
 					bounds = bounds.IsValid() ? bounds | glyphBounds : glyphBounds;
-				else {
-					if (bounds.IsValid()) {
-						bounds.right += glyph->advance_x;
-						bounds.bottom += glyph->advance_y;
-					} else {
-						bounds.Set(0.0, 0.0, glyph->advance_x, glyph->advance_y);
-					}
-				}
 
 				// increment pen position
 				advanceX = glyph->advance_x;
diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
index 1ba2e17fbb..c11b959908 100644
--- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
+++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
@@ -10,7 +10,7 @@
 #include "agg_font_freetype.h"
 #include "defines.h"
 
-#include "TextRenderer.h"
+#include "Transformable.h"
 
 class ServerFont;