From 1595bf30c6ab48f435ec80927023a06b498c80f1 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 23 Aug 2019 08:31:49 +0200
Subject: [PATCH] Revert "- removed a few redundant includes"

This reverts commit 7cd5bd97737a5c40b89abc52f3149b177c03eaee.

This commit was only meant for testing, not for publishing
---
 src/sound/mididevices/music_win_mididevice.cpp | 1 +
 src/sound/music/i_music.h                      | 1 +
 src/sound/music/i_musicinterns.h               | 1 +
 src/sound/timidity/instrum_dls.cpp             | 1 +
 src/sound/timidity/instrum_sf2.cpp             | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/sound/mididevices/music_win_mididevice.cpp b/src/sound/mididevices/music_win_mididevice.cpp
index 1bc42116e..94c8a0b36 100644
--- a/src/sound/mididevices/music_win_mididevice.cpp
+++ b/src/sound/mididevices/music_win_mididevice.cpp
@@ -42,6 +42,7 @@
 
 #include "i_musicinterns.h"
 #include "templates.h"
+#include "doomdef.h"
 #include "m_swap.h"
 #include "doomerrors.h"
 
diff --git a/src/sound/music/i_music.h b/src/sound/music/i_music.h
index 714cbd95f..421bf1355 100644
--- a/src/sound/music/i_music.h
+++ b/src/sound/music/i_music.h
@@ -34,6 +34,7 @@
 #ifndef __I_MUSIC_H__
 #define __I_MUSIC_H__
 
+#include "doomdef.h"
 #include "i_soundinternal.h"
 
 class FileReader;
diff --git a/src/sound/music/i_musicinterns.h b/src/sound/music/i_musicinterns.h
index 53d2b81a7..09bba62dc 100644
--- a/src/sound/music/i_musicinterns.h
+++ b/src/sound/music/i_musicinterns.h
@@ -5,6 +5,7 @@
 #include "mus2midi.h"
 #include "i_sound.h"
 #include "i_music.h"
+#include "s_sound.h"
 #include "files.h"
 #include "wildmidi/wildmidi_lib.h"
 #include "midisources/midisource.h"
diff --git a/src/sound/timidity/instrum_dls.cpp b/src/sound/timidity/instrum_dls.cpp
index 1ddf66607..bc6b5b5d2 100644
--- a/src/sound/timidity/instrum_dls.cpp
+++ b/src/sound/timidity/instrum_dls.cpp
@@ -26,6 +26,7 @@
 #include <math.h>
 
 #include "timidity.h"
+#include "doomdef.h"
 
 #define __Sound_SetError(x)
 
diff --git a/src/sound/timidity/instrum_sf2.cpp b/src/sound/timidity/instrum_sf2.cpp
index 87b5ee4be..3f50f1575 100644
--- a/src/sound/timidity/instrum_sf2.cpp
+++ b/src/sound/timidity/instrum_sf2.cpp
@@ -4,6 +4,7 @@
 #include <math.h>
 #include <memory>
 
+#include "doomdef.h"
 #include "m_swap.h"
 #include "templates.h"
 #include "timidity.h"