diff --git a/source.list b/source.list
index 27535eb1a1..f4313ec7ed 100644
--- a/source.list
+++ b/source.list
@@ -991,7 +991,6 @@ blitter/8bpp_optimized.hpp
 blitter/8bpp_simple.cpp
 blitter/8bpp_simple.hpp
 #end
-blitter/base.cpp
 blitter/base.hpp
 blitter/factory.hpp
 blitter/null.cpp
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index 890e2fecd0..65030b40ba 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -322,6 +322,24 @@ void Blitter_32bppAnim::SetPixel(void *video, int x, int y, uint8 colour)
 	this->anim_buf[this->ScreenToAnimOffset((uint32 *)video) + x + y * this->anim_buf_pitch] = colour | (DEFAULT_BRIGHTNESS << 8);
 }
 
+void Blitter_32bppAnim::DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash)
+{
+	const Colour c = LookupColourInPalette(colour);
+
+	if (_screen_disable_anim)  {
+		this->DrawLineGeneric(x, y, x2, y2, screen_width, screen_height, width, dash, [&](int x, int y) {
+			*((Colour *)video + x + y * _screen.pitch) = c;
+		});
+	} else {
+		uint16 * const offset_anim_buf = this->anim_buf + this->ScreenToAnimOffset((uint32 *)video);
+		const uint16 anim_colour = colour | (DEFAULT_BRIGHTNESS << 8);
+		this->DrawLineGeneric(x, y, x2, y2, screen_width, screen_height, width, dash, [&](int x, int y) {
+			*((Colour *)video + x + y * _screen.pitch) = c;
+			offset_anim_buf[x + y * this->anim_buf_pitch] = anim_colour;
+		});
+	}
+}
+
 void Blitter_32bppAnim::SetLine(void *video, int x, int y, uint8 *colours, uint width)
 {
 	Colour *dst = (Colour *)video + x + y * _screen.pitch;
diff --git a/src/blitter/32bpp_anim.hpp b/src/blitter/32bpp_anim.hpp
index c1b6b0804e..58fb16490b 100644
--- a/src/blitter/32bpp_anim.hpp
+++ b/src/blitter/32bpp_anim.hpp
@@ -40,6 +40,7 @@ public:
 	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
 	/* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal);
 	/* virtual */ void SetPixel(void *video, int x, int y, uint8 colour);
+	/* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash);
 	/* virtual */ void SetLine(void *video, int x, int y, uint8 *colours, uint width);
 	/* virtual */ void SetLine32(void *video, int x, int y, uint32 *colours, uint width);
 	/* virtual */ void DrawRect(void *video, int width, int height, uint8 colour);
diff --git a/src/blitter/32bpp_base.cpp b/src/blitter/32bpp_base.cpp
index c5486f7a44..f0f4cd04ab 100644
--- a/src/blitter/32bpp_base.cpp
+++ b/src/blitter/32bpp_base.cpp
@@ -24,6 +24,14 @@ void Blitter_32bppBase::SetPixel(void *video, int x, int y, uint8 colour)
 	*((Colour *)video + x + y * _screen.pitch) = LookupColourInPalette(colour);
 }
 
+void Blitter_32bppBase::DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash)
+{
+	const Colour c = LookupColourInPalette(colour);
+	this->DrawLineGeneric(x, y, x2, y2, screen_width, screen_height, width, dash, [=](int x, int y) {
+		*((Colour *)video + x + y * _screen.pitch) = c;
+	});
+}
+
 void Blitter_32bppBase::SetLine(void *video, int x, int y, uint8 *colours, uint width)
 {
 	Colour *dst = (Colour *)video + x + y * _screen.pitch;
diff --git a/src/blitter/32bpp_base.hpp b/src/blitter/32bpp_base.hpp
index 9a3c848991..3fde4e6fdc 100644
--- a/src/blitter/32bpp_base.hpp
+++ b/src/blitter/32bpp_base.hpp
@@ -23,6 +23,7 @@ public:
 	/* virtual */ uint8 GetScreenDepth() { return 32; }
 	/* virtual */ void *MoveTo(void *video, int x, int y);
 	/* virtual */ void SetPixel(void *video, int x, int y, uint8 colour);
+	/* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash);
 	/* virtual */ void SetLine(void *video, int x, int y, uint8 *colours, uint width);
 	/* virtual */ void SetLine32(void *video, int x, int y, uint32 *colours, uint width);
 	/* virtual */ void DrawRect(void *video, int width, int height, uint8 colour);
diff --git a/src/blitter/8bpp_base.cpp b/src/blitter/8bpp_base.cpp
index 12150eb6af..a599ddc77a 100644
--- a/src/blitter/8bpp_base.cpp
+++ b/src/blitter/8bpp_base.cpp
@@ -35,6 +35,13 @@ void Blitter_8bppBase::SetPixel(void *video, int x, int y, uint8 colour)
 	*((uint8 *)video + x + y * _screen.pitch) = colour;
 }
 
