diff --git a/src/v_draw.hpp b/src/v_draw.hpp
index 8e04cc1c7..f283b25cd 100644
--- a/src/v_draw.hpp
+++ b/src/v_draw.hpp
@@ -256,8 +256,8 @@ private:
 	static fixed_t font_width(Font font, INT32 flags, const char* string);
 };
 
-#include "v_draw_setter.hpp"
-
 }; // namespace srb2
 
+#include "v_draw_setter.hpp"
+
 #endif // __V_DRAW_HPP__
diff --git a/src/v_draw_setter.hpp b/src/v_draw_setter.hpp
index 1085d3087..11b0b3e96 100644
--- a/src/v_draw_setter.hpp
+++ b/src/v_draw_setter.hpp
@@ -12,6 +12,9 @@
 
 #include "r_draw.h" // R_GetTranslationColormap
 
+namespace srb2
+{
+
 inline Draw::Chain& Draw::Chain::x(float x)
 {
 	x_ += x;
@@ -115,4 +118,6 @@ inline Draw::Chain& Draw::Chain::colorize(skincolornum_t color)
 	return colormap(R_GetTranslationColormap(TC_RAINBOW, color, GTC_CACHE));
 }
 
+}; // namespace srb2
+
 #endif // __V_DRAW_SETTER_HPP__