diff --git a/src/devicewidget.h b/src/devicewidget.h
index d229fe2..bd6f317 100644
--- a/src/devicewidget.h
+++ b/src/devicewidget.h
@@ -21,8 +21,6 @@
 #ifndef devicewidget_h
 #define devicewidget_h
 
-#include "pavucontrol.h"
-
 #include "minimalstreamwidget.h"
 
 class MainWindow;
diff --git a/src/minimalstreamwidget.h b/src/minimalstreamwidget.h
index 78671a5..0f7275f 100644
--- a/src/minimalstreamwidget.h
+++ b/src/minimalstreamwidget.h
@@ -21,7 +21,8 @@
 #ifndef minimalstreamwidget_h
 #define minimalstreamwidget_h
 
-#include "pavucontrol.h"
+#include <gtkmm.h>
+#include <pulse/pulseaudio.h>
 
 #define PEAKS_RATE 144
 
@@ -55,7 +56,7 @@ public:
 protected:
     /* Subclasses must call this after the constructor to finalize the initial
      * layout. */
-    virtual void init();
+    void init();
 
 private :
     bool volumeMeterVisible;
diff --git a/src/pavuapplication.h b/src/pavuapplication.h
index 53cc0e3..70cf90b 100644
--- a/src/pavuapplication.h
+++ b/src/pavuapplication.h
@@ -21,7 +21,6 @@
 #ifndef pavuapplication_h
 #define pavuapplication_h
 
-#include "pavucontrol.h"
 #include "mainwindow.h"
 
 class PavuApplication : public Gtk::Application {
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 62a6499..3ecbf2d 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -31,15 +31,9 @@
 
 #include "pavucontrol.h"
 #include "i18n.h"
-#include "minimalstreamwidget.h"
-#include "channelwidget.h"
 #include "streamwidget.h"
-#include "cardwidget.h"
-#include "sinkwidget.h"
-#include "sourcewidget.h"
 #include "sinkinputwidget.h"
 #include "sourceoutputwidget.h"
-#include "rolewidget.h"
 #include "mainwindow.h"
 #include "pavuapplication.h"
 
diff --git a/src/pavucontrol.h b/src/pavucontrol.h
index e6282d7..d7e81a8 100644
--- a/src/pavucontrol.h
+++ b/src/pavucontrol.h
@@ -23,9 +23,6 @@
 
 #include <string>
 
-#include <signal.h>
-#include <string.h>
-
 #include <libintl.h>
 
 #include <gtkmm.h>