diff --git a/ChangeLog b/ChangeLog
index 075e5b02b..dd55a792e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
+2006-04-10	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* most files:
+	Qt4-fixes:
+	- when including headers, specify qt-module too (QtCore, QtGui etc.)
+	- draw gradients using QLinearGradient etc.
+	- other opmizations (use QHash instead of QMap etc.)
+
 2006-04-10	Danny McRae	<khjklujn/at/users/dot/sourceforge/dot/net>
+
 	* Makefile.am:
 	* include/lmms_constants.h:
 	* include/basic_filters.h:
@@ -10,14 +19,14 @@
 	* src/audio/audio_alsa.cpp:
 	* src/audio/audio_file_wave.cpp:
 	corrected handling of big endian data
-	
+
 	* plugins/vibed/vibed.h:
 	* plugins/vibed/vibed.cpp:
 	* plugins/vibed/nine_button_selector.h:
 	* plugins/vibed/nine_button_selector.cpp:
-	-added octave to save and restore settings
-	-removed mysterious m_sampleBuffer that was causing seg faults in the
-	 deconstructor
+	- added octave to save and restore settings
+	- removed mysterious m_sampleBuffer that was causing seg faults in the
+	  deconstructor
 
 	* src/core/main_window.cpp:
 	added checks to handle "gimp like windows" for save and restore widget 
@@ -51,8 +60,8 @@
 	* data/presets/AudioFileProcessor/Bass-Mainia.cs.xml:
 	* data/presets/AudioFileProcessor/Fat-Reversed-Kick.cs.xml:
 	* data/presets/AudioFileProcessor/Kick-4-your-Subwoofer.cs.xml:
-	updated audiofileprocessors to point to factory presets files in /usr/local/share/lmms
-
+	updated audiofileprocessors to point to factory presets files in
+	/usr/local/share/lmms
 
 2006-04-09	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
diff --git a/configure.in b/configure.in
index 1c58e5bdf..2deda5148 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.1.4-cvs20060409, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060409)
+AC_INIT(lmms, 0.1.4-cvs20060410, tobydox/at/users/dot/sourceforge/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060410)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/include/automatable_object.h b/include/automatable_object.h
index c91803eec..b3a525a13 100755
--- a/include/automatable_object.h
+++ b/include/automatable_object.h
@@ -257,24 +257,24 @@ protected:
 	virtual void redoStep( journalEntry & _je )
 	{
 		saveJournallingState( FALSE );
-#ifndef QT3
+/*#ifndef QT3
 		setValue( static_cast<T>( value() +
 					_je.data().value<EDIT_STEP_TYPE>() ) );
-#else
+#else*/
 		setValue( static_cast<T>( value() + static_cast<EDIT_STEP_TYPE>(
 						_je.data().toDouble() ) ) );
-#endif
+//#endif
 		restoreJournallingState();
 	}
 
 	virtual void undoStep( journalEntry & _je )
 	{
 		journalEntry je( _je.actionID(),
-#ifndef QT3
+/*#ifndef QT3
 					-_je.data().value<EDIT_STEP_TYPE>()
-#else
+#else*/
 			static_cast<EDIT_STEP_TYPE>( -_je.data().toDouble() )
-#endif
+//#endif
 				);
 		redoStep( je );
 	}
diff --git a/include/cpuload_widget.h b/include/cpuload_widget.h
index a336f6829..b0fef0677 100644
--- a/include/cpuload_widget.h
+++ b/include/cpuload_widget.h
@@ -31,9 +31,9 @@
 
 #ifdef QT4
 
-#include <QtGui/QWidget>
+#include <QtCore/QTimer>
 #include <QtGui/QPixmap>
-#include <QTimer>
+#include <QtGui/QWidget>
 
 #else
 
diff --git a/include/fade_button.h b/include/fade_button.h
index aba22c657..bfce1bcd7 100644
--- a/include/fade_button.h
+++ b/include/fade_button.h
@@ -30,7 +30,7 @@
 
 #ifdef QT4
 
-#include <QAbstractButton>
+#include <QtGui/QAbstractButton>
 #include <QtGui/QColor>
 
 #else
diff --git a/include/file_browser.h b/include/file_browser.h
index d7894c578..a60881aea 100644
--- a/include/file_browser.h
+++ b/include/file_browser.h
@@ -35,7 +35,7 @@
 
 #ifdef QT4
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #else
 
diff --git a/include/kmultitabbar.h b/include/kmultitabbar.h
index 971be7ff4..90f47d77e 100644
--- a/include/kmultitabbar.h
+++ b/include/kmultitabbar.h
@@ -27,9 +27,9 @@
 
 #ifndef QT3
 
-#include <QLayout>
 #include <QtCore/QString>
 #include <QtCore/QList>
+#include <QtGui/QLayout>
 #include <QtGui/QPushButton>
 
 class QPixmap;
diff --git a/include/ladspa_manager.h b/include/ladspa_manager.h
index a3733166d..532697ba0 100644
--- a/include/ladspa_manager.h
+++ b/include/ladspa_manager.h
@@ -42,10 +42,10 @@
 
 #ifdef QT4
 
-#include <QtCore/QString>
-#include <QStringList>
 #include <QtCore/QMap>
 #include <QtCore/QPair>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #else
 
diff --git a/include/lmms_constants.h b/include/lmms_constants.h
index 0faf67d40..fa048dacb 100644
--- a/include/lmms_constants.h
+++ b/include/lmms_constants.h
@@ -21,10 +21,13 @@
  * Boston, MA 02111-1307, USA.
  *
  */
+
 #ifndef _LMMS_CONSTANTS_H
 #define _LMMS_CONSTANTS_H
 
 const float F_PI = 3.141593f;
 const float F_2PI = 6.283185f;
 const float F_PI_2 = 1.570796f;
+
 #endif
+
diff --git a/include/midi_alsa_seq.h b/include/midi_alsa_seq.h
index b2964a338..6f3f38dea 100644
--- a/include/midi_alsa_seq.h
+++ b/include/midi_alsa_seq.h
@@ -45,7 +45,7 @@
 #ifdef QT4
 
 #include <QtCore/QThread>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #else
 
diff --git a/include/midi_client.h b/include/midi_client.h
index ec34a3299..e094b912a 100644
--- a/include/midi_client.h
+++ b/include/midi_client.h
@@ -30,8 +30,8 @@
 
 #ifdef QT4
 
+#include <QtCore/QStringList>
 #include <QtCore/QVector>
-#include <QStringList>
 
 #else
 
diff --git a/include/name_label.h b/include/name_label.h
index bd8b7a884..058f34142 100644
--- a/include/name_label.h
+++ b/include/name_label.h
@@ -31,7 +31,7 @@
 
 #ifdef QT4
 
-#include <QLabel>
+#include <QtGui/QLabel>
 #include <QtGui/QPixmap>
 
 #else
diff --git a/include/plugin_browser.h b/include/plugin_browser.h
index 1942a3a52..de8df1f4b 100644
--- a/include/plugin_browser.h
+++ b/include/plugin_browser.h
@@ -35,9 +35,9 @@
 
 #ifdef QT4
 
