diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8011d20..bb5bd757 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,6 @@ endif()
 
 set(Backends-Generic-Source
 	${BACKENDS_SRC_DIR}/generic/misc.c
-	${BACKENDS_SRC_DIR}/generic/qal.c
 	${BACKENDS_SRC_DIR}/generic/vid.c
 
 	${BACKENDS_SRC_DIR}/sdl/input.c
@@ -174,7 +173,6 @@ set(Backends-Generic-Source
 
 set(Backends-Generic-Header
 	${BACKENDS_SRC_DIR}/generic/header/input.h
-	${BACKENDS_SRC_DIR}/generic/header/qal.h
 	)
 
 set(Backends-Unix-Source
@@ -323,6 +321,7 @@ set(Client-Source
 	${CLIENT_SRC_DIR}/menu/videomenu.c
 	${CLIENT_SRC_DIR}/sound/ogg.c
 	${CLIENT_SRC_DIR}/sound/openal.c
+	${CLIENT_SRC_DIR}/sound/qal.c
 	${CLIENT_SRC_DIR}/sound/sound.c
 	${CLIENT_SRC_DIR}/sound/wave.c
 	${COMMON_SRC_DIR}/argproc.c
@@ -366,6 +365,7 @@ set(Client-Header
 	${CLIENT_SRC_DIR}/header/vid.h
 	${CLIENT_SRC_DIR}/menu/header/qmenu.h
 	${CLIENT_SRC_DIR}/sound/header/local.h
+	${CLIENT_SRC_DIR}/sound/header/qal.h
 	${CLIENT_SRC_DIR}/sound/header/sound.h
 	${CLIENT_SRC_DIR}/sound/header/vorbis.h
 	${COMMON_SRC_DIR}/header/common.h
diff --git a/Makefile b/Makefile
index 7e4c8e24..e83a038c 100755
--- a/Makefile
+++ b/Makefile
@@ -691,7 +691,6 @@ GAME_OBJS_ = \
 # Used by the client
 CLIENT_OBJS_ := \
 	src/backends/generic/misc.o \
-	src/backends/generic/qal.o \
 	src/backends/generic/vid.o \
 	src/backends/sdl/input.o \
 	src/backends/sdl/refresh.o \
@@ -718,6 +717,7 @@ CLIENT_OBJS_ := \
 	src/client/menu/videomenu.o \
 	src/client/sound/ogg.o \
 	src/client/sound/openal.o \
+	src/client/sound/qal.o \
 	src/client/sound/sound.o \
 	src/client/sound/wave.o \
 	src/common/argproc.o \
diff --git a/src/backends/generic/header/qal.h b/src/client/sound/header/qal.h
similarity index 100%
rename from src/backends/generic/header/qal.h
rename to src/client/sound/header/qal.h
diff --git a/src/client/sound/openal.c b/src/client/sound/openal.c
index 9d2679ce..1b97fc24 100644
--- a/src/client/sound/openal.c
+++ b/src/client/sound/openal.c
@@ -35,8 +35,8 @@
 #ifdef USE_OPENAL
 
 #include "../header/client.h"
-#include "../../backends/generic/header/qal.h"
 #include "header/local.h"
+#include "header/qal.h"
 #include "header/vorbis.h"
 
 /* translates from AL coordinate system to quake */
diff --git a/src/backends/generic/qal.c b/src/client/sound/qal.c
similarity index 100%
rename from src/backends/generic/qal.c
rename to src/client/sound/qal.c
diff --git a/src/client/sound/sound.c b/src/client/sound/sound.c
index f5ca6164..33d89b70 100644
--- a/src/client/sound/sound.c
+++ b/src/client/sound/sound.c
@@ -29,8 +29,8 @@
  */
 
 #include "../header/client.h"
-#include "../../backends/generic/header/qal.h"
 #include "header/local.h"
+#include "header/qal.h"
 #include "header/vorbis.h"
 
 /* During registration it is possible to have more sounds