diff --git a/Makefile b/Makefile
index 20eb6a28..d421d62a 100644
--- a/Makefile
+++ b/Makefile
@@ -513,11 +513,11 @@ CLIENT_OBJS_ := \
 
 ifeq ($(OSTYPE), Windows)
 CLIENT_OBJS_ += \
-	src/windows/mem.o \
-	src/windows/network.o \
-	src/windows/qal.o \
-	src/windows/system.o \
-    src/windows/vid.o	
+	src/backends/windows/mem.o \
+	src/backends/windows/network.o \
+	src/backends/windows/qal.o \
+	src/backends/windows/system.o \
+    src/backends/windows/vid.o	
 else
 CLIENT_OBJS_ += \
 	src/backends/unix/hunk.o \
@@ -565,9 +565,9 @@ SERVER_OBJS_ := \
 
 ifeq ($(OSTYPE), Windows)
 SERVER_OBJS_ += \
-	src/windows/mem.o \
-	src/windows/network.o \
-	src/windows/system.o	
+	src/backends/windows/mem.o \
+	src/backends/windows/network.o \
+	src/backends/windows/system.o	
 else
 SERVER_OBJS_ += \
 	src/backends/unix/hunk.o \
@@ -605,8 +605,8 @@ OPENGL_OBJS_ = \
 
 ifeq ($(OSTYPE), Windows)
 OPENGL_OBJS_ += \
-	src/windows/mem.o \
-	src/windows/qgl.o
+	src/backends/windows/mem.o \
+	src/backends/windows/qgl.o
 else
 OPENGL_OBJS_ += \
 	src/backends/unix/hunk.o \
diff --git a/src/windows/header/glwindow.h b/src/backends/windows/header/glwindow.h
similarity index 100%
rename from src/windows/header/glwindow.h
rename to src/backends/windows/header/glwindow.h
diff --git a/src/windows/header/qal.h b/src/backends/windows/header/qal.h
similarity index 100%
rename from src/windows/header/qal.h
rename to src/backends/windows/header/qal.h
diff --git a/src/windows/header/resource.h b/src/backends/windows/header/resource.h
similarity index 100%
rename from src/windows/header/resource.h
rename to src/backends/windows/header/resource.h
diff --git a/src/windows/header/winquake.h b/src/backends/windows/header/winquake.h
similarity index 100%
rename from src/windows/header/winquake.h
rename to src/backends/windows/header/winquake.h
diff --git a/src/windows/mem.c b/src/backends/windows/mem.c
similarity index 98%
rename from src/windows/mem.c
rename to src/backends/windows/mem.c
index dfb2e667..33b08fa3 100644
--- a/src/windows/mem.c
+++ b/src/backends/windows/mem.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "../common/header/common.h"
+#include "../../common/header/common.h"
 #include "header/winquake.h"
 
 byte *membase;
diff --git a/src/windows/network.c b/src/backends/windows/network.c
similarity index 99%
rename from src/windows/network.c
rename to src/backends/windows/network.c
index d0a6bb7f..801b294a 100644
--- a/src/windows/network.c
+++ b/src/backends/windows/network.c
@@ -30,7 +30,7 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <wsipx.h>
-#include "../common/header/common.h"
+#include "../../common/header/common.h"
 
 #define MAX_LOOPBACK 4
 #define QUAKE2MCAST "ff12::666"
diff --git a/src/windows/qal.c b/src/backends/windows/qal.c
similarity index 99%
rename from src/windows/qal.c
rename to src/backends/windows/qal.c
index 828ca784..a1af59bc 100644
--- a/src/windows/qal.c
+++ b/src/backends/windows/qal.c
@@ -36,7 +36,7 @@
 #include <AL/alext.h>
 #include <windows.h>
 
-#include "../common/header/common.h"
+#include "../../common/header/common.h"
 #include "header/qal.h"
 
 #define GPA(a) (void *)GetProcAddress(handle, a)
diff --git a/src/windows/qgl.c b/src/backends/windows/qgl.c
similarity index 99%
rename from src/windows/qgl.c
rename to src/backends/windows/qgl.c
index 9f78953a..9be915ad 100644
--- a/src/windows/qgl.c
+++ b/src/backends/windows/qgl.c
@@ -30,7 +30,7 @@
  */
 
 #include <float.h>
-#include "../refresh/header/local.h"
+#include "../../refresh/header/local.h"
 #include "header/glwindow.h"
 
 int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *);
diff --git a/src/windows/system.c b/src/backends/windows/system.c
similarity index 99%
rename from src/windows/system.c
rename to src/backends/windows/system.c
index 76321eb8..d22df7f3 100644
--- a/src/windows/system.c
+++ b/src/backends/windows/system.c
@@ -34,7 +34,7 @@
 #include <conio.h>
 #include <shlobj.h>
 
-#include "../common/header/common.h"
+#include "../../common/header/common.h"
 #include "header/resource.h"
 #include "header/winquake.h"
 
diff --git a/src/windows/vid.c b/src/backends/windows/vid.c
similarity index 99%
rename from src/windows/vid.c
rename to src/backends/windows/vid.c
index 138933e7..f6394f38 100644
--- a/src/windows/vid.c
+++ b/src/backends/windows/vid.c
@@ -35,9 +35,9 @@
 #include <assert.h>
 #include <float.h>
 
-#include "../common/header/common.h"
+#include "../../common/header/common.h"
 #include "header/winquake.h"
-#include "../client/header/client.h"
+#include "../../client/header/client.h"
 
 /* Structure containing functions
  * exported from refresh DLL */
diff --git a/src/client/sound/snd_al.c b/src/client/sound/snd_al.c
index 4ddb73d5..e6475a90 100644
--- a/src/client/sound/snd_al.c
+++ b/src/client/sound/snd_al.c
@@ -35,7 +35,7 @@
 #include "header/vorbis.h"
 
 #ifdef _WIN32
- #include "../../windows/header/qal.h"
+ #include "../../backends/windows/header/qal.h"
 #else
  #include "../../backends/unix/header/qal.h"
 #endif
diff --git a/src/client/sound/snd_dma.c b/src/client/sound/snd_dma.c
index c7306fae..96f681cc 100644
--- a/src/client/sound/snd_dma.c
+++ b/src/client/sound/snd_dma.c
@@ -31,7 +31,7 @@
 #include "header/vorbis.h"
 
 #ifdef _WIN32
- #include "../../windows/header/qal.h"
+ #include "../../backends/windows/header/qal.h"
 #else
  #include "../../backends/unix/header/qal.h"
 #endif