diff --git a/src/Text/Renderer.cpp b/src/Text/Renderer.cpp
index a278e0d15..f72c8c224 100644
--- a/src/Text/Renderer.cpp
+++ b/src/Text/Renderer.cpp
@@ -32,6 +32,9 @@
 
 namespace Magnum { namespace Text {
 
+/** @todo Move duplicate code to layouter::renderGlyph(), the implementation
+    should be in doRenderGlyph() then */
+
 namespace {
 
 template<class T> void createIndices(void* output, const UnsignedInt glyphCount) {
diff --git a/src/Text/Renderer.h b/src/Text/Renderer.h
index 574de03a8..b1c5b8a9c 100644
--- a/src/Text/Renderer.h
+++ b/src/Text/Renderer.h
@@ -28,6 +28,10 @@
  * @brief Class @ref Magnum::Text::AbstractRenderer, @ref Magnum::Text::Renderer, typedef @ref Magnum::Text::Renderer2D, @ref Magnum::Text::Renderer3D
  */
 
+#include <string>
+#include <tuple>
+#include <vector>
+
 #include "Math/Geometry/Rectangle.h"
 #include "Buffer.h"
 #include "DimensionTraits.h"
@@ -36,10 +40,6 @@
 
 #include "magnumTextVisibility.h"
 
-#include <string>
-#include <tuple>
-#include <vector>
-
 namespace Magnum { namespace Text {
 
 /**