diff --git a/src/geometry/debug_font_buffer.cpp b/src/geometry/debug_font_buffer.cpp
index 3c858cf60..6c233f88d 100644
--- a/src/geometry/debug_font_buffer.cpp
+++ b/src/geometry/debug_font_buffer.cpp
@@ -3,7 +3,7 @@
 #include <cmath>
 #include <cstring>
 
-#include "debug_font.cpp"
+#include "debug_font_data.hpp"
 
 using namespace mbgl;
 
diff --git a/src/geometry/debug_font.cpp b/src/geometry/debug_font_data.hpp
similarity index 99%
rename from src/geometry/debug_font.cpp
rename to src/geometry/debug_font_data.hpp
index 7e69246fd..26c54cb48 100644
--- a/src/geometry/debug_font.cpp
+++ b/src/geometry/debug_font_data.hpp
@@ -1,3 +1,5 @@
+// This is an implementation file, so omit include guards.
+
 #include <cstdint>
 #include <map>