4 files changed, 14 insertions, 23 deletions
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index 16e84c73..f8e365c3 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -9,35 +9,28 @@
 #ifndef __AMIXER_H__
 #define __AMIXER_H__
 
-#include <QLayout>
-#include <QPixmap>
-#include <QToolTip>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QMenu>
-#include <QCloseEvent>
-#include <QAction>
+#include <QScrollArea>
 
 #include "cobject.h"
 #include "synth.h"
 #include "node.h"
 #include "routedialog.h"
 
-class Xml;
-class QWidget;
 class QHBoxLayout;
-class QScrollArea;
+class QLabel;
+class QMenu;
+class QToolButton;
+class QWidget;
+
+class Xml;
 class AudioTrack;
 class Meter;
 class Track;
-class QLabel;
 class Slider;
-class QToolButton;
 class Knob;
 class DoubleLabel;
 class ComboBox;
 class RouteDialog;
-class QMenu;
 class Strip;
 
 struct MixerConfig;
diff --git a/muse2/muse/mixer/meter.cpp b/muse2/muse/mixer/meter.cpp
index deb79d06..b9780f88 100644
--- a/muse2/muse/mixer/meter.cpp
+++ b/muse2/muse/mixer/meter.cpp
@@ -8,11 +8,10 @@
 
 #include <stdio.h>
 #include <cmath>
-#include <qpainter.h>
-//Added by qt3to4:
-#include <QResizeEvent>
+
 #include <QMouseEvent>
-#include <QFrame>
+#include <QPainter>
+#include <QResizeEvent>
 
 #include "meter.h"
 #include "gconfig.h"
diff --git a/muse2/muse/mixer/meter.h b/muse2/muse/mixer/meter.h
index 4802fac0..6c2dde34 100644
--- a/muse2/muse/mixer/meter.h
+++ b/muse2/muse/mixer/meter.h
@@ -9,12 +9,10 @@
 #ifndef __METER_H__
 #define __METER_H__
 
-//#include <q3frame.h>
 #include <QFrame>
-#include <qpixmap.h>
-//Added by qt3to4:
-#include <QResizeEvent>
-#include <QMouseEvent>
+
+class QResizeEvent;
+class QMouseEvent;
 
 class Meter : public QFrame {
    public:
diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp
index 2bbed787..9dc5b517 100644
--- a/muse2/muse/mixer/rack.cpp
+++ b/muse2/muse/mixer/rack.cpp
@@ -16,6 +16,7 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPalette>
+#include <QUrl>
 
 #include <errno.h>