diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp
index 0c790876a5..e5cd4b3ce1 100644
--- a/src/openrct2/drawing/Font.cpp
+++ b/src/openrct2/drawing/Font.cpp
@@ -20,7 +20,7 @@
 #include "../sprites.h"
 #include "drawing.h"
 #include "Font.h"
-#include "ttf.h"
+#include "TTF.h"
 
 static const sint32 SpriteFontLineHeight[] = { 6, 10, 10, 18 };
 
diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp
index cc2afd8be3..43288f5711 100644
--- a/src/openrct2/drawing/ScrollingText.cpp
+++ b/src/openrct2/drawing/ScrollingText.cpp
@@ -21,7 +21,7 @@
 #include "../paint/Paint.h"
 #include "../sprites.h"
 #include "drawing.h"
-#include "ttf.h"
+#include "TTF.h"
 
 #pragma pack(push, 1)
 /* size: 0xA12 */
diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/String.cpp
index b28ac91cd1..28506144ce 100644
--- a/src/openrct2/drawing/String.cpp
+++ b/src/openrct2/drawing/String.cpp
@@ -22,7 +22,7 @@
 #include "../platform/platform.h"
 #include "../sprites.h"
 #include "../util/Util.h"
-#include "ttf.h"
+#include "TTF.h"
 
 extern "C"
 {
diff --git a/src/openrct2/drawing/ttf.c b/src/openrct2/drawing/TTF.cpp
similarity index 99%
rename from src/openrct2/drawing/ttf.c
rename to src/openrct2/drawing/TTF.cpp
index 4853850ee5..54f90bb3ad 100644
--- a/src/openrct2/drawing/ttf.c
+++ b/src/openrct2/drawing/TTF.cpp
@@ -23,7 +23,10 @@
 #include "../localisation/localisation.h"
 #include "../OpenRCT2.h"
 #include "../platform/platform.h"
-#include "ttf.h"
+#include "TTF.h"
+
+extern "C"
+{
 
 static bool _ttfInitialised = false;
 
@@ -315,9 +318,14 @@ void ttf_free_surface(TTFSurface * surface)
     free(surface);
 }
 
+}
+
 #else
 
-#include "ttf.h"
+#include "TTF.h"
+
+extern "C"
+{
 
 bool ttf_initialise()
 {
@@ -328,4 +336,6 @@ void ttf_dispose()
 {
 }
 
+}
+
 #endif // NO_TTF
diff --git a/src/openrct2/drawing/ttf.h b/src/openrct2/drawing/TTF.h
similarity index 100%
rename from src/openrct2/drawing/ttf.h
rename to src/openrct2/drawing/TTF.h
diff --git a/src/openrct2/drawing/ttf_sdlport.c b/src/openrct2/drawing/ttf_sdlport.c
index 4a25b92737..ecf90de93d 100644
--- a/src/openrct2/drawing/ttf_sdlport.c
+++ b/src/openrct2/drawing/ttf_sdlport.c
@@ -39,7 +39,7 @@ misrepresented as being the original software.
 #include FT_GLYPH_H
 #include FT_TRUETYPE_IDS_H
 
-#include "ttf.h"
+#include "TTF.h"
 
 #pragma warning(disable : 4018) // '<': signed / unsigned mismatch
 
diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp
index 07b78432a3..b806c22110 100644
--- a/src/openrct2/interface/Fonts.cpp
+++ b/src/openrct2/interface/Fonts.cpp
@@ -22,7 +22,7 @@
 #include "FontFamilies.h"
 
 #include "../drawing/drawing.h"
-#include "../drawing/ttf.h"
+#include "../drawing/TTF.h"
 #include "../localisation/language.h"
 
 #ifndef NO_TTF
diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c
index cb1d855c0a..71efd82c0e 100644
--- a/src/openrct2/interface/console.c
+++ b/src/openrct2/interface/console.c
@@ -49,7 +49,7 @@
 #include "viewport.h"
 
 #ifndef NO_TTF
-#include "../drawing/ttf.h"
+#include "../drawing/TTF.h"
 #endif
 
 #define CONSOLE_BUFFER_SIZE 8192