diff --git a/include/automatable_slider.h b/include/automatable_slider.h
index df73ef483..a0a5bf512 100644
--- a/include/automatable_slider.h
+++ b/include/automatable_slider.h
@@ -27,7 +27,6 @@
 #define _AUTOMATABLE_SLIDER_H
 
 #include <QtGui/QSlider>
-#include <QtXml/QDomElement>
 
 #include "automatable_model_view.h"
 
diff --git a/include/effect.h b/include/effect.h
index 25f176b2c..40c6e27a0 100644
--- a/include/effect.h
+++ b/include/effect.h
@@ -27,8 +27,6 @@
 #ifndef _EFFECT_H
 #define _EFFECT_H
 
-#include <Qt/QtXml>
-
 #include "plugin.h"
 #include "engine.h"
 #include "mixer.h"
diff --git a/include/meter_model.h b/include/meter_model.h
index ee3bd153a..f606cfba6 100644
--- a/include/meter_model.h
+++ b/include/meter_model.h
@@ -25,7 +25,7 @@
 #ifndef _METER_MODEL_H
 #define _METER_MODEL_H
 
-#include "lcd_spinbox.h"
+#include "automatable_model.h"
 
 
 class meterModel : public model
@@ -46,8 +46,8 @@ public:
 
 
 private:
-	lcdSpinBoxModel m_numeratorModel;
-	lcdSpinBoxModel m_denominatorModel;
+	intModel m_numeratorModel;
+	intModel m_denominatorModel;
 
 
 	friend class meterDialog;
diff --git a/include/mmp.h b/include/mmp.h
index 1e840376e..5e717e7b4 100644
--- a/include/mmp.h
+++ b/include/mmp.h
@@ -26,7 +26,7 @@
 #ifndef _MMP_H
 #define _MMP_H
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "export.h"
 #include "types.h"
diff --git a/include/pch.h b/include/pch.h
index 6d258d342..67aa73033 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _PCH_H_hsd
-#define _PCH_H_hsd
+#ifndef _PCH_H
+#define _PCH_H
 
 #include <Qt/QtCore>
 #include <Qt/QtGui>
diff --git a/include/song.h b/include/song.h
index ff508579a..285b6416a 100644
--- a/include/song.h
+++ b/include/song.h
@@ -30,8 +30,6 @@
 
 #include "track_container.h"
 #include "automatable_model.h"
-#include "automatable_slider.h"
-#include "lcd_spinbox.h"
 #include "controller.h"
 #include "meter_model.h"
 
@@ -259,11 +257,11 @@ private:
 
 	automationTrack * m_globalAutomationTrack;
 
-	lcdSpinBoxModel m_tempoModel;
+	intModel m_tempoModel;
 	meterModel m_timeSigModel;
 	int m_oldTicksPerTact;
-	sliderModel m_masterVolumeModel;
-	sliderModel m_masterPitchModel;
+	intModel m_masterVolumeModel;
+	intModel m_masterPitchModel;
 
 	controllerVector m_controllers;
 
diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
index 03bdeb6da..c8adb77f2 100644
--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -25,7 +25,7 @@
 
 #include <QtGui/QPainter>
 #include <QtGui/QBitmap>
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtCore/QFileInfo>
 #include <QtGui/QDropEvent>
 
diff --git a/plugins/bass_booster/bassbooster_controls.cpp b/plugins/bass_booster/bassbooster_controls.cpp
index 1ea963844..240c857fe 100644
--- a/plugins/bass_booster/bassbooster_controls.cpp
+++ b/plugins/bass_booster/bassbooster_controls.cpp
@@ -23,6 +23,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "bassbooster_controls.h"
 #include "bass_booster.h"
 
diff --git a/plugins/flp_import/flp_import.cpp b/plugins/flp_import/flp_import.cpp
index 1a2129bb5..1da1ac1c1 100644
--- a/plugins/flp_import/flp_import.cpp
+++ b/plugins/flp_import/flp_import.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtGui/QApplication>
 #include <QtGui/QProgressDialog>
 #include <QtCore/QDir>
diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp
index dd4e4ed39..4ab1dfe1c 100644
--- a/plugins/kicker/kicker.cpp
+++ b/plugins/kicker/kicker.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtGui/QPainter>
 
 #include "kicker.h"
diff --git a/plugins/ladspa_effect/ladspa_controls.cpp b/plugins/ladspa_effect/ladspa_controls.cpp
index b2a3e0c75..1461d25ba 100644
--- a/plugins/ladspa_effect/ladspa_controls.cpp
+++ b/plugins/ladspa_effect/ladspa_controls.cpp
@@ -23,6 +23,7 @@
  */
 
 
