diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e5ecf22b..992e8bb14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -707,7 +707,6 @@ add_executable( zdoom WIN32
 	p_xlat.cpp
 	parsecontext.cpp
 	po_man.cpp
-	r_anim.cpp
 	r_bsp.cpp
 	r_data.cpp
 	r_draw.cpp
@@ -840,6 +839,8 @@ add_executable( zdoom WIN32
 	sound/music_timidity_mididevice.cpp
 	sound/music_win_mididevice.cpp
 	sound/music_pseudo_mididevice.cpp
+	textures/animations.cpp
+	textures/anim_switches.cpp
 	textures/automaptexture.cpp
 	textures/bitmap.cpp
 	textures/buildtexture.cpp
diff --git a/src/p_switch.cpp b/src/p_switch.cpp
index 02adc913c..622fd6394 100644
--- a/src/p_switch.cpp
+++ b/src/p_switch.cpp
@@ -346,7 +346,7 @@ void DActiveButton::Tick ()
 				def = TexMan.GetSwitch(def->PairIndex);
 				m_Frame = 65535;
 				S_Sound (m_X, m_Y, 0, CHAN_VOICE|CHAN_LISTENERZ,
-					def->Sound != 0 ? def->Sound : FSoundID("switches/normbutn"),
+					def->Sound != 0 ? FSoundID(def->Sound) : FSoundID("switches/normbutn"),
 					1, ATTN_STATIC);
 				bFlippable = false;
 			}