diff --git a/src/common/2d/wipe.cpp b/src/common/2d/wipe.cpp
index 78079f47a..cc57ca29f 100644
--- a/src/common/2d/wipe.cpp
+++ b/src/common/2d/wipe.cpp
@@ -156,6 +156,23 @@ int wipe_CalcBurn (uint8_t *burnarray, int width, int height, int density)
 
 // TYPES -------------------------------------------------------------------
 
+class Wiper
+{
+protected:
+	FGameTexture* startScreen = nullptr, * endScreen = nullptr;
+public:
+	virtual ~Wiper();
+	virtual bool Run(int ticks) = 0;
+	virtual void SetTextures(FGameTexture* startscreen, FGameTexture* endscreen)
+	{
+		startScreen = startscreen;
+		endScreen = endscreen;
+	}
+
+	static Wiper* Create(int type);
+};
+
+
 class Wiper_Crossfade : public Wiper
 {
 public:
diff --git a/src/common/2d/wipe.h b/src/common/2d/wipe.h
index b87af09c2..08a7eeb3b 100644
--- a/src/common/2d/wipe.h
+++ b/src/common/2d/wipe.h
@@ -5,7 +5,6 @@
 #include <functional>
 
 class FTexture;
-int wipe_CalcBurn(uint8_t *buffer, int width, int height, int density);
 
 enum
 {
@@ -16,22 +15,6 @@ enum
 	wipe_NUMWIPES
 };
 
-class Wiper
-{
-protected:
-	FGameTexture *startScreen = nullptr, *endScreen = nullptr;
-public:
-	virtual ~Wiper();
-	virtual bool Run(int ticks) = 0;
-	virtual void SetTextures(FGameTexture *startscreen, FGameTexture *endscreen)
-	{
-		startScreen = startscreen;
-		endScreen = endscreen;
-	}
-	
-	static Wiper *Create(int type);
-};
-
 void PerformWipe(FTexture* startimg, FTexture* endimg, int wipe_type, bool stopsound, std::function<void()> overlaydrawer);