+void Blitter_8bppBase::DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash)
+{
+	this->DrawLineGeneric(x, y, x2, y2, screen_width, screen_height, width, dash, [=](int x, int y) {
+		*((uint8 *)video + x + y * _screen.pitch) = colour;
+	});
+}
+
 void Blitter_8bppBase::SetLine(void *video, int x, int y, uint8 *colours, uint width)
 {
 	memcpy((uint8 *)video + x + y * _screen.pitch, colours, width * sizeof(uint8));
diff --git a/src/blitter/8bpp_base.hpp b/src/blitter/8bpp_base.hpp
index a99f1180aa..e7e8db9607 100644
--- a/src/blitter/8bpp_base.hpp
+++ b/src/blitter/8bpp_base.hpp
@@ -21,6 +21,7 @@ public:
 	/* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal);
 	/* virtual */ void *MoveTo(void *video, int x, int y);
 	/* virtual */ void SetPixel(void *video, int x, int y, uint8 colour);
+	/* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash);
 	/* virtual */ void SetLine(void *video, int x, int y, uint8 *colours, uint width);
 	/* virtual */ void DrawRect(void *video, int width, int height, uint8 colour);
 	/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height);
diff --git a/src/blitter/base.cpp b/src/blitter/base.cpp
deleted file mode 100644
index e83df2e714..0000000000
--- a/src/blitter/base.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file base.cpp Implementation of the base for all blitters. */
-
-#include "../stdafx.h"
-#include "base.hpp"
-#include "../core/math_func.hpp"
-
-#include "../safeguards.h"
-
-void Blitter::DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash)
-{
-	int dy;
-	int dx;
-	int stepx;
-	int stepy;
-
-	dy = (y2 - y) * 2;
-	if (dy < 0) {
-		dy = -dy;
-		stepy = -1;
-	} else {
-		stepy = 1;
-	}
-
-	dx = (x2 - x) * 2;
-	if (dx < 0) {
-		dx = -dx;
-		stepx = -1;
-	} else {
-		stepx = 1;
-	}
-
-	if (dx == 0 && dy == 0) {
-		/* The algorithm below cannot handle this special case; make it work at least for line width 1 */
-		if (x >= 0 && x < screen_width && y >= 0 && y < screen_height) this->SetPixel(video, x, y, colour);
-		return;
-	}
-
-	int frac_diff = width * max(dx, dy);
-	if (width > 1) {
-		/* compute frac_diff = width * sqrt(dx*dx + dy*dy)
-		 * Start interval:
-		 *    max(dx, dy) <= sqrt(dx*dx + dy*dy) <= sqrt(2) * max(dx, dy) <= 3/2 * max(dx, dy) */
-		int frac_sq = width * width * (dx * dx + dy * dy);
-		int frac_max = 3 * frac_diff / 2;
-		while (frac_diff < frac_max) {
-			int frac_test = (frac_diff + frac_max) / 2;
-			if (frac_test * frac_test < frac_sq) {
-				frac_diff = frac_test + 1;
-			} else {
-				frac_max = frac_test - 1;
-			}
-		}
-	}
-
-	int gap = dash;
-	if (dash == 0) dash = 1;
-	int dash_count = 0;
-	if (dx > dy) {
-		int y_low     = y;
-		int y_high    = y;
-		int frac_low  = dy - frac_diff / 2;
-		int frac_high = dy + frac_diff / 2;
-
-		while (frac_low + dx / 2 < 0) {
-			frac_low += dx;
-			y_low -= stepy;
-		}
-		while (frac_high - dx / 2 >= 0) {
-			frac_high -= dx;
-			y_high += stepy;
-		}
-		x2 += stepx;
-
-		while (x != x2) {
-			if (dash_count < dash && x >= 0 && x < screen_width) {
-				for (int y = y_low; y != y_high; y += stepy) {
-					if (y >= 0 && y < screen_height) this->SetPixel(video, x, y, colour);
-				}
-			}
-			if (frac_low >= 0) {
-				y_low += stepy;
-				frac_low -= dx;
-			}
-			if (frac_high >= 0) {
-				y_high += stepy;
-				frac_high -= dx;
-			}
-			x += stepx;
-			frac_low += dy;
-			frac_high += dy;
-			if (++dash_count >= dash + gap) dash_count = 0;
-		}
-	} else {
-		int x_low     = x;
-		int x_high    = x;
-		int frac_low  = dx - frac_diff / 2;
-		int frac_high = dx + frac_diff / 2;
-
-		while (frac_low + dy / 2 < 0) {
-			frac_low += dy;
-			x_low -= stepx;
-		}
-		while (frac_high - dy / 2 >= 0) {
-			frac_high -= dy;
-			x_high += stepx;
-		}
-		y2 += stepy;
-
-		while (y != y2) {
-			if (dash_count < dash && y >= 0 && y < screen_height) {
-				for (int x = x_low; x != x_high; x += stepx) {
-					if (x >= 0 && x < screen_width) this->SetPixel(video, x, y, colour);
-				}
-			}
-			if (frac_low >= 0) {
-				x_low += stepx;
-				frac_low -= dy;
-			}
-			if (frac_high >= 0) {
-				x_high += stepx;
-				frac_high -= dy;
-			}
-			y += stepy;
-			frac_low += dx;
-			frac_high += dx;
-			if (++dash_count >= dash + gap) dash_count = 0;
-		}
-	}
-}
diff --git a/src/blitter/base.hpp b/src/blitter/base.hpp
index a699c5a2d0..6c176f41c8 100644
--- a/src/blitter/base.hpp
+++ b/src/blitter/base.hpp
@@ -14,6 +14,7 @@
 
 #include "../spritecache.h"
 #include "../spriteloader/spriteloader.hpp"
