diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e55885b01..0bf300a18 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1126,6 +1126,7 @@ set (PCH_SOURCES
 	gamedata/textures/hires/hqresize.cpp
 	gamedata/textures/hires/hirestex.cpp
 	gamedata/fonts/singlelumpfont.cpp
+	gamedata/fonts/singlepicfont.cpp
 	gamedata/fonts/v_font.cpp
 	gamedata/fonts/v_text.cpp	
 	gamedata/p_xlat.cpp
diff --git a/src/gamedata/fonts/singlepicfont.cpp b/src/gamedata/fonts/singlepicfont.cpp
new file mode 100644
index 000000000..12daba081
--- /dev/null
+++ b/src/gamedata/fonts/singlepicfont.cpp
@@ -0,0 +1,127 @@
+/*
+** v_font.cpp
+** Font management
+**
+**---------------------------------------------------------------------------
+** Copyright 1998-2016 Randy Heit
+** Copyright 2005-2019 Christoph Oelckers
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+**    derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**---------------------------------------------------------------------------
+**
+*/
+
+#include "doomerrors.h"
+#include "textures.h"
+#include "v_font.h"
+#include "w_wad.h"
+
+class FSinglePicFont : public FFont
+{
+public:
+	FSinglePicFont(const char *picname);
+
+	// FFont interface
+	FTexture *GetChar(int code, int translation, int *const width, bool *redirected = nullptr) const override;
+	int GetCharWidth (int code) const;
+
+protected:
+	FTextureID PicNum;
+};
+
+//==========================================================================
+//
+// FSinglePicFont :: FSinglePicFont
+//
+// Creates a font to wrap a texture so that you can use hudmessage as if it
+// were a hudpic command. It does not support translation, but animation
+// is supported, unlike all the real fonts.
+//
+//==========================================================================
+
+FSinglePicFont::FSinglePicFont(const char *picname) :
+	FFont(-1) // Since lump is only needed for priority information we don't need to worry about this here.
+{
+	FTextureID picnum = TexMan.CheckForTexture (picname, ETextureType::Any);
+
+	if (!picnum.isValid())
+	{
+		I_FatalError ("%s is not a font or texture", picname);
+	}
+
+	FTexture *pic = TexMan.GetTexture(picnum);
+
+	FontName = picname;
+	FontHeight = pic->GetDisplayHeight();
+	SpaceWidth = pic->GetDisplayWidth();
+	GlobalKerning = 0;
+	FirstChar = LastChar = 'A';
+	ActiveColors = 0;
+	PicNum = picnum;
+
+	Next = FirstFont;
+	FirstFont = this;
+}
+
+//==========================================================================
+//
+// FSinglePicFont :: GetChar
+//
+// Returns the texture if code is 'a' or 'A', otherwise nullptr.
+//
+//==========================================================================
+
+FTexture *FSinglePicFont::GetChar (int code, int translation, int *const width, bool *redirected) const
+{
+	*width = SpaceWidth;
+	if (redirected) *redirected = false;
+	if (code == 'a' || code == 'A')
+	{
+		return TexMan.GetPalettedTexture(PicNum, true);
+	}
+	else
+	{
+		return nullptr;
+	}
+}
+
+//==========================================================================
+//
+// FSinglePicFont :: GetCharWidth
+//
+// Don't expect the text functions to work properly if I actually allowed
+// the character width to vary depending on the animation frame.
+//
+//==========================================================================
+
+int FSinglePicFont::GetCharWidth (int code) const
+{
+	return SpaceWidth;
+}
+
+FFont *CreateSinglePicFont(const char *picname)
+{
+	return new FSinglePicFont(picname);
+}
diff --git a/src/gamedata/fonts/v_font.cpp b/src/gamedata/fonts/v_font.cpp
index 8fdf150bd..6a1dc1f70 100644
--- a/src/gamedata/fonts/v_font.cpp
+++ b/src/gamedata/fonts/v_font.cpp
@@ -71,19 +71,6 @@ struct TranslationMap
 	int Number;
 };
 
-class FSinglePicFont : public FFont
-{
-public:
-	FSinglePicFont(const char *picname);
-
-	// FFont interface
-	FTexture *GetChar(int code, int translation, int *const width, bool *redirected = nullptr) const override;
-	int GetCharWidth (int code) const;
-
-protected:
-	FTextureID PicNum;
-};
-
 // Essentially a normal multilump font but with an explicit list of character patches
 class FSpecialFont : public FFont
 {
@@ -924,7 +911,8 @@ FFont *V_GetFont(const char *name, const char *fontlumpname)
 			FTexture *tex = TexMan.GetTexture(picnum);
 			if (tex && tex->GetSourceLump() >= folderfile)
 			{
-				return new FSinglePicFont (name);
+				FFont *CreateSinglePicFont(const char *name);
+				return CreateSinglePicFont (name);
 			}
 		}
 		if (folderdata.Size() > 0)
@@ -1664,76 +1652,6 @@ FFont::FFont (int lump)
 	for (auto &p : PatchRemap) p = pp++;
 }
 
-//==========================================================================
-//
-// FSinglePicFont :: FSinglePicFont
-//
-// Creates a font to wrap a texture so that you can use hudmessage as if it
-// were a hudpic command. It does not support translation, but animation
-// is supported, unlike all the real fonts.
-//
-//==========================================================================
-
-FSinglePicFont::FSinglePicFont(const char *picname) :
-	FFont(-1) // Since lump is only needed for priority information we don't need to worry about this here.
-{
-	FTextureID picnum = TexMan.CheckForTexture (picname, ETextureType::Any);
-
-	if (!picnum.isValid())
-	{
-		I_FatalError ("%s is not a font or texture", picname);
-	}
-
-	FTexture *pic = TexMan.GetTexture(picnum);
-
-	FontName = picname;
-	FontHeight = pic->GetDisplayHeight();
-	SpaceWidth = pic->GetDisplayWidth();
-	GlobalKerning = 0;
-	FirstChar = LastChar = 'A';
-	ActiveColors = 0;
-	PicNum = picnum;
-
-	Next = FirstFont;
-	FirstFont = this;
-}
-
-//==========================================================================
-//
-// FSinglePicFont :: GetChar
-//
-// Returns the texture if code is 'a' or 'A', otherwise nullptr.
-//
-//==========================================================================
-
-FTexture *FSinglePicFont::GetChar (int code, int translation, int *const width, bool *redirected) const
-{
-	*width = SpaceWidth;
-	if (redirected) *redirected = false;
-	if (code == 'a' || code == 'A')
-	{
-		return TexMan.GetPalettedTexture(PicNum, true);
-	}
-	else
-	{
-		return nullptr;
-	}
-}
-
-//==========================================================================
-//
-// FSinglePicFont :: GetCharWidth
-//
-// Don't expect the text functions to work properly if I actually allowed
-// the character width to vary depending on the animation frame.
-//
-//==========================================================================
-
-int FSinglePicFont::GetCharWidth (int code) const
-{
-	return SpaceWidth;
-}
-
 //==========================================================================
 //
 // FSpecialFont :: FSpecialFont