- moved the menu.h include from oalsound.h to oalsound.cpp.

The menu is a very 'dirty' header, and forcing it to be pulled in with something entirely unrelated is not good - even though only two files include oalsound.h.

src/sound/i_sound.cpp

@@ -46,6 +46,8 @@
 #include "i_music.h"
 #include "m_argv.h"
 #include "v_text.h"
+#include "c_cvars.h"
+#include "stats.h"
 
 EXTERN_CVAR (Float, snd_sfxvolume)
 CVAR (Int, snd_samplerate, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

src/sound/oalsound.cpp

@@ -44,6 +44,7 @@
 #include "i_music.h"
 #include "i_musicinterns.h"
 #include "cmdlib.h"
+#include "menu/menu.h"
 
 FModule OpenALModule{"OpenAL"};
 

src/sound/oalsound.h

@@ -9,7 +9,6 @@
 
 #include "i_sound.h"
 #include "s_sound.h"
-#include "menu/menu.h"
 
 #ifndef NO_OPENAL