diff --git a/muse3/awl/knob.h b/muse3/awl/knob.h
index 44c7ba48d..22f0d979f 100644
--- a/muse3/awl/knob.h
+++ b/muse3/awl/knob.h
@@ -23,6 +23,12 @@
 #ifndef __AWLKNOB_H__
 #define __AWLKNOB_H__
 
+#include <QPainterPath>
+#include <QPaintEvent>
+#include <QString>
+#include <QMouseEvent>
+#include <QSize>
+
 #include "aslider.h"
 // #include <QtDesigner/QDesignerExportWidget>
 
diff --git a/muse3/awl/slider.cpp b/muse3/awl/slider.cpp
index 7d82fde3e..e434b4e35 100644
--- a/muse3/awl/slider.cpp
+++ b/muse3/awl/slider.cpp
@@ -22,7 +22,6 @@
 
 #include "slider.h"
 
-#include <QMouseEvent>
 #include <QPainter>
 
 namespace Awl {
diff --git a/muse3/awl/slider.h b/muse3/awl/slider.h
index 8379ae115..acc738f71 100644
--- a/muse3/awl/slider.h
+++ b/muse3/awl/slider.h
@@ -23,6 +23,13 @@
 #ifndef __AWLSLIDER_H__
 #define __AWLSLIDER_H__
 
+#include <QPainterPath>
+#include <QPaintEvent>
+#include <QString>
+#include <QMouseEvent>
+#include <QSize>
+#include <QPoint>
+
 #include "aslider.h"
 
 namespace Awl {
diff --git a/muse3/muse/widgets/meter.cpp b/muse3/muse/widgets/meter.cpp
index 3920e6f68..a5bb75097 100644
--- a/muse3/muse/widgets/meter.cpp
+++ b/muse3/muse/widgets/meter.cpp
@@ -26,9 +26,6 @@
 
 #include <cmath>
 
-#include <QMouseEvent>
-#include <QPainter>
-#include <QResizeEvent>
 #include <QVector>
 #include <QLocale>
 #include <algorithm>
diff --git a/muse3/muse/widgets/meter.h b/muse3/muse/widgets/meter.h
index 7de510a45..b08512e41 100644
--- a/muse3/muse/widgets/meter.h
+++ b/muse3/muse/widgets/meter.h
@@ -29,12 +29,10 @@
 
 #include <QFrame>
 #include <QTimer>
-
-class QResizeEvent;
-class QMouseEvent;
-class QPainter;
-class QPainterPath;
-
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPainterPath>
 #include <QBitmap>
 
 #include "sclif.h"
diff --git a/muse3/muse/widgets/slider.cpp b/muse3/muse/widgets/slider.cpp
index 5a0e85c05..c0742ddf1 100644
--- a/muse3/muse/widgets/slider.cpp
+++ b/muse3/muse/widgets/slider.cpp
@@ -25,8 +25,8 @@
 #include <cmath>
 #include "mmath.h"
 
-#include <QPainter>
-#include <QResizeEvent>
+#include <QPainterPath>
+#include <QMouseEvent>
 
 #include "utils.h"
 #include "slider.h"
diff --git a/muse3/muse/widgets/slider.h b/muse3/muse/widgets/slider.h
index 6da3085fb..c4a8ba7cf 100644
--- a/muse3/muse/widgets/slider.h
+++ b/muse3/muse/widgets/slider.h
@@ -27,6 +27,18 @@
 #ifndef __SLIDER_H__
 #define __SLIDER_H__
 
+#include <QWidget>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QString>
+#include <QResizeEvent>
+#include <QSize>
+#include <QPoint>
+#include <QColor>
+#include <QRect>
+#include <QBrush>
+#include <QFont>
+
 #include "sclif.h"
 #include "sliderbase.h"
 #include "scldraw.h"

diff --git a/muse3/muse/widgets/utils.cpp b/muse3/muse/widgets/utils.cpp
index e40d5e145..311352ff9 100644
--- a/muse3/muse/widgets/utils.cpp
+++ b/muse3/muse/widgets/utils.cpp
@@ -27,17 +27,11 @@
 //#include <time.h>
 
 #include <QApplication>
-#include <QFrame>
 #include <QClipboard>
-#include <QColor>
-#include <QGradient>
-#include <QIcon>
 #include <QLinearGradient>
 #include <QMimeData>
 #include <QPainter>
-#include <QPointF>
 #include <QFileInfo>
-#include <QFont>
 
 #include "audio.h"
 #include "audiodev.h"
diff --git a/muse3/muse/widgets/utils.h b/muse3/muse/widgets/utils.h
index bded33ab0..cb41748d2 100644
--- a/muse3/muse/widgets/utils.h
+++ b/muse3/muse/widgets/utils.h
@@ -26,15 +26,15 @@
 #define MAX(a,b) (((a)>(b))?(a):(b))
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
-class QFont;
-class QFrame;
-class QString;
-class QWidget;
-class QGradient;
-class QCanvas;
-class QPointF;
-class QColor;
-class QPainterPath;
+#include <QFont>
+#include <QFrame>
+#include <QString>
+#include <QWidget>
+#include <QGradient>
+#include <QPointF>
+#include <QColor>
+#include <QPainterPath>
+#include <QIcon>
 
 namespace MusECore {
 
diff --git a/muse3/muse/midiedit/scoreedit.cpp b/muse3/muse/midiedit/scoreedit.cpp
index b963f3ad8..e9c3aac8f 100644
--- a/muse3/muse/midiedit/scoreedit.cpp
+++ b/muse3/muse/midiedit/scoreedit.cpp
@@ -24,9 +24,7 @@
 #include <QLayout>
 #include <QSizeGrip>
 #include <QLabel>
-#include <QScrollBar>
 #include <QPushButton>
-#include <QToolButton>
 #include <QToolTip>
 #include <QMenu>
 #include <QSignalMapper>
@@ -35,16 +33,14 @@
 #include <QClipboard>
 #include <QDir>
 #include <QKeySequence>
-#include <QKeyEvent>
-#include <QGridLayout>
-#include <QResizeEvent>
-#include <QCloseEvent>
 #include <QMimeData>
 #include <QScrollArea>
 #include <QSettings>
 #include <QImage>
 #include <QInputDialog>
 #include <QMessageBox>
+#include <QTimer>
+#include <QPainterPath>
 
 #include <stdio.h>
 #include <math.h>
diff --git a/muse3/muse/mixer/routedialog.cpp b/muse3/muse/mixer/routedialog.cpp
index 2e6cf0f09..975b44966 100644
--- a/muse3/muse/mixer/routedialog.cpp
+++ b/muse3/muse/mixer/routedialog.cpp
@@ -35,6 +35,7 @@
 #include <QLayout>
 #include <QFlags>
 #include <QVariant>
+#include <QPainterPath>
 
 #include "routedialog.h"
 #include "globaldefs.h"