diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index 5391957d9a8..d4abc34c277 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index eb26f81e930..75e61b4dfe8 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -29,7 +29,9 @@
  */
 
 #include "graphics/palette.h"
+
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 4ef3436492c..2b51e34463f 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -30,6 +30,8 @@
 
 #include "lab/lab.h"
 #include "lab/intro.h"
+#include "lab/music.h"
+
 
 namespace Lab {
 
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 71c5fc83d0f..47dc6713a7a 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 #include "lab/intro.h"
+#include "lab/music.h"
 
 namespace Lab {
 Intro::Intro(LabEngine *vm) : _vm(vm) {
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 4252033ba8f..9ff8ce5ba3c 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -34,6 +34,7 @@
 #include "gui/message.h"
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 93f3796eac9..52a8df9b103 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -37,7 +37,7 @@
 #include "lab/labfun.h"
 #include "lab/interface.h"
 #include "lab/eventman.h"
-#include "lab/music.h"
+//#include "lab/music.h"
 #include "lab/resource.h"
 #include "lab/anim.h"
 #include "lab/labsets.h"
@@ -47,6 +47,8 @@ struct ADGameDescription;
 
 namespace Lab {
 
+class Music;
+
 enum GameFeatures {
 	GF_LOWRES = 1 << 0,
 	GF_WINDOWS_TRIAL = 1 << 1
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 4406fae2d00..6d09a99739c 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index d1031a006ff..de4ac8ee0c3 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -31,6 +31,7 @@
 #include "audio/decoders/raw.h"
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index e541aa08d7c..8876740e1b8 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -31,6 +31,7 @@
 #include "gui/message.h"
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index b49afa02abe..d21efaff012 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index ee454bf70c5..f9eb0db87c2 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -34,6 +34,7 @@
 #include "gui/saveload.h"
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {
 
diff --git a/engines/lab/transitions.cpp b/engines/lab/transitions.cpp
index 14753fbc72f..aad9b3dd8e1 100644
--- a/engines/lab/transitions.cpp
+++ b/engines/lab/transitions.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/music.h"
 
 namespace Lab {