+#include <QtXml/QDomElement>
 
 #include "ladspa_effect.h"
 
diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp
index 81eec47af..919efa5a0 100644
--- a/plugins/lb302/lb302.cpp
+++ b/plugins/lb302/lb302.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "lb302.h"
 #include "engine.h"
diff --git a/plugins/lb303/lb303.cpp b/plugins/lb303/lb303.cpp
index 68e9abd7b..578f0287b 100644
--- a/plugins/lb303/lb303.cpp
+++ b/plugins/lb303/lb303.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "lb303.h"
 #include "engine.h"
diff --git a/plugins/midi_import/midi_import.cpp b/plugins/midi_import/midi_import.cpp
index b9e41d91a..1eac93460 100644
--- a/plugins/midi_import/midi_import.cpp
+++ b/plugins/midi_import/midi_import.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtCore/QDir>
 #include <QtGui/QApplication>
 #include <QtGui/QProgressDialog>
diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp
index 9853b7add..9c1c24670 100644
--- a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp
+++ b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+
+#include <QtXml/QDomElement>
+
 #include "peak_controller.h"
 #include "peak_controller_effect_controls.h"
 #include "peak_controller_effect.h"
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index dfff2560d..e78799a7a 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -26,7 +26,7 @@
 #include <QtGui/QLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QFileDialog>
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "sf2_player.h"
 #include "engine.h"
diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.cpp b/plugins/stereo_enhancer/stereoenhancer_controls.cpp
index 48c329dd8..f3f1b6623 100644
--- a/plugins/stereo_enhancer/stereoenhancer_controls.cpp
+++ b/plugins/stereo_enhancer/stereoenhancer_controls.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+
+#include <QtXml/QDomElement>
+
 #include "stereoenhancer_controls.h"
 #include "stereo_enhancer.h"
 
diff --git a/plugins/stereo_matrix/stereomatrix_controls.cpp b/plugins/stereo_matrix/stereomatrix_controls.cpp
index d089c2fd2..a0f5d430f 100644
--- a/plugins/stereo_matrix/stereomatrix_controls.cpp
+++ b/plugins/stereo_matrix/stereomatrix_controls.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+
+#include <QtXml/QDomElement>
+
 #include "stereomatrix_controls.h"
 #include "stereo_matrix.h"
 
diff --git a/plugins/triple_oscillator/triple_oscillator.cpp b/plugins/triple_oscillator/triple_oscillator.cpp
index 71f231f8f..a9e328179 100644
--- a/plugins/triple_oscillator/triple_oscillator.cpp
+++ b/plugins/triple_oscillator/triple_oscillator.cpp
@@ -23,7 +23,7 @@
  */
  
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtGui/QBitmap>
 #include <QtGui/QPainter>
 
diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp
index 62d874bd7..f11673b8e 100644
--- a/plugins/vibed/vibed.cpp
+++ b/plugins/vibed/vibed.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtCore/QMap>
 #include <QtGui/QWhatsThis>
 
diff --git a/plugins/vst_base/lvsl_client.cpp b/plugins/vst_base/lvsl_client.cpp
index cab04d9f6..1b12d01a0 100644
--- a/plugins/vst_base/lvsl_client.cpp
+++ b/plugins/vst_base/lvsl_client.cpp
@@ -26,13 +26,16 @@
 #include "lvsl_client.h"
 #include "lmmsconfig.h"
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QEventLoop>
 #include <QtCore/QLocale>
 #include <QtCore/QTime>
-#include <QtCore/QDir>
 #include <QtGui/QMdiArea>
 #include <QtGui/QMdiSubWindow>
 #include <QtGui/QX11EmbedContainer>
 #include <QtGui/QX11Info>
+#include <QtXml/QDomDocument>
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/plugins/vst_base/lvsl_client.h b/plugins/vst_base/lvsl_client.h
index 7a6640b59..7ec34e31d 100644
--- a/plugins/vst_base/lvsl_client.h
+++ b/plugins/vst_base/lvsl_client.h
@@ -29,7 +29,6 @@
 #include <QtCore/QString>
 #include <QtCore/QMutex>
 #include <QtGui/QWidget>
-#include <Qt/QtXml>
 
 #include "mixer.h"
 #include "communication.h"
diff --git a/plugins/vst_effect/vst_effect_controls.cpp b/plugins/vst_effect/vst_effect_controls.cpp
index e1cefff8b..aac673d1b 100755
--- a/plugins/vst_effect/vst_effect_controls.cpp
+++ b/plugins/vst_effect/vst_effect_controls.cpp
@@ -23,6 +23,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "vst_effect_controls.h"
 #include "vst_effect.h"
 
