diff --git a/src/Fade.cpp b/src/Fade.cpp
index aa479fdb..15f6a874 100644
--- a/src/Fade.cpp
+++ b/src/Fade.cpp
@@ -2,12 +2,26 @@
 
 #include <string.h>
 
+#include "CommonDefines.h"
 #include "WindowsWrapper.h"
 
 #include "Draw.h"
 #include "Game.h"
 
-FADE gFade;
+#define FADE_WIDTH	(((WINDOW_WIDTH - 1) / 16) + 1)
+#define FADE_HEIGHT	(((WINDOW_HEIGHT - 1) / 16) + 1)
+
+struct FADE
+{
+	int mode;
+	BOOL bMask;
+	int count;
+	char ani_no[FADE_HEIGHT][FADE_WIDTH];
+	BOOLEAN flag[FADE_HEIGHT][FADE_WIDTH];
+	char dir;
+};
+
+static FADE gFade;
 static unsigned long mask_color;
 
 void InitFade()
diff --git a/src/Fade.h b/src/Fade.h
index 44747945..793372e7 100644
--- a/src/Fade.h
+++ b/src/Fade.h
@@ -1,21 +1,7 @@
 #pragma once
 
-#include "CommonDefines.h"
 #include "WindowsWrapper.h"
 
-#define FADE_WIDTH	(((WINDOW_WIDTH - 1) >> 4) + 1)
-#define FADE_HEIGHT	(((WINDOW_HEIGHT - 1) >> 4) + 1)
-
-struct FADE
-{
-	int mode;
-	BOOL bMask;
-	int count;
-	char ani_no[FADE_HEIGHT][FADE_WIDTH];
-	BOOLEAN flag[FADE_HEIGHT][FADE_WIDTH];
-	char dir;
-};
-
 void InitFade();
 void SetFadeMask();
 void ClearFade();