Shuffled around AgiGameID's declaration and an include to get stuff hopefully working now with GCC too.

svn-id: r28616

engines/agi/agi.h

@@ -88,6 +88,26 @@ typedef signed int Err;
 #define ADD_PIC 1
 #define ADD_VIEW 2
 
+enum AgiGameID {
+	GID_AGIDEMO,
+	GID_BC,
+	GID_DDP,
+	GID_GOLDRUSH,
+	GID_KQ1,
+	GID_KQ2,
+	GID_KQ3,
+	GID_KQ4,
+	GID_LSL1,
+	GID_MH1,
+	GID_MH2,
+	GID_MIXEDUP,
+	GID_PQ1,
+	GID_SQ1,
+	GID_SQ2,
+	GID_XMASCARD,
+	GID_FANMADE		// TODO: Should this be extended to include all fanmade games?
+};
+
 } // End of namespace Agi
 
 /* AGI resources */
@@ -116,26 +136,6 @@ enum AgiGameFeatures {
 	GF_ESCPAUSE =	 (1 << 8)
 };
 
-enum AgiGameID {
-	GID_AGIDEMO,
-	GID_BC,
-	GID_DDP,
-	GID_GOLDRUSH,
-	GID_KQ1,
-	GID_KQ2,
-	GID_KQ3,
-	GID_KQ4,
-	GID_LSL1,
-	GID_MH1,
-	GID_MH2,
-	GID_MIXEDUP,
-	GID_PQ1,
-	GID_SQ1,
-	GID_SQ2,
-	GID_XMASCARD,
-	GID_FANMADE		// TODO: Should this be extended to include all fanmade games?
-};
-
 struct AGIGameDescription;
 
 enum {

engines/agi/sound.h

@@ -26,13 +26,12 @@
 #ifndef AGI_SOUND_H
 #define AGI_SOUND_H
 
+#include "agi/agi.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
 namespace Agi {
 
-enum AgiGameID; // Forward declaration because agi.h has this but includes sound.h first
-
 #define BUFFER_SIZE	410
 
 #define SOUND_EMU_NONE	0