+#include <QtCore/QTimer>
 #include <QtCore/QVector>
 #include <QtGui/QPixmap>
-#include <QTimer>
 
 #else
 
diff --git a/include/project_journal.h b/include/project_journal.h
index 6416d0b0a..53eef5961 100755
--- a/include/project_journal.h
+++ b/include/project_journal.h
@@ -32,9 +32,9 @@
 
 #ifndef QT3
 
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
-#include <QtCore/QMap>
 
 #else
 
@@ -109,7 +109,11 @@ public:
 
 
 private:
+#ifndef QT3
+	typedef QHash<jo_id_t, journallingObject *> joIDMap;
+#else
 	typedef QMap<jo_id_t, journallingObject *> joIDMap;
+#endif
 	typedef vvector<jo_id_t> journalEntryVector;
 
 	joIDMap m_joIDs;
diff --git a/include/side_bar_widget.h b/include/side_bar_widget.h
index 13600712b..bcb4cc9fb 100644
--- a/include/side_bar_widget.h
+++ b/include/side_bar_widget.h
@@ -1,7 +1,7 @@
 /*
  * side_bar_widget.h - base-class for all side-bar-widgets
  *
- * Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -30,9 +30,9 @@
 
 #ifdef QT4
 
-#include <QtGui/QWidget>
-#include <QVBoxLayout>
 #include <QtGui/QPixmap>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
 
 #else
 
diff --git a/include/tab_bar.h b/include/tab_bar.h
index d054e3dc2..6cf3a276d 100644
--- a/include/tab_bar.h
+++ b/include/tab_bar.h
@@ -1,7 +1,7 @@
 /*
  * tab_bar.h - class tabBar
  *
- * Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -34,9 +34,9 @@
 
 #ifdef QT4
 
-#include <QtGui/QWidget>
 #include <QtCore/QMap>
-#include <QLayout>
+#include <QtGui/QLayout>
+#include <QtGui/QWidget>
 
 #else
 
diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp
index 530ab20a1..565b98026 100644
--- a/plugins/vibed/nine_button_selector.cpp
+++ b/plugins/vibed/nine_button_selector.cpp
@@ -72,8 +72,14 @@ nineButtonSelector::nineButtonSelector(	QPixmap _button0_on,
 	setFixedSize( 50, 50 );
 	m_base = QPixmap::grabWidget( _parent, _x, _y );
 	move( _x, _y );
+#ifndef QT3
+	QPalette pal = palette();
+	pal.setBrush( backgroundRole(), QBrush( m_base ) );
+	setPalette( pal );
+#else
 	setPaletteBackgroundPixmap( m_base );
-	
+#endif
+
 	m_button = new pixmapButton( this, eng() );
 	m_button->move( 1, 1 );
 	m_button->setActiveGraphic( _button0_on );
diff --git a/src/audio/audio_alsa.cpp b/src/audio/audio_alsa.cpp
index 053835314..e3027c69f 100644
--- a/src/audio/audio_alsa.cpp
+++ b/src/audio/audio_alsa.cpp
@@ -30,8 +30,8 @@
 
 #ifdef QT4
 
-#include <QLineEdit>
-#include <QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QLabel>
 
 #else
 
diff --git a/src/audio/audio_file_device.cpp b/src/audio/audio_file_device.cpp
index 8d317e2fa..afd23d05e 100644
--- a/src/audio/audio_file_device.cpp
+++ b/src/audio/audio_file_device.cpp
@@ -30,7 +30,7 @@
 
 #ifdef QT4
 
-#include <QMessageBox>
+#include <QtGui/QMessageBox>
 
 #else
 
diff --git a/src/audio/audio_jack.cpp b/src/audio/audio_jack.cpp
index a054c0e36..bc5d26a25 100644
--- a/src/audio/audio_jack.cpp
+++ b/src/audio/audio_jack.cpp
@@ -32,9 +32,9 @@
 
 #ifdef QT4
 
-#include <QLineEdit>
-#include <QLabel>
-#include <QMessageBox>
+#include <QtGui/QLineEdit>
+#include <QtGui/QLabel>
+#include <QtGui/QMessageBox>
 
 #else
 
diff --git a/src/audio/audio_oss.cpp b/src/audio/audio_oss.cpp
index bec13aee9..012ed058d 100644
--- a/src/audio/audio_oss.cpp
+++ b/src/audio/audio_oss.cpp
@@ -34,9 +34,9 @@
 
 #ifdef QT4
 
-#include <QFileInfo>
-#include <QLineEdit>
-#include <QLabel>
+#include <QtCore/QFileInfo>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
 
 #else
 
diff --git a/src/audio/audio_sdl.cpp b/src/audio/audio_sdl.cpp
index fe2e42e80..46a7f0c37 100644
--- a/src/audio/audio_sdl.cpp
+++ b/src/audio/audio_sdl.cpp
@@ -32,8 +32,8 @@
 
 #ifdef QT4
 
-#include <QLineEdit>
-#include <QLabel>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
 
 #else
 
diff --git a/src/core/about_dialog.cpp b/src/core/about_dialog.cpp
index 9ab694675..de1623ac7 100644
--- a/src/core/about_dialog.cpp
+++ b/src/core/about_dialog.cpp
@@ -29,11 +29,11 @@
 
 #ifdef QT4
 
-#include <QTextEdit>
-#include <QTabWidget>
-#include <QLabel>
-#include <QPushButton>
-#include <QResizeEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QTabWidget>
+#include <QtGui/QTextEdit>
 
 #else
 
diff --git a/src/core/arp_and_chords_tab_widget.cpp b/src/core/arp_and_chords_tab_widget.cpp
index 2ca510ab3..1d63ac960 100644
--- a/src/core/arp_and_chords_tab_widget.cpp
+++ b/src/core/arp_and_chords_tab_widget.cpp
@@ -31,7 +31,7 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QLabel>
+#include <QtGui/QLabel>
 
 #else
 
diff --git a/src/core/bb_editor.cpp b/src/core/bb_editor.cpp
index c9c65d36b..21833d9c8 100644
--- a/src/core/bb_editor.cpp
+++ b/src/core/bb_editor.cpp
@@ -29,10 +29,10 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QKeyEvent>
-#include <QCloseEvent>
-#include <QLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QCloseEvent>
+#include <QtGui/QLayout>
 
 #else
 
@@ -71,7 +71,7 @@ bbEditor::bbEditor( engine * _engine ) :
 	m_toolBar->move( 0, 0 );
 #ifdef QT4
 	QPalette pal;
-	pal.setBrush( m_toolBar->backgroundRole(), QBrush(
+	pal.setBrush( QPalette::Background, QBrush(
 				embed::getIconPixmap( "toolbar_bg" ) ) );
 	m_toolBar->setPalette( pal );
 #else
@@ -88,13 +88,17 @@ bbEditor::bbEditor( engine * _engine ) :
 	setMinimumWidth( TRACK_OP_WIDTH + DEFAULT_SETTINGS_WIDGET_WIDTH +
 				BBE_PPT + 2 * TCO_BORDER_WIDTH +
 				DEFAULT_SCROLLBAR_SIZE );
+
+	QWidget * w = ( parentWidget() != NULL ) ? parentWidget() : this;
 	if( eng()->getMainWindow()->workspace() != NULL )
 	{
-		setGeometry( 10, 340, minimumWidth(), 300 );
+		resize( minimumWidth(), 300 );
+		w->move( 10, 340 );
 	}
 	else
 	{
-		setGeometry( 210, 340, minimumWidth(), 300 );
+		resize( minimumWidth(), 300 );
+		w->move( 210, 340 );
 	}
 
 	containerWidget()->move( 0, 32 );
diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index ee0e4d6a3..71958ffa4 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -33,18 +33,18 @@
 
 #ifdef QT4
 
-#include <QDir>
 #include <Qt/QtXml>
-#include <QFile>
-#include <QMessageBox>
-#include <QLabel>
-#include <QLayout>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QRadioButton>
-#include <QButtonGroup>
-#include <QApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtGui/QMessageBox>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QFileDialog>
+#include <QtGui/QRadioButton>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QApplication>
 
 #else
 
diff --git a/src/core/envelope_and_lfo_widget.cpp b/src/core/envelope_and_lfo_widget.cpp
index 80e2cffc3..213e8f6ff 100644
--- a/src/core/envelope_and_lfo_widget.cpp
+++ b/src/core/envelope_and_lfo_widget.cpp
@@ -30,11 +30,10 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QPaintEvent>
-#include <QWhatsThis>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
 #include <Qt/QtXml>
-#include <QLabel>
+#include <QtGui/QLabel>
 
 #else
 
diff --git a/src/core/envelope_tab_widget.cpp b/src/core/envelope_tab_widget.cpp
index c4ef3eaea..f0679509e 100644
--- a/src/core/envelope_tab_widget.cpp
+++ b/src/core/envelope_tab_widget.cpp
@@ -31,7 +31,6 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QWhatsThis>
 
 #else
 
diff --git a/src/core/export_project_dialog.cpp b/src/core/export_project_dialog.cpp
index 96b65a660..a2c9fe890 100644
--- a/src/core/export_project_dialog.cpp
+++ b/src/core/export_project_dialog.cpp
@@ -29,13 +29,13 @@
 
 #ifdef QT4
 
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QProgressBar>
-#include <QLabel>
-#include <QPushButton>
-#include <QCloseEvent>
-#include <QApplication>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
+#include <QtGui/QProgressBar>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QCloseEvent>
+#include <QtGui/QApplication>
 
 #else
 
diff --git a/src/core/file_browser.cpp b/src/core/file_browser.cpp
index 5e37baca1..145d7d9eb 100644
--- a/src/core/file_browser.cpp
+++ b/src/core/file_browser.cpp
@@ -30,11 +30,11 @@
 
 #ifdef QT4
 
-#include <QPushButton>
-#include <QKeyEvent>
-#include <QMenu>
-#include <Q3Header>
-#include <QCursor>
+#include <QtGui/QPushButton>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMenu>
+#include <QtGui/QCursor>
+#include <Qt3Support/Q3Header>
 
 #else
 
@@ -113,7 +113,11 @@ fileBrowser::~fileBrowser()
 void fileBrowser::reloadTree( void )
 {
 	m_l->clear();
+#ifndef QT3
+	QStringList paths = m_directories.split( '*' );
+#else
 	QStringList paths = QStringList::split( '*', m_directories );
+#endif
 	for( QStringList::iterator it = paths.begin(); it != paths.end(); ++it )
 	{
 		addItems( *it );
diff --git a/src/core/import_filter.cpp b/src/core/import_filter.cpp
index 5cc3a29a8..0cfcfe3c8 100644
--- a/src/core/import_filter.cpp
+++ b/src/core/import_filter.cpp
@@ -31,7 +31,7 @@
 
 #ifdef QT4
 
-#include <QMessageBox>
+#include <QtGui/QMessageBox>
 
 #else
 
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 97b557863..470b20e65 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -29,10 +29,10 @@
 
 #ifdef QT4
 
-#include <QApplication>
-#include <QLocale>
-#include <QSplashScreen>
-#include <QTranslator>
+#include <QtCore/QLocale>
+#include <QtCore/QTranslator>
+#include <QtGui/QApplication>
+#include <QtGui/QSplashScreen>
 
 #else
 
diff --git a/src/core/main_window.cpp b/src/core/main_window.cpp
index a80b21782..fb3fb965f 100644
--- a/src/core/main_window.cpp
+++ b/src/core/main_window.cpp
@@ -29,13 +29,13 @@
 
 #ifdef QT4
 
-#include <QApplication>
-#include <QFileDialog>
-#include <QCloseEvent>
-#include <QSplitter>
-#include <QSplashScreen>
-#include <QMessageBox>
-#include <QMenuBar>
+#include <QtGui/QApplication>
+#include <QtGui/QFileDialog>
+#include <QtGui/QCloseEvent>
+#include <QtGui/QSplitter>
+#include <QtGui/QSplashScreen>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMenuBar>
 #include <Qt/QtXml>
 
 #else
@@ -246,7 +246,6 @@ void mainWindow::finalize( void )
 								Qt::white );
 	}
 #endif
-	eng()->getSongEditor();
 
 
 #if QT_VERSION >= 0x030200
@@ -634,7 +633,7 @@ void mainWindow::restoreWidgetState( QWidget * _w, const QDomElement & _de )
 	QRect r( _de.attribute( "x" ).toInt(), _de.attribute( "y" ).toInt(),
 			_de.attribute( "width" ).toInt(),
 			_de.attribute( "height" ).toInt() );
-	if( !r.isNull() )
+	if( !r.isNull() && _w->parentWidget() != NULL )
 	{
 		_w->show();
 		if( _w->parentWidget() != NULL )
@@ -666,7 +665,7 @@ void mainWindow::createNewProjectFromTemplate( int _idx )
 	// TODO!!!
 #else
 	if( m_templatesMenu != NULL &&
-				eng()->getSongEditor()->mayChangeProject() == TRUE )
+			eng()->getSongEditor()->mayChangeProject() == TRUE )
 	{
 		eng()->getSongEditor()->createNewProjectFromTemplate(
 			configManager::inst()->projectsDir() + "templates/" +
diff --git a/src/core/midi_tab_widget.cpp b/src/core/midi_tab_widget.cpp
index e7d7d02f0..a8f0e9043 100644
--- a/src/core/midi_tab_widget.cpp
+++ b/src/core/midi_tab_widget.cpp
@@ -31,8 +31,8 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QMenu>
-#include <QToolButton>
+#include <QtGui/QMenu>
+#include <QtGui/QToolButton>
 
 #else
 
diff --git a/src/core/name_label.cpp b/src/core/name_label.cpp
index 39d010996..d7a382334 100644
--- a/src/core/name_label.cpp
+++ b/src/core/name_label.cpp
@@ -30,9 +30,9 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QMouseEvent>
-#include <QFileDialog>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/core/piano_roll.cpp b/src/core/piano_roll.cpp
index 567dc52da..59ddacdce 100644
--- a/src/core/piano_roll.cpp
+++ b/src/core/piano_roll.cpp
@@ -30,14 +30,14 @@
 
 #ifdef QT4
 
-#include <QApplication>
-#include <QButtonGroup>
-#include <QPainter>
-#include <QKeyEvent>
-#include <QWheelEvent>
-#include <QLayout>
-#include <QLabel>
 #include <Qt/QtXml>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QPainter>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
 
 #else
 
@@ -438,7 +438,14 @@ pianoRoll::pianoRoll( engine * _engine ) :
 	{
 		m_noteLenComboBox->addItem( "1/" + QString::number( 
 					static_cast<int>( powf( 2.0f, i ) ) ),
-				embed::getIconPixmap( "note_" + pixmaps[i] ) );
+				embed::getIconPixmap(
+					QString( "note_" + pixmaps[i] ).
+#ifndef QT3
+					toAscii().constData()
+#else
+					ascii()
+#endif
+					) );
 	}
 	m_noteLenComboBox->setValue( 0 );
 
diff --git a/src/core/piano_widget.cpp b/src/core/piano_widget.cpp
index 91a7d29f8..ebd1fccf5 100644
--- a/src/core/piano_widget.cpp
+++ b/src/core/piano_widget.cpp
@@ -30,9 +30,9 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/core/plugin.cpp b/src/core/plugin.cpp
index 15a8aee92..a42a20757 100644
--- a/src/core/plugin.cpp
+++ b/src/core/plugin.cpp
@@ -29,9 +29,9 @@
 
 #ifdef QT4
 
-#include <QMessageBox>
-#include <QDir>
-#include <QLibrary>
+#include <QtCore/QDir>
+#include <QtCore/QLibrary>
+#include <QtGui/QMessageBox>
 
 #else
 
diff --git a/src/core/plugin_browser.cpp b/src/core/plugin_browser.cpp
index 14860379c..e69acf5fa 100644
--- a/src/core/plugin_browser.cpp
+++ b/src/core/plugin_browser.cpp
@@ -29,10 +29,10 @@
 
 #ifdef QT4
 
-#include <QLabel>
-#include <QPainter>
-#include <QCursor>
-#include <QMouseEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QPainter>
+#include <QtGui/QCursor>
+#include <QtGui/QMouseEvent>
 
 #else
 
@@ -171,7 +171,7 @@ void pluginDescWidget::paintEvent( QPaintEvent * )
 							QImage::ScaleMin ) );
 #endif
 	p.setPen( QColor( 64, 64, 64 ) );
-	p.drawRect( rect() );
+	p.drawRect( 0, 0, rect().right(), rect().bottom() );
 	p.drawPixmap( 4, 4, logo );
 
 	QFont f = pointSize<8>( p.font() );
@@ -186,9 +186,16 @@ void pluginDescWidget::paintEvent( QPaintEvent * )
 		p.setFont( pointSize<7>( f ) );
 		QRect br;
 		p.drawText( 10 + logo_size.width(), 20, width() - 58 - 5, 999,
-								Qt::WordBreak,
+#ifndef QT3
+							Qt::TextWordWrap,
+#else
+							Qt::WordBreak,
+#endif
 			pluginBrowser::tr( m_pluginDescriptor.description ),
-								-1, &br );
+#ifdef QT3
+								-1,
+#endif
+								&br );
 		if( m_mouseOver )
 		{
 			m_targetHeight = tMax( 60, 25 + br.height() );
diff --git a/src/core/preset_preview_play_handle.cpp b/src/core/preset_preview_play_handle.cpp
index 1e5bdb955..2ab7e751a 100644
--- a/src/core/preset_preview_play_handle.cpp
+++ b/src/core/preset_preview_play_handle.cpp
@@ -29,8 +29,8 @@
 
 #ifdef QT4
 
-#include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/QMutex>
+#include <QtCore/QMutexLocker>
 
 #else
 
diff --git a/src/core/setup_dialog.cpp b/src/core/setup_dialog.cpp
index f17b96896..929291482 100644
--- a/src/core/setup_dialog.cpp
+++ b/src/core/setup_dialog.cpp
@@ -29,14 +29,14 @@
 
 #ifdef QT4
 
-#include <QLayout>
-#include <QLabel>
-#include <QSlider>
-#include <QWhatsThis>
-#include <QComboBox>
-#include <QMessageBox>
-#include <QLineEdit>
-#include <QFileDialog>
+#include <QtGui/QComboBox>
+#include <QtGui/QFileDialog>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMessageBox>
+#include <QtGui/QSlider>
+#include <QtGui/QWhatsThis>
 
 #else
 
diff --git a/src/core/song_editor.cpp b/src/core/song_editor.cpp
index 67bc90ac9..7ee64af26 100644
--- a/src/core/song_editor.cpp
+++ b/src/core/song_editor.cpp
@@ -37,18 +37,18 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QApplication>
-#include <QFile>
-#include <QMessageBox>
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QSlider>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QStatusBar>
-#include <QAction>
-#include <QLayout>
-#include <QButtonGroup>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QFileDialog>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QMessageBox>
+#include <QtGui/QSlider>
+#include <QtGui/QStatusBar>
 
 #else
 
@@ -118,13 +118,17 @@ songEditor::songEditor( engine * _engine ) :
 {
 	setWindowTitle( tr( "Song-Editor" ) );
 	setWindowIcon( embed::getIconPixmap( "songeditor" ) );
+
+	QWidget * w = ( parentWidget() != NULL ) ? parentWidget() : this;
 	if( eng()->getMainWindow()->workspace() != NULL )
 	{
-		setGeometry( 10, 10, 680, 300 );
+		resize( 680, 300 );
+		w->move( 10, 10 );
 	}
 	else
 	{
-		setGeometry( 210, 10, 580, 300 );
+		resize( 580, 300 );
+		w->move( 210, 10 );
 	}
 
 #ifdef QT4
@@ -1506,7 +1510,8 @@ void FASTCALL songEditor::loadProject( const QString & _file_name )
 		{
 			if( node.nodeName() == "trackcontainer" )
 			{
-				restoreState( node.toElement() );
+				( (journallingObject *)( this ) )->
+					restoreState( node.toElement() );
 			}
 			else if( node.nodeName() ==
 					eng()->getPianoRoll()->nodeName() )
@@ -1517,8 +1522,9 @@ void FASTCALL songEditor::loadProject( const QString & _file_name )
 			else if( node.nodeName() ==
 					eng()->getProjectNotes()->nodeName() )
 			{
-				eng()->getProjectNotes()->restoreState(
-							node.toElement() );
+				( (journallingObject *)( eng()->
+							getProjectNotes() ) )->
+					restoreState( node.toElement() );
 			}
 			else if( node.nodeName() ==
 				m_playPos[PLAY_SONG].m_timeLine->nodeName() )
@@ -1561,10 +1567,11 @@ bool songEditor::saveProject( void )
 	mmp.head().appendChild( mp );
 
 
-	saveState( mmp, mmp.content() );
+	( (journallingObject *)( this ) )->saveState( mmp, mmp.content() );
 
 	eng()->getPianoRoll()->saveState( mmp, mmp.content() );
-	eng()->getProjectNotes()->saveState( mmp, mmp.content() );
+	( (journallingObject *)( eng()->getProjectNotes() ) )->saveState( mmp,
+								mmp.content() );
 	m_playPos[PLAY_SONG].m_timeLine->saveState( mmp, mmp.content() );
 
 	if( mmp.writeFile( m_fileName, m_oldFileName == "" ||
diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp
index 2d87d9d46..51ed9eee4 100644
--- a/src/core/surround_area.cpp
+++ b/src/core/surround_area.cpp
@@ -4,7 +4,7 @@
  * surround_area.cpp - a widget for setting position of a channel +
  *                     calculation of volume for each speaker
  *
- * Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -30,18 +30,16 @@
 
 #ifdef QT4
 
-#include <QApplication>
-#include <QPainter>
-#include <QCursor>
-#include <QMouseEvent>
-#include <QImage>
+#include <QtGui/QApplication>
+#include <QtGui/QCursor>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 #else
 
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qcursor.h>
-#include <qimage.h>
 
 #endif
 
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index 948f53b30..d00d3a9fa 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -29,12 +29,12 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QApplication>
-#include <QMouseEvent>
-#include <QLayout>
-#include <QTimer>
 #include <Qt/QtXml>
+#include <QtCore/QTimer>
+#include <QtGui/QApplication>
+#include <QtGui/QLayout>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 9db270d75..4e56ee51d 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -30,11 +30,11 @@
 
 #ifdef QT4
 
-#include <QApplication>
 #include <Qt/QtXml>
-#include <QMouseEvent>
-#include <QMenu>
-#include <QLayout>
+#include <QtGui/QApplication>
+#include <QtGui/QLayout>
+#include <QtGui/QMenu>
+#include <QtGui/QMouseEvent>
 
 #else
 
@@ -1097,7 +1097,7 @@ void trackOperationsWidget::removeTrack( void )
 #ifdef QT3
 	QTimer::singleShot( 10, this, SLOT( removeTrackTimer() ) );
 #else
-#warning fixme
+//#warning fixme
 	removeTrackTimer();
 #endif
 }
diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp
index acbf7e2f6..7f834b779 100644
--- a/src/core/track_container.cpp
+++ b/src/core/track_container.cpp
@@ -31,9 +31,9 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QApplication>
-#include <QProgressDialog>
-#include <QWheelEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QProgressDialog>
+#include <QtGui/QWheelEvent>
 
 #else
 
diff --git a/src/lib/base64.cpp b/src/lib/base64.cpp
index 1689effc9..a5fcea1fd 100644
--- a/src/lib/base64.cpp
+++ b/src/lib/base64.cpp
@@ -32,8 +32,8 @@
 
 #ifndef QT3
 
-#include <QVariant>
-#include <QBuffer>
+#include <QtCore/QBuffer>
+#include <QtCore/QVariant>
 
 #else
 
diff --git a/src/lib/buffer_allocator.cpp b/src/lib/buffer_allocator.cpp
index 48b0ba86c..dd82062e6 100644
--- a/src/lib/buffer_allocator.cpp
+++ b/src/lib/buffer_allocator.cpp
@@ -30,8 +30,8 @@
 
 #ifdef QT4
 
-#include <QList>
-#include <QMutex>
+#include <QtCore/QList>
+#include <QtCore/QMutex>
 
 #else
 
@@ -151,7 +151,7 @@ void bufferAllocator::free( void * _buf )
 	}
 
 	// do clean-up if neccessary
-	static const Uint32 CLEANUP_LEVEL = static_cast<Uint32>( 768 / ( logf(
+	static const csize CLEANUP_LEVEL = static_cast<csize>( 768 / ( logf(
 				/*mixer::inst()->framesPerAudioBuffer()*/
 								128 ) /
 								logf( 2 ) ) );