+#include "../core/math_func.hpp"
 
 /** The modes of blitting we can do. */
 enum BlitterMode {
@@ -142,7 +143,7 @@ public:
 	 * @param width Line width.
 	 * @param dash Length of dashes for dashed lines. 0 means solid line.
 	 */
-	virtual void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash = 0);
+	virtual void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash = 0) = 0;
 
 	/**
 	 * Copy from a buffer to the screen.
@@ -223,6 +224,131 @@ public:
 	virtual void PostResize() { };
 
 	virtual ~Blitter() { }
+
+	template <typename SetPixelT> void DrawLineGeneric(int x, int y, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel);
 };
 
+template <typename SetPixelT>
+void Blitter::DrawLineGeneric(int x, int y, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel)
+{
+	int dy;
+	int dx;
+	int stepx;
+	int stepy;
+
+	dy = (y2 - y) * 2;
+	if (dy < 0) {
+		dy = -dy;
+		stepy = -1;
+	} else {
+		stepy = 1;
+	}
+
+	dx = (x2 - x) * 2;
+	if (dx < 0) {
+		dx = -dx;
+		stepx = -1;
+	} else {
+		stepx = 1;
+	}
+
+	if (dx == 0 && dy == 0) {
+		/* The algorithm below cannot handle this special case; make it work at least for line width 1 */
+		if (x >= 0 && x < screen_width && y >= 0 && y < screen_height) set_pixel(x, y);
+		return;
+	}
+
+	int frac_diff = width * max(dx, dy);
+	if (width > 1) {
+		/* compute frac_diff = width * sqrt(dx*dx + dy*dy)
+		 * Start interval:
+		 *    max(dx, dy) <= sqrt(dx*dx + dy*dy) <= sqrt(2) * max(dx, dy) <= 3/2 * max(dx, dy) */
+		int frac_sq = width * width * (dx * dx + dy * dy);
+		int frac_max = 3 * frac_diff / 2;
+		while (frac_diff < frac_max) {
+			int frac_test = (frac_diff + frac_max) / 2;
+			if (frac_test * frac_test < frac_sq) {
+				frac_diff = frac_test + 1;
+			} else {
+				frac_max = frac_test - 1;
+			}
+		}
+	}
+
+	int gap = dash;
+	if (dash == 0) dash = 1;
+	int dash_count = 0;
+	if (dx > dy) {
+		int y_low     = y;
+		int y_high    = y;
+		int frac_low  = dy - frac_diff / 2;
+		int frac_high = dy + frac_diff / 2;
+
+		while (frac_low + dx / 2 < 0) {
+			frac_low += dx;
+			y_low -= stepy;
+		}
+		while (frac_high - dx / 2 >= 0) {
+			frac_high -= dx;
+			y_high += stepy;
+		}
+		x2 += stepx;
+
+		while (x != x2) {
+			if (dash_count < dash && x >= 0 && x < screen_width) {
+				for (int y = y_low; y != y_high; y += stepy) {
+					if (y >= 0 && y < screen_height) set_pixel(x, y);
+				}
+			}
+			if (frac_low >= 0) {
+				y_low += stepy;
+				frac_low -= dx;
+			}
+			if (frac_high >= 0) {
+				y_high += stepy;
+				frac_high -= dx;
+			}
+			x += stepx;
+			frac_low += dy;
+			frac_high += dy;
+			if (++dash_count >= dash + gap) dash_count = 0;
+		}
+	} else {
+		int x_low     = x;
+		int x_high    = x;
+		int frac_low  = dx - frac_diff / 2;
+		int frac_high = dx + frac_diff / 2;
+
+		while (frac_low + dy / 2 < 0) {
+			frac_low += dy;
+			x_low -= stepx;
+		}
+		while (frac_high - dy / 2 >= 0) {
+			frac_high -= dy;
+			x_high += stepx;
+		}
+		y2 += stepy;
+
+		while (y != y2) {
+			if (dash_count < dash && y >= 0 && y < screen_height) {
+				for (int x = x_low; x != x_high; x += stepx) {
+					if (x >= 0 && x < screen_width) set_pixel(x, y);
+				}
+			}
+			if (frac_low >= 0) {
+				x_low += stepx;
+				frac_low -= dy;
+			}
+			if (frac_high >= 0) {
+				x_high += stepx;
+				frac_high -= dy;
+			}
+			y += stepy;
+			frac_low += dx;
+			frac_high += dx;
+			if (++dash_count >= dash + gap) dash_count = 0;
+		}
+	}
+}
+
 #endif /* BLITTER_BASE_HPP */