diff --git a/server/Makefile.am b/server/Makefile.am
index 9eb5f448..a7a8d9f2 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -93,8 +93,8 @@ libserver_la_SOURCES =				\
 	red-common.h				\
 	dispatcher.c				\
 	dispatcher.h				\
-	red-dispatcher.c			\
-	red-dispatcher.h			\
+	red-qxl.c				\
+	red-qxl.h				\
 	main-dispatcher.c			\
 	main-dispatcher.h			\
 	migration-protocol.h		\
diff --git a/server/agent-msg-filter.c b/server/agent-msg-filter.c
index d72a3e4f..a6aee9e3 100644
--- a/server/agent-msg-filter.c
+++ b/server/agent-msg-filter.c
@@ -25,7 +25,7 @@
 #include "red-common.h"
 #include "agent-msg-filter.h"
 #include "reds.h"
-#include "red-dispatcher.h"
+#include "red-qxl.h"
 
 void agent_msg_filter_init(struct AgentMsgFilter *filter,
                            gboolean copy_paste, gboolean file_xfer,
diff --git a/server/display-channel.h b/server/display-channel.h
index cf40edd7..1bccd220 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -33,7 +33,7 @@
 #include "red-record-qxl.h"
 #include "demarshallers.h"
 #include "red-channel.h"
-#include "red-dispatcher.h"
+#include "red-qxl.h"
 #include "dispatcher.h"
 #include "main-channel.h"
 #include "migration-protocol.h"
diff --git a/server/red-dispatcher.c b/server/red-qxl.c
similarity index 99%
rename from server/red-dispatcher.c
rename to server/red-qxl.c
index 7718458c..42edd64a 100644
--- a/server/red-dispatcher.c
+++ b/server/red-qxl.c
@@ -37,7 +37,7 @@
 #include "dispatcher.h"
 #include "red-parse-qxl.h"
 
-#include "red-dispatcher.h"
+#include "red-qxl.h"
 
 
 struct AsyncCommand {
diff --git a/server/red-dispatcher.h b/server/red-qxl.h
similarity index 100%
rename from server/red-dispatcher.h
rename to server/red-qxl.h
diff --git a/server/red-worker.h b/server/red-worker.h
index b22d41de..e51e2613 100644
--- a/server/red-worker.h
+++ b/server/red-worker.h
@@ -19,7 +19,7 @@
 #define _H_REDWORKER
 
 #include "red-common.h"
-#include "red-dispatcher.h"
+#include "red-qxl.h"
 #include "red-parse-qxl.h"
 
 typedef struct RedWorker RedWorker;
diff --git a/server/reds.c b/server/reds.c
index b8f8cbc8..ab923e90 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -57,7 +57,7 @@
 #include "agent-msg-filter.h"
 #include "inputs-channel.h"
 #include "main-channel.h"
-#include "red-dispatcher.h"
+#include "red-qxl.h"
 #include "main-dispatcher.h"
 #include "sound.h"
 #include "stat.h"
diff --git a/server/sound.c b/server/sound.c
index 6d64ad2e..1aa3a746 100644
--- a/server/sound.c
+++ b/server/sound.c
@@ -33,7 +33,7 @@
 #include "red-common.h"
 #include "main-channel.h"
 #include "reds.h"
-#include "red-dispatcher.h"
+#include "red-qxl.h"
 #include "sound.h"
 #include "common/snd_codec.h"
 #include "demarshallers.h"