diff --git a/src/core/automatable_model.cpp b/src/core/automatable_model.cpp
index de58e19c9..a743873b3 100644
--- a/src/core/automatable_model.cpp
+++ b/src/core/automatable_model.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "automatable_model.h"
diff --git a/src/core/automation_pattern.cpp b/src/core/automation_pattern.cpp
index a269eced3..db71d2661 100644
--- a/src/core/automation_pattern.cpp
+++ b/src/core/automation_pattern.cpp
@@ -27,7 +27,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>
 
diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index 06185bb45..097d82fb0 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtGui/QMessageBox>
diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index 2ad01ddc8..b0e14a6ad 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -25,7 +25,7 @@
  *
  */
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
diff --git a/src/core/controller_connection.cpp b/src/core/controller_connection.cpp
index 4a1c5e4a7..e6367c16b 100644
--- a/src/core/controller_connection.cpp
+++ b/src/core/controller_connection.cpp
@@ -25,7 +25,7 @@
  *
  */
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
diff --git a/src/core/effect.cpp b/src/core/effect.cpp
index bc083a1fa..70d02980b 100644
--- a/src/core/effect.cpp
+++ b/src/core/effect.cpp
@@ -26,6 +26,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "effect.h"
 #include "engine.h"
 #include "dummy_effect.h"
diff --git a/src/core/effect_chain.cpp b/src/core/effect_chain.cpp
index 4c95733f3..d51fe001e 100644
--- a/src/core/effect_chain.cpp
+++ b/src/core/effect_chain.cpp
@@ -26,6 +26,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "effect_chain.h"
 #include "effect.h"
 #include "engine.h"
diff --git a/src/core/fx_mixer.cpp b/src/core/fx_mixer.cpp
index 8b88f496c..4d36e5ac9 100644
--- a/src/core/fx_mixer.cpp
+++ b/src/core/fx_mixer.cpp
@@ -25,6 +25,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "fx_mixer.h"
 #include "effect.h"
 #include "song.h"
diff --git a/src/core/inline_automation.cpp b/src/core/inline_automation.cpp
index 936033256..da85a139d 100644
--- a/src/core/inline_automation.cpp
+++ b/src/core/inline_automation.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "inline_automation.h"
 
diff --git a/src/core/instrument_functions.cpp b/src/core/instrument_functions.cpp
index 8ffe89781..4de8bf6f5 100644
--- a/src/core/instrument_functions.cpp
+++ b/src/core/instrument_functions.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "instrument_functions.h"
diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp
index 4072123b3..0c3989223 100644
--- a/src/core/instrument_sound_shaping.cpp
+++ b/src/core/instrument_sound_shaping.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "instrument_sound_shaping.h"
diff --git a/src/core/journalling_object.cpp b/src/core/journalling_object.cpp
index bd8b44c3f..36a685a48 100644
--- a/src/core/journalling_object.cpp
+++ b/src/core/journalling_object.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "journalling_object.h"
 #include "project_journal.h"
diff --git a/src/core/lfo_controller.cpp b/src/core/lfo_controller.cpp
index 1ba074d06..538fcee7b 100644
--- a/src/core/lfo_controller.cpp
+++ b/src/core/lfo_controller.cpp
@@ -26,7 +26,7 @@
  */
 
 #include <math.h>
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
diff --git a/src/core/midi/midi_controller.cpp b/src/core/midi/midi_controller.cpp
index 02c54d6f2..519ebd3fe 100644
--- a/src/core/midi/midi_controller.cpp
+++ b/src/core/midi/midi_controller.cpp
@@ -25,7 +25,7 @@
  *
  */
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
diff --git a/src/core/midi/midi_port.cpp b/src/core/midi/midi_port.cpp
index ec7f9ce68..110f8309c 100644
--- a/src/core/midi/midi_port.cpp
+++ b/src/core/midi/midi_port.cpp
@@ -26,7 +26,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "midi_port.h"
 #include "midi_client.h"
diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp
index 3261f3eac..17c0ad18a 100644
--- a/src/core/mmp.cpp
+++ b/src/core/mmp.cpp
@@ -30,6 +30,7 @@
 #include <math.h>
 
 #include <QtCore/QFile>
+#include <QtCore/QTextStream>
 #include <QtGui/QMessageBox>
 
 
diff --git a/src/core/note.cpp b/src/core/note.cpp
index 8e13e947a..c527ec99a 100644
--- a/src/core/note.cpp
+++ b/src/core/note.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include <math.h>
 
diff --git a/src/core/peak_controller.cpp b/src/core/peak_controller.cpp
index 311a2dd38..9ac7977fa 100644
--- a/src/core/peak_controller.cpp
+++ b/src/core/peak_controller.cpp
@@ -26,7 +26,7 @@
  */
 
 #include <math.h>
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
diff --git a/src/core/serializing_object.cpp b/src/core/serializing_object.cpp
index 37754002a..dc622dfb1 100644
--- a/src/core/serializing_object.cpp
+++ b/src/core/serializing_object.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "serializing_object.h"
 
diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp
index 22958faf4..3e922024a 100644
--- a/src/core/surround_area.cpp
+++ b/src/core/surround_area.cpp
@@ -32,7 +32,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "caption_menu.h"
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index 3fd622389..6d8c052e7 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QTimer>
 #include <QtGui/QApplication>
 #include <QtGui/QLayout>
diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp
index 33e013dc0..412bcb1e9 100644
--- a/src/core/track_container.cpp
+++ b/src/core/track_container.cpp
@@ -26,6 +26,7 @@
 
 #include <QtGui/QApplication>
 #include <QtGui/QProgressDialog>
+#include <QtXml/QDomElement>
 
 #include "track_container.h"
 #include "instrument_track.h"
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 374622097..5270abb62 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -25,7 +25,8 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
+#include <QtCore/QUrl>
 #include <QtGui/QApplication>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QDesktopServices>
diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp
index 34fdd4a01..7caf8386f 100644
--- a/src/gui/song_editor.cpp
+++ b/src/gui/song_editor.cpp
@@ -36,9 +36,11 @@
 #include <math.h>
 
 #include "song_editor.h"
+#include "automatable_slider.h"
+#include "combobox.h"
 #include "cpuload_widget.h"
 #include "embed.h"
-#include "combobox.h"
+#include "lcd_spinbox.h"
 #include "main_window.h"
 #include "meter_dialog.h"
 #include "mmp.h"
diff --git a/src/gui/widgets/meter_dialog.cpp b/src/gui/widgets/meter_dialog.cpp
index 86b625063..dceb467c3 100644
--- a/src/gui/widgets/meter_dialog.cpp
+++ b/src/gui/widgets/meter_dialog.cpp
@@ -1,6 +1,7 @@
 /*
  * meter_dialog.cpp - dialog for entering meter settings
  *
+ * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/yahoo.com>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
@@ -22,6 +23,7 @@
  *
  */
 
+
 #include <QtGui/QLayout>
 #include <QtGui/QPushButton>
 #include <QtGui/QLabel>
@@ -30,6 +32,7 @@
 #include "meter_model.h"
 #include "embed.h"
 #include "gui_templates.h"
+#include "lcd_spinbox.h"
 
 
 meterDialog::meterDialog( QWidget * _parent, bool _simple ) :
diff --git a/src/gui/widgets/tempo_sync_knob.cpp b/src/gui/widgets/tempo_sync_knob.cpp
index deca81384..aa1af7fa1 100644
--- a/src/gui/widgets/tempo_sync_knob.cpp
+++ b/src/gui/widgets/tempo_sync_knob.cpp
@@ -30,6 +30,7 @@
 
 #include <QtGui/QMouseEvent>
 #include <QtGui/QMdiArea>
+#include <QtXml/QDomElement>
 
 #include "engine.h"
 #include "caption_menu.h"
diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp
index d619bed18..902a3283e 100644
--- a/src/tracks/bb_track.cpp
+++ b/src/tracks/bb_track.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtGui/QColorDialog>
 #include <QtGui/QMenu>
 #include <QtGui/QPainter>
diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp
index e023e6250..023479fcf 100644
--- a/src/tracks/instrument_track.cpp
+++ b/src/tracks/instrument_track.cpp
@@ -26,9 +26,6 @@
  */
 
 
-#include "instrument_track.h"
-
-
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QQueue>
@@ -44,7 +41,7 @@
 #include <QtGui/QMdiSubWindow>
 #include <QtGui/QPainter>
 
-
+#include "instrument_track.h"
 #include "audio_port.h"
 #include "automation_pattern.h"
 #include "bb_track.h"
@@ -63,6 +60,7 @@
 #include "instrument.h"
 #include "instrument_function_views.h"
 #include "instrument_midi_io_view.h"
+#include "lcd_spinbox.h"
 #include "led_checkbox.h"
 #include "main_window.h"
 #include "midi_client.h"
diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp
index de65c4874..558e72811 100644
--- a/src/tracks/pattern.cpp
+++ b/src/tracks/pattern.cpp
@@ -26,7 +26,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QTimer>
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>
diff --git a/src/tracks/sample_track.cpp b/src/tracks/sample_track.cpp
index 23795af4e..85698c362 100644
--- a/src/tracks/sample_track.cpp
+++ b/src/tracks/sample_track.cpp
@@ -26,7 +26,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtGui/QDropEvent>
 #include <QtGui/QLayout>
 #include <QtGui/QMdiArea>