diff --git a/src/lib/ladspa_manager.cpp b/src/lib/ladspa_manager.cpp
index c60a84713..bb080e925 100644
--- a/src/lib/ladspa_manager.cpp
+++ b/src/lib/ladspa_manager.cpp
@@ -33,9 +33,9 @@
 
 #ifdef QT4
 
-#include <QDir>
-#include <QFileInfo>
-#include <QLibrary>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QLibrary>
 
 #else
 
diff --git a/src/lib/mmp.cpp b/src/lib/mmp.cpp
index e898e765f..1c4ba3753 100644
--- a/src/lib/mmp.cpp
+++ b/src/lib/mmp.cpp
@@ -29,8 +29,8 @@
 
 #ifdef QT4
 
-#include <QFile>
-#include <QMessageBox>
+#include <QtCore/QFile>
+#include <QtGui/QMessageBox>
 
 #else
 
diff --git a/src/lib/project_journal.cpp b/src/lib/project_journal.cpp
index e6c376a51..cc7f0fa41 100644
--- a/src/lib/project_journal.cpp
+++ b/src/lib/project_journal.cpp
@@ -31,6 +31,10 @@
 #include "journalling_object.h"
 #include "song_editor.h"
 
+#ifdef QT3
+#define value data
+#endif
+
 
 
 projectJournal::projectJournal( engine * _engine ) :
