diff --git a/server/sound.cpp b/server/sound.cpp
index ace4a1f0..859c9c8b 100644
--- a/server/sound.cpp
+++ b/server/sound.cpp
@@ -73,10 +73,6 @@ struct PlaybackChannelClient;
 struct RecordChannelClient;
 struct AudioFrame;
 struct AudioFrameContainer;
-typedef struct SpicePlaybackState PlaybackChannel;
-#define PlaybackChannel SpicePlaybackState
-typedef struct SpiceRecordState RecordChannel;
-#define RecordChannel SpiceRecordState
 
 struct PersistentPipeItem: public RedPipeItem
 {
@@ -162,7 +158,7 @@ typedef struct SpiceVolumeState {
     int mute;
 } SpiceVolumeState;
 
-/* Base class for SpicePlaybackState and SpiceRecordState */
+/* Base class for PlaybackChannel and RecordChannel */
 struct SndChannel: public RedChannel
 {
     using RedChannel::RedChannel;
diff --git a/server/spice-wrapped.h b/server/spice-wrapped.h
index cfcbc227..769f652f 100644
--- a/server/spice-wrapped.h
+++ b/server/spice-wrapped.h
@@ -24,6 +24,8 @@
 #define SPICE_GNUC_DEPRECATED
 
 #define SpiceCharDeviceState RedCharDevice
+#define SpicePlaybackState PlaybackChannel
+#define SpiceRecordState RecordChannel
 
 #include "push-visibility.h"
 struct RedCharDevice;
@@ -33,3 +35,5 @@ struct SpiceCharDeviceInstance;
 #include "spice.h"
 
 #undef SpiceCharDeviceState
+#undef SpicePlaybackState
+#undef SpiceRecordState