diff --git a/plugins/audio_file_processor/Makefile.am b/plugins/audio_file_processor/Makefile.am
index cab582df6..3f7377abe 100644
--- a/plugins/audio_file_processor/Makefile.am
+++ b/plugins/audio_file_processor/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="audiofileprocessor"
diff --git a/plugins/bass_booster/Makefile.am b/plugins/bass_booster/Makefile.am
index 8d2efed35..39de20393 100644
--- a/plugins/bass_booster/Makefile.am
+++ b/plugins/bass_booster/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="bassbooster"
diff --git a/plugins/bit_invader/Makefile.am b/plugins/bit_invader/Makefile.am
index 95c017a51..8e8a3a1c8 100644
--- a/plugins/bit_invader/Makefile.am
+++ b/plugins/bit_invader/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="bitinvader"
diff --git a/plugins/flp_import/flp_import.cpp b/plugins/flp_import/flp_import.cpp
index e0f663cb9..f9c53d22c 100644
--- a/plugins/flp_import/flp_import.cpp
+++ b/plugins/flp_import/flp_import.cpp
@@ -31,8 +31,8 @@
 
 #include "flp_import.h"
 #include "basic_filters.h"
-#include "bb_editor.h"
 #include "bb_track.h"
+#include "bb_track_container.h"
 #include "combobox.h"
 #include "config_mgr.h"
 #include "debug.h"
diff --git a/plugins/kicker/Makefile.am b/plugins/kicker/Makefile.am
index c0fdeb773..147f8831b 100644
--- a/plugins/kicker/Makefile.am
+++ b/plugins/kicker/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="kicker"
diff --git a/plugins/ladspa_browser/Makefile.am b/plugins/ladspa_browser/Makefile.am
index bad9df9be..a0a148d4d 100644
--- a/plugins/ladspa_browser/Makefile.am
+++ b/plugins/ladspa_browser/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="ladspa_browser"
diff --git a/plugins/ladspa_effect/Makefile.am b/plugins/ladspa_effect/Makefile.am
index 5e969767e..eec271be3 100644
--- a/plugins/ladspa_effect/Makefile.am
+++ b/plugins/ladspa_effect/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = caps
 endif
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="ladspaeffect"
diff --git a/plugins/lb302/Makefile.am b/plugins/lb302/Makefile.am
index 68341194a..8b6a1e1ac 100644
--- a/plugins/lb302/Makefile.am
+++ b/plugins/lb302/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="lb302"
diff --git a/plugins/live_tool/Makefile.am b/plugins/live_tool/Makefile.am
index ecd8527a5..dfb52f14a 100644
--- a/plugins/live_tool/Makefile.am
+++ b/plugins/live_tool/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="live_tool"
diff --git a/plugins/live_tool/live_tool.cpp b/plugins/live_tool/live_tool.cpp
index ec2c771e1..74dcc4881 100644
--- a/plugins/live_tool/live_tool.cpp
+++ b/plugins/live_tool/live_tool.cpp
@@ -1,7 +1,7 @@
 /*
  * live_tool.cpp - tool for live performance
  *
- * Copyright (c) 2006-2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
+ * Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -23,12 +23,11 @@
  */
 
 
-#include "live_tool.h"
-
 #include <QtGui/QKeyEvent>
 #include <QtGui/QLayout>
 
-#include "bb_editor.h"
+#include "live_tool.h"
+#include "bb_track_container.h"
 #include "engine.h"
 #include "song.h"
 
diff --git a/plugins/organic/Makefile.am b/plugins/organic/Makefile.am
index 83fecf077..1b2d058c9 100644
--- a/plugins/organic/Makefile.am
+++ b/plugins/organic/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="organic"
diff --git a/plugins/patman/Makefile.am b/plugins/patman/Makefile.am
index e46770eff..bc6f207db 100644
--- a/plugins/patman/Makefile.am
+++ b/plugins/patman/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="patman"
diff --git a/plugins/polyb302/Makefile.am b/plugins/polyb302/Makefile.am
index bd94dece1..5c262f562 100644
--- a/plugins/polyb302/Makefile.am
+++ b/plugins/polyb302/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="polyb302"
diff --git a/plugins/sf2_player/Makefile.am b/plugins/sf2_player/Makefile.am
index 730da9a05..d77c83fc2 100644
--- a/plugins/sf2_player/Makefile.am
+++ b/plugins/sf2_player/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="sf2player"
diff --git a/plugins/singerbot/Makefile.am b/plugins/singerbot/Makefile.am
index 2fe42b81f..fd428490d 100644
--- a/plugins/singerbot/Makefile.am
+++ b/plugins/singerbot/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 
 INCLUDES = -I/usr/include/festival -I/usr/include/speech_tools	\
-	-I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+	-I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 CXXFLAGS += -Wno-non-template-friend
diff --git a/plugins/stereo_enhancer/Makefile.am b/plugins/stereo_enhancer/Makefile.am
index e64807721..f0ec7df49 100644
--- a/plugins/stereo_enhancer/Makefile.am
+++ b/plugins/stereo_enhancer/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="stereoenhancer"
diff --git a/plugins/stk/mallets/Makefile.am b/plugins/stk/mallets/Makefile.am
index 8e47f6432..950cd3b7b 100644
--- a/plugins/stk/mallets/Makefile.am
+++ b/plugins/stk/mallets/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I@stk_includes@ -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I@stk_includes@ -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="malletsstk"
diff --git a/plugins/triple_oscillator/Makefile.am b/plugins/triple_oscillator/Makefile.am
index f3dd80708..77f9a54c2 100644
--- a/plugins/triple_oscillator/Makefile.am
+++ b/plugins/triple_oscillator/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="tripleoscillator"
diff --git a/plugins/vestige/Makefile.am b/plugins/vestige/Makefile.am
index 3629fa97a..9e081aabf 100644
--- a/plugins/vestige/Makefile.am
+++ b/plugins/vestige/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I. -I../vst_base
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -I../vst_base
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vestige"
diff --git a/plugins/vibed/Makefile.am b/plugins/vibed/Makefile.am
index 5f1258c0b..db2195483 100644
--- a/plugins/vibed/Makefile.am
+++ b/plugins/vibed/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I.
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I.
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vibedstrings"
diff --git a/plugins/vst_effect/Makefile.am b/plugins/vst_effect/Makefile.am
index 81e4c4324..a4569b622 100644
--- a/plugins/vst_effect/Makefile.am
+++ b/plugins/vst_effect/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I. -I../vst_base/
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -I../vst_base/
 
 
 AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vsteffect"