@@ -80,7 +84,7 @@ void projectJournal::redo( void )
 
 	journallingObject * jo;
 
-	printf("%d\n", m_joIDs[*(m_currentJournalEntry+1)] );
+	//printf("%d\n", m_joIDs[*(m_currentJournalEntry+1)] );
 	if( m_currentJournalEntry < m_journalEntries.end() &&
 		( jo = m_joIDs[*m_currentJournalEntry++] ) != NULL )
 	{
@@ -146,7 +150,7 @@ void projectJournal::forgetAboutID( const jo_id_t _id )
 		}
 		m_journalEntries.erase( it );
 	}
-	m_joIDs.erase( _id );
+	m_joIDs.remove( _id );
 }
 
 
@@ -154,10 +158,9 @@ void projectJournal::forgetAboutID( const jo_id_t _id )
 
 void projectJournal::clearInvalidJournallingObjects( void )
 {
-	vlist<journallingObject *>::const_iterator it;
 	for( joIDMap::iterator it = m_joIDs.begin(); it != m_joIDs.end(); )
 	{
-		if( it.data() == NULL )
+		if( it.value() == NULL )
 		{
 			forgetAboutID( it.key() );
 			it = m_joIDs.begin();
@@ -171,4 +174,10 @@ void projectJournal::clearInvalidJournallingObjects( void )
 }
 
 
+
+#ifdef QT3
+#undef value
+#endif
+
+
 #endif
diff --git a/src/lib/sample_buffer.cpp b/src/lib/sample_buffer.cpp
index 61b546f90..6c9082d44 100644
--- a/src/lib/sample_buffer.cpp
+++ b/src/lib/sample_buffer.cpp
@@ -33,13 +33,13 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QMutex>
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QFile>
-#include <QBuffer>
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QMutex>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/lib/string_pair_drag.cpp b/src/lib/string_pair_drag.cpp
index 486a7c172..e84fc9448 100644
--- a/src/lib/string_pair_drag.cpp
+++ b/src/lib/string_pair_drag.cpp
@@ -32,9 +32,9 @@
 
 #ifdef QT4
 
-#include <QMimeData>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtCore/QMimeData>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDropEvent>
 
 #endif
 
diff --git a/src/midi/midi_alsa_raw.cpp b/src/midi/midi_alsa_raw.cpp
index 35c49f925..7bc1a0e46 100644
--- a/src/midi/midi_alsa_raw.cpp
+++ b/src/midi/midi_alsa_raw.cpp
@@ -29,8 +29,8 @@
 
 #ifdef QT4
 
-#include <QLineEdit>
-#include <QLabel>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
 
 #else
 
diff --git a/src/midi/midi_alsa_seq.cpp b/src/midi/midi_alsa_seq.cpp
index 8c4d4a940..340dce510 100644
--- a/src/midi/midi_alsa_seq.cpp
+++ b/src/midi/midi_alsa_seq.cpp
@@ -29,8 +29,8 @@
 
 #ifdef QT4
 
-#include <QLineEdit>
-#include <QLabel>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
 
 #else
 
diff --git a/src/midi/midi_mapper.cpp b/src/midi/midi_mapper.cpp
index 1b5aac455..0359d361c 100644
--- a/src/midi/midi_mapper.cpp
+++ b/src/midi/midi_mapper.cpp
@@ -30,7 +30,7 @@
 
 #ifdef QT4
 
-#include <QRegExp>
+#include <QtCore/QRegExp>
 
 #else
 
diff --git a/src/midi/midi_oss.cpp b/src/midi/midi_oss.cpp
index 741b4db2f..037909831 100644
--- a/src/midi/midi_oss.cpp
+++ b/src/midi/midi_oss.cpp
@@ -34,8 +34,8 @@
 
 #ifdef QT4
 
-#include <QLineEdit>
-#include <QLabel>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
 
 #else
 
diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp
index a2b8e7153..eb790c889 100644
--- a/src/tracks/bb_track.cpp
+++ b/src/tracks/bb_track.cpp
@@ -30,9 +30,9 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QPainter>
-#include <QColorDialog>
-#include <QMenu>
+#include <QtGui/QColorDialog>
+#include <QtGui/QMenu>
+#include <QtGui/QPainter>
 
 #else
 
@@ -146,8 +146,11 @@ void bbTCO::paintEvent( QPaintEvent * )
 	}
 #ifdef QT4
 	QPainter p( this );
-	// TODO: set according brush/pen for gradient!
-	p.fillRect( rect(), col );
+
+	QLinearGradient lingrad( 0, 0, 0, height() );
+	lingrad.setColorAt( 0, col.light( 130 ) );
+	lingrad.setColorAt( 1, col.light( 70 ) );
+	p.fillRect( rect(), lingrad );
 #else
 	// create pixmap for whole widget
 	QPixmap pm( rect().size() );
@@ -167,7 +170,7 @@ void bbTCO::paintEvent( QPaintEvent * )
 	if( length() > 64 && t > 0 )
 	{
 		for( int x = static_cast<int>( t * pixelsPerTact() );
-								x < width();
+								x < width()-2;
 			x += static_cast<int>( t * pixelsPerTact() ) )
 		{
 			p.setPen( col.light( 80 ) );
@@ -178,7 +181,7 @@ void bbTCO::paintEvent( QPaintEvent * )
 	}
 
 	p.setPen( col.dark() );
-	p.drawRect( 0, 0, width(), height() );
+	p.drawRect( 0, 0, rect().right(), rect().bottom() );
 
 	p.setFont( pointSize<7>( p.font() ) );
 	p.setPen( QColor( 0, 0, 0 ) );
@@ -428,7 +431,8 @@ void bbTrack::saveTrackSpecificSettings( QDomDocument & _doc,
 			_this.parentNode().nodeName() != "clone" &&
 			_this.parentNode().nodeName() != "journaldata" )
 	{
-		eng()->getBBEditor()->saveState( _doc, _this );
+		( (journallingObject *)( eng()->getBBEditor() ) )->saveState(
+								_doc, _this );
 	}
 }
 
@@ -444,7 +448,7 @@ void bbTrack::loadTrackSpecificSettings( const QDomElement & _this )
 	}
 	if( _this.firstChild().isElement() )
 	{
-		eng()->getBBEditor()->restoreState(
+		( (journallingObject *)( eng()->getBBEditor() ) )->restoreState(
 					_this.firstChild().toElement() );
 	}
 /*	doesn't work yet because bbTrack-ctor also sets current bb so if
diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp
index 3ac5068fb..6fd3389fa 100644
--- a/src/tracks/instrument_track.cpp
+++ b/src/tracks/instrument_track.cpp
@@ -30,16 +30,16 @@
 
 #ifdef QT4
 
-#include <QFileDialog>
-#include <QDir>
-#include <QFile>
-#include <QApplication>
 #include <Qt/QtXml>
-#include <QLineEdit>
-#include <QCloseEvent>
-#include <QLayout>
-#include <QLabel>
-#include <QMenu>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtGui/QApplication>
+#include <QtGui/QCloseEvent>
+#include <QtGui/QFileDialog>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMenu>
 
 #else
 
diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp
index fb2bc0607..604e3eea5 100644
--- a/src/tracks/pattern.cpp
+++ b/src/tracks/pattern.cpp
@@ -31,13 +31,12 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QMenu>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QMessageBox>
-#include <QImage>
-#include <QMouseEvent>
-#include <QTimer>
+#include <QtCore/QTimer>
+#include <QtGui/QMenu>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QProgressBar>
+#include <QtGui/QPushButton>
 
 #else
 
@@ -193,7 +192,7 @@ void pattern::init( void )
 	changeLength( length() );
 	restoreJournallingState();
 
-#ifndef QT4
+#ifdef QT3
 	// set background-mode for flicker-free redraw
 	setBackgroundMode( Qt::NoBackground );
 #endif
@@ -914,7 +913,13 @@ void pattern::paintEvent( QPaintEvent * )
 
 	QPainter p( &m_paintPixmap );
 #ifdef QT4
-	// TODO: gradient!
+	QLinearGradient lingrad( 0, 0, 0, height() );
+	const QColor c = isSelected() ? QColor( 0, 0, 224 ) :
+							QColor( 96, 96, 96 );
+	lingrad.setColorAt( 0, c );
+	lingrad.setColorAt( 0.5, Qt::black );
+	lingrad.setColorAt( 1, c );
+	p.fillRect( QRect( 1, 1, width() - 2, height() - 2 ), lingrad );
 #else
 	for( int y = 1; y < height() / 2; ++y )
 	{
diff --git a/src/tracks/sample_track.cpp b/src/tracks/sample_track.cpp
index 17454e5f0..35350e556 100644
--- a/src/tracks/sample_track.cpp
+++ b/src/tracks/sample_track.cpp
@@ -30,10 +30,10 @@
 
 #ifdef QT4
 
-#include <QPushButton>
-#include <QPainter>
 #include <Qt/QtXml>
-#include <QDropEvent>
+#include <QtGui/QDropEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPushButton>
 
 #else
 
diff --git a/src/widgets/automatable_button.cpp b/src/widgets/automatable_button.cpp
index aaa2c6b9c..40c918061 100644
--- a/src/widgets/automatable_button.cpp
+++ b/src/widgets/automatable_button.cpp
@@ -28,6 +28,17 @@
 
 #include "automatable_button.h"
 
+#ifndef QT3
+
+#include <QtGui/QMouseEvent>
+
+#else
+
+#define indexOf findIndex
+
+#endif
+
+
 
 automatableButton::automatableButton( QWidget * _parent, engine * _engine ) :
 	QWidget( _parent ),
@@ -173,9 +184,9 @@ void automatableButtonGroup::removeButton( automatableButton * _btn )
 
 void automatableButtonGroup::activateButton( automatableButton * _btn )
 {
-	if( _btn != m_buttons[value()] && m_buttons.findIndex( _btn ) != -1 )
+	if( _btn != m_buttons[value()] && m_buttons.indexOf( _btn ) != -1 )
 	{
-		setValue( m_buttons.findIndex( _btn ) );
+		setValue( m_buttons.indexOf( _btn ) );
 	}
 }
 
@@ -199,6 +210,10 @@ void automatableButtonGroup::setValue( const int _value )
 }
 
 
+#ifdef QT3
+#undef findIndex
+#endif
+
 
 #include "automatable_button.moc"
 
diff --git a/src/widgets/combobox.cpp b/src/widgets/combobox.cpp
index 115110f35..840fdaf74 100644
--- a/src/widgets/combobox.cpp
+++ b/src/widgets/combobox.cpp
@@ -32,11 +32,11 @@
 
 #ifndef QT3
 
-#include <QPainter>
-#include <QPixmap>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QMouseEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 
 #else
 
diff --git a/src/widgets/cpuload_widget.cpp b/src/widgets/cpuload_widget.cpp
index 81a07d8bc..ec11b0562 100644
--- a/src/widgets/cpuload_widget.cpp
+++ b/src/widgets/cpuload_widget.cpp
@@ -30,7 +30,7 @@
 
 #ifdef QT4
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/widgets/fade_button.cpp b/src/widgets/fade_button.cpp
index a1ae529b7..54b77c3b0 100644
--- a/src/widgets/fade_button.cpp
+++ b/src/widgets/fade_button.cpp
@@ -29,9 +29,9 @@
 
 #ifdef QT4
 
-#include <QTimer>
-#include <QPainter>
-#include <QPixmap>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 
 #else
 
@@ -108,6 +108,7 @@ void fadeButton::paintEvent( QPaintEvent * _pe )
 	}
 #ifdef QT4
 	QPainter p( this );
+	p.fillRect( rect(), col );
 #else
 	QPixmap draw_pm( rect().size() );
 	draw_pm.fill( col );
@@ -115,7 +116,7 @@ void fadeButton::paintEvent( QPaintEvent * _pe )
 	QPainter p( &draw_pm, this );
 #endif
 	p.setPen( QColor( 0, 0, 0 ) );
-	p.drawRect( 0, 0, width(), height() );
+	p.drawRect( 0, 0, rect().right(), rect().bottom() );
 #ifndef QT4
 	// and blit all the drawn stuff on the screen...
 	bitBlt( this, rect().topLeft(), &draw_pm );
diff --git a/src/widgets/group_box.cpp b/src/widgets/group_box.cpp
index 94e92513a..0d8025ac0 100644
--- a/src/widgets/group_box.cpp
+++ b/src/widgets/group_box.cpp
@@ -29,9 +29,9 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QTimer>
-#include <QMouseEvent>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QMouseEvent>
 
 #else
 
@@ -192,7 +192,12 @@ void groupBox::animate( void )
 
 void groupBox::updatePixmap( void )
 {
+#ifndef QT3
+	QColor bg_color = QApplication::palette().color( QPalette::Active,
+							QPalette::Background );
+#else
 	QColor bg_color = QApplication::palette().active().background();
+#endif
 	QPixmap pm( size() );
 	pm.fill( bg_color.dark( 132 ) );
 
@@ -222,7 +227,11 @@ void groupBox::updatePixmap( void )
 
 
 	//p.setPen( QColor( 255, 255, 255 ) );
+#ifndef QT3
+	p.setPen( palette().color( QPalette::Active, QPalette::ButtonText ) );
+#else
 	p.setPen( colorGroup().buttonText() );
+#endif
 	p.setFont( pointSize<7>( font() ) );
 	p.drawText( 22, 10, m_caption );
 
diff --git a/src/widgets/kmultitabbar.cpp b/src/widgets/kmultitabbar.cpp
index 0757a7431..ff5de5b58 100644
--- a/src/widgets/kmultitabbar.cpp
+++ b/src/widgets/kmultitabbar.cpp
@@ -9,14 +9,14 @@
 
 #include "kmultitabbar.h"
 
-#include <QEvent>
-#include <QLayout>
-#include <QPainter>
-#include <QFontMetrics>
-#include <QStyle>
-#include <QStyleOptionButton>
-#include <QApplication>
-#include <QFrame>
+#include <QtCore/QEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QFrame>
+#include <QtGui/QLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QStyle>
+#include <QtGui/QStyleOptionButton>
 
 #include <math.h>
 
diff --git a/src/widgets/knob.cpp b/src/widgets/knob.cpp
index 68112c4d7..dc8e2a003 100644
--- a/src/widgets/knob.cpp
+++ b/src/widgets/knob.cpp
@@ -32,17 +32,15 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QPalette>
-#include <QBitmap>
-#include <QLabel>
-#include <QStatusBar>
-#include <QMouseEvent>
-#include <QMenu>
-#include <QStatusBar>
-#include <QFontMetrics>
-#include <QApplication>
-#include <QInputDialog>
+#include <QtGui/QApplication>
+#include <QtGui/QBitmap>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QInputDialog>
+#include <QtGui/QLabel>
+#include <QtGui/QMenu>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
 
 #else
 
diff --git a/src/widgets/lcd_spinbox.cpp b/src/widgets/lcd_spinbox.cpp
index ab8c3ee6e..6de1ef96a 100644
--- a/src/widgets/lcd_spinbox.cpp
+++ b/src/widgets/lcd_spinbox.cpp
@@ -29,10 +29,10 @@
 
 #ifdef QT4
 
-#include <QApplication>
-#include <QMouseEvent>
-#include <QCursor>
-#include <QLabel>
+#include <QtGui/QApplication>
+#include <QtGui/QCursor>
+#include <QtGui/QLabel>
+#include <QtGui/QMouseEvent>
 
 #else
 
diff --git a/src/widgets/led_checkbox.cpp b/src/widgets/led_checkbox.cpp
index 11fe9d34e..0fe8f2a3d 100644
--- a/src/widgets/led_checkbox.cpp
+++ b/src/widgets/led_checkbox.cpp
@@ -29,9 +29,9 @@
 
 #ifdef QT4
 
-#include <QPaintEvent>
-#include <QFontMetrics>
-#include <QPainter>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
 
 #else
 
diff --git a/src/widgets/nstate_button.cpp b/src/widgets/nstate_button.cpp
index e9ee70741..e7b5c8d8c 100644
--- a/src/widgets/nstate_button.cpp
+++ b/src/widgets/nstate_button.cpp
@@ -3,7 +3,7 @@
 /*
  * nstate_button.cpp - implementation of n-state-button
  *
- * Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -29,7 +29,7 @@
 
 #ifdef QT4
 
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 #endif
 
diff --git a/src/widgets/pixmap_button.cpp b/src/widgets/pixmap_button.cpp
index a8450d6d1..6057fe9d4 100644
--- a/src/widgets/pixmap_button.cpp
+++ b/src/widgets/pixmap_button.cpp
@@ -30,8 +30,8 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/widgets/project_notes.cpp b/src/widgets/project_notes.cpp
index 661fb38af..e2a76523d 100644
--- a/src/widgets/project_notes.cpp
+++ b/src/widgets/project_notes.cpp
@@ -30,15 +30,15 @@
 #ifdef QT4
 
 #include <Qt/QtXml>
-#include <QApplication>
-#include <QTextEdit>
-#include <QLineEdit>
-#include <QAction>
-#include <QToolBar>
-#include <QFontDatabase>
-#include <QComboBox>
-#include <QColorDialog>
-#include <QTextCursor>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QColorDialog>
+#include <QtGui/QComboBox>
+#include <QtGui/QFontDatabase>
+#include <QtGui/QLineEdit>
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextEdit>
+#include <QtGui/QToolBar>
 
 #else
 
@@ -112,16 +112,18 @@ projectNotes::projectNotes( engine * _engine) :
 	setWindowIcon( embed::getIconPixmap( "project_notes" ) );
 
 	resize( 300, 200 );
+
+	QWidget * w = ( parentWidget() != NULL ) ? parentWidget() : this;
 	if( eng()->getMainWindow()->workspace() != NULL )
 	{
-		move( 700, 10 );
+		w->move( 700, 10 );
 	}
 	else
 	{
-		move( 800, 10 );
+		w->move( 800, 10 );
 	}
 
-	show();
+	//show();
 
 }
 
diff --git a/src/widgets/rename_dialog.cpp b/src/widgets/rename_dialog.cpp
index 1e6c2fda6..448a3c479 100644
--- a/src/widgets/rename_dialog.cpp
+++ b/src/widgets/rename_dialog.cpp
@@ -3,7 +3,7 @@
 /*
  * rename_dialog.cpp - implementation of dialog for renaming something
  *
- * Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -29,8 +29,8 @@
 
 #ifdef QT4
 
-#include <QLineEdit>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLineEdit>
 
 #else
 
diff --git a/src/widgets/side_bar_widget.cpp b/src/widgets/side_bar_widget.cpp
index 52af32bf7..ab3124372 100644
--- a/src/widgets/side_bar_widget.cpp
+++ b/src/widgets/side_bar_widget.cpp
@@ -29,9 +29,9 @@
 
 #ifdef QT4
 
-#include <QApplication>
-#include <QPainter>
-#include <QFontMetrics>
+#include <QtGui/QApplication>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/widgets/tab_widget.cpp b/src/widgets/tab_widget.cpp
index 12a5c139f..a0decade9 100644
--- a/src/widgets/tab_widget.cpp
+++ b/src/widgets/tab_widget.cpp
@@ -1,9 +1,9 @@
 #ifndef SINGLE_SOURCE_COMPILE
 
 /*
- * tabwidget.cpp - tabwidget for LMMS
+ * tab_widget.cpp - tabwidget for LMMS
  *
- * Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -29,10 +29,10 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QPixmap>
-#include <QMouseEvent>
-#include <QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QWheelEvent>
 
 #else
 
@@ -62,13 +62,16 @@ tabWidget::tabWidget( const QString & _caption, QWidget * _parent ) :
 	setPaletteBackgroundColor( QColor( 96, 96, 96 ) );
 	setBackgroundMode( Qt::NoBackground );
 #endif*/
-	QColor bg_color = QApplication::palette().active().background().dark(
-									132 );
-#ifdef QT4
+#ifndef QT3
+	QColor bg_color = QApplication::palette().color( QPalette::Active,
+							QPalette::Background ).
+								dark( 132 );
 	QPalette pal = palette();
 	pal.setColor( QPalette::Background, bg_color );
 	setPalette( pal );
 #else
+	QColor bg_color = QApplication::palette().active().background().dark(
+									132 );
 	setPaletteBackgroundColor( bg_color );
 #endif
 }
