Tidy up the dialog mess in src/.

6 files changed, 13 insertions, 9 deletions

diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index a852a8dcde..bfe51918c4 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -11,6 +11,7 @@
 #include "widget/wskincolor.h"
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
+#include "library/dlgcoverartfullsize.h"
 #include "util/math.h"
 #include "util/dnd.h"
 
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index aa0d7dd825..00f6cfce3a 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -7,13 +7,14 @@
 #include <QWidget>
 
 #include "configobject.h"
-#include "dlgcoverartfullsize.h"
 #include "trackinfoobject.h"
 #include "library/coverartcache.h"
 #include "skin/skincontext.h"
 #include "widget/wbasewidget.h"
 #include "widget/wcoverartmenu.h"
 
+class DlgCoverArtFullSize;
+
 class WCoverArt : public QWidget, public WBaseWidget {
     Q_OBJECT
   public:
diff --git a/src/widget/wcoverartlabel.cpp b/src/widget/wcoverartlabel.cpp
index a344e1345a..19cd3e1ba7 100644
--- a/src/widget/wcoverartlabel.cpp
+++ b/src/widget/wcoverartlabel.cpp
@@ -1,7 +1,8 @@
-#include <QtDebug>
-
 #include "widget/wcoverartlabel.h"
 
+#include <QtDebug>
+
+#include "library/dlgcoverartfullsize.h"
 #include "library/coverartutils.h"
 
 static const QSize s_labelDisplaySize = QSize(100, 100);
diff --git a/src/widget/wcoverartlabel.h b/src/widget/wcoverartlabel.h
index c0dd10f462..b001adcbaf 100644
--- a/src/widget/wcoverartlabel.h
+++ b/src/widget/wcoverartlabel.h
@@ -6,9 +6,10 @@
 #include <QWidget>
 #include <QPixmap>
 
-#include "dlgcoverartfullsize.h"
 #include "widget/wcoverartmenu.h"
 
+class DlgCoverArtFullSize;
+
 class WCoverArtLabel : public QLabel {
     Q_OBJECT
   public:
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 9f737dbf40..bebd4c4950 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -15,12 +15,12 @@
 #include "controlobject.h"
 #include "controlobjectslave.h"
 #include "widget/wtracktableview.h"
-#include "dlgtrackinfo.h"
+#include "library/dlgtrackinfo.h"
 #include "soundsourceproxy.h"
 #include "mixer/playermanager.h"
 #include "util/dnd.h"
 #include "util/time.h"
-#include "dlgpreflibrary.h"
+#include "preferences/dialog/dlgpreflibrary.h"
 #include "waveform/guitick.h"
 #include "widget/wcoverartmenu.h"
 #include "util/assert.h"
diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h
index 881f5938a0..690878d6ab 100644
--- a/src/widget/wtracktableview.h
+++ b/src/widget/wtracktableview.h
@@ -6,12 +6,12 @@
 
 #include "configobject.h"
 #include "controlobjectslave.h"
-#include "trackinfoobject.h"
+#include "library/coverart.h"
+#include "library/dlgtagfetcher.h"
 #include "library/libraryview.h"
 #include "library/trackmodel.h" // Can't forward declare enums
-#include "library/coverart.h"
+#include "trackinfoobject.h"
 #include "widget/wlibrarytableview.h"
-#include "dlgtagfetcher.h"
 
 class ControlObjectSlave;
 class DlgTrackInfo;