7 files changed, 29 insertions, 7 deletions
diff --git a/backends/midi/adlib.cpp b/backends/midi/adlib.cpp
index c1559d0765..5198609796 100644
--- a/backends/midi/adlib.cpp
+++ b/backends/midi/adlib.cpp
@@ -22,7 +22,7 @@
 #include "sound/mididrv.h"
 #include "sound/fmopl.h"
 #include "sound/mixer.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/engine.h"	// for g_system
 #include "common/util.h"
 
 #define BASE_FREQ 250
diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp
index 6671bacdd6..d425a24ec8 100644
--- a/backends/midi/alsa.cpp
+++ b/backends/midi/alsa.cpp
@@ -28,7 +28,7 @@
 #include "sound/mpu401.h"
 
 #include "stdafx.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/util.h"
 #include <alsa/asoundlib.h>
 
 /*
diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp
index b5181f098c..9e32b6293d 100644
--- a/backends/midi/morphos.cpp
+++ b/backends/midi/morphos.cpp
@@ -31,7 +31,8 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h" // For warning/error/debug
+#include "common/engine.h"	// for g_system
+#include "common/util.h"
 #include "morphos.h"
 #include "morphos_sound.h"
 
diff --git a/backends/midi/quicktime.cpp b/backends/midi/quicktime.cpp
index f1187bd01c..bbc8d7c320 100644
--- a/backends/midi/quicktime.cpp
+++ b/backends/midi/quicktime.cpp
@@ -22,7 +22,7 @@
 
 
 #include "sound/mpu401.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/util.h"
 
 #if defined(MACOSX)
 #include <QuickTime/QuickTimeComponents.h>
diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp
index 2fab845887..ce74c36e28 100644
--- a/backends/midi/seq.cpp
+++ b/backends/midi/seq.cpp
@@ -29,7 +29,7 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/util.h"
 
 ////////////////////////////////////////
 //
diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp
index 319997d6c5..138952529d 100644
--- a/backends/midi/windows.cpp
+++ b/backends/midi/windows.cpp
@@ -22,7 +22,7 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h" // For warning/error/debug
+#include "common/util.h"
 
 ////////////////////////////////////////
 //
diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp
index 72f73b0b8f..c779d73ade 100644
--- a/backends/midi/ypa1.cpp
+++ b/backends/midi/ypa1.cpp
@@ -1,6 +1,27 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2003 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ */
+
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/engine.h"	// for g_system
+#include "common/util.h"
 
 #include "Pa1Lib.h"