diff --git a/src/widgets/tempo_sync_knob.cpp b/src/widgets/tempo_sync_knob.cpp
index 6477ceb6f..ec6842469 100644
--- a/src/widgets/tempo_sync_knob.cpp
+++ b/src/widgets/tempo_sync_knob.cpp
@@ -30,9 +30,9 @@
 
 #ifdef QT4
 
-#include <QLabel>
-#include <QMouseEvent>
-#include <QMenu>
+#include <QtGui/QLabel>
+#include <QtGui/QMenu>
+#include <QtGui/QMouseEvent>
 
 #else
 
diff --git a/src/widgets/text_float.cpp b/src/widgets/text_float.cpp
index eb9b81afe..b944b37d2 100644
--- a/src/widgets/text_float.cpp
+++ b/src/widgets/text_float.cpp
@@ -29,8 +29,8 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QTimer>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
 
 #else
 
diff --git a/src/widgets/tooltip.cpp b/src/widgets/tooltip.cpp
index f3a1ab19c..1a6007118 100644
--- a/src/widgets/tooltip.cpp
+++ b/src/widgets/tooltip.cpp
@@ -3,7 +3,7 @@
 /*
  * tooltip.cpp - namespace toolTip, a tooltip-wrapper for LMMS
  *
- * Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -29,7 +29,7 @@
 
 #ifdef QT4
 
-#include <QToolTip>
+#include <QtGui/QToolTip>
 
 #else
 
diff --git a/src/widgets/visualization_widget.cpp b/src/widgets/visualization_widget.cpp
index e764eb3c6..766740ec5 100644
--- a/src/widgets/visualization_widget.cpp
+++ b/src/widgets/visualization_widget.cpp
@@ -29,10 +29,10 @@
 
 #ifdef QT4
 
-#include <QPainter>
-#include <QPixmap>
-#include <QTimer>
-#include <QMouseEvent>
+#include <QtCore/QTimer>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 
 #else