- removed Windows includes from two more files.

src/CMakeLists.txt

@@ -896,8 +896,6 @@ set( FASTMATH_SOURCES
 	polyrenderer/poly_all.cpp
 	sound/oplsynth/opl_mus_player.cpp
 	sound/fmodsound.cpp
-	sound/i_music.cpp
-	sound/i_sound.cpp
 	sound/mpg123_decoder.cpp
 	sound/music_midi_base.cpp
 	sound/oalsound.cpp
@@ -1228,6 +1226,8 @@ set (PCH_SOURCES
 	scripting/zscript/zcc_compile.cpp
 	scripting/zscript/zcc_parser.cpp
 	sfmt/SFMT.cpp
+	sound/i_music.cpp
+	sound/i_sound.cpp
 	sound/mididevices/music_opldumper_mididevice.cpp
 	sound/mididevices/music_opl_mididevice.cpp
 	sound/mididevices/music_pseudo_mididevice.cpp

src/sound/i_music.cpp

@@ -32,11 +32,7 @@
 **
 */
 
-#ifdef _WIN32
+#ifndef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <mmsystem.h>
-#else
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -44,7 +40,6 @@
 #include <signal.h>
 #include <unistd.h>
 #include <wordexp.h>
-#include <stdio.h>
 #include "mus2midi.h"
 extern void ChildSigHandler (int signum);
 #endif

src/sound/i_sound.cpp

@@ -32,15 +32,6 @@
 **
 */
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <mmsystem.h>
-#include "resource.h"
-extern HWND Window;
-extern HINSTANCE g_hInst;
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -48,7 +39,6 @@ extern HINSTANCE g_hInst;
 #include "doomtype.h"
 #include <math.h>
 
-#include "except.h"
 #include "fmodsound.h"
 #include "oalsound.h"
 

src/sound/musicformats/music_midistream.cpp

@@ -35,8 +35,6 @@
 // HEADER FILES ------------------------------------------------------------
 
 
-#include "i_midi_win32.h"
-
 #include "i_musicinterns.h"
 #include "templates.h"
 #include "doomdef.h"