Clean up includes

As directed by include-what-you-use.  Unfortunately, it is still confused by
quite a few things, but this gets a lot closer to a clean report, and at least
makes the output more tolerable to manually check.

2 files changed, 39 insertions, 9 deletions

diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 1afc8c6c..ea6c80d6 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -17,29 +17,56 @@
 #include "ConnectWindow.hpp"
 
 #include "App.hpp"
+#include "Window.hpp"
 #include "WindowFactory.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/Configuration.hpp"
 #include "ingen/EngineBase.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/Module.hpp"
 #include "ingen/QueuedInterface.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
 #include "ingen/client/SocketClient.hpp"
+#include "ingen/fmt.hpp"
+#include "ingen/paths.hpp"
 #include "ingen_config.h"
+#include "raul/Path.hpp"
 #include "raul/Process.hpp"
 
+#include <boost/format/alt_sstream.hpp>
+#include <boost/optional/optional.hpp>
 #include <boost/variant/get.hpp>
 #include <glib.h>
+#include <glibmm/main.h>
+#include <glibmm/signalproxy.h>
+#include <glibmm/ustring.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/enums.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
+#include <gtkmm/main.h>
+#include <gtkmm/progressbar.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/spinbutton.h>
 #include <gtkmm/stock.h>
+#include <sigc++/adaptors/bind.h>
+#include <sigc++/functors/mem_fun.h>
+#include <sigc++/signal.h>
 
 #include <limits>
 #include <memory>
+#include <ostream>
 #include <string>
+#include <sys/time.h>
 #include <utility>
 
 using namespace ingen::client;
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 6d0b6f5a..0eaf7bb3 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -20,21 +20,24 @@
 #include "Window.hpp"
 
 #include "ingen/Message.hpp"
-#include "lilv/lilv.h"
 
-#include <gtkmm/builder.h>
-#include <gtkmm/button.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/image.h>
-#include <gtkmm/label.h>
-#include <gtkmm/progressbar.h>
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/spinbutton.h>
+#include <glibmm/refptr.h>
 
 #include <cstdint>
 #include <memory>
 #include <string>
 
+namespace Gtk {
+class Builder;
+class Button;
+class Entry;
+class Image;
+class Label;
+class ProgressBar;
+class RadioButton;
+class SpinButton;
+} // namespace Gtk
+
 namespace ingen {
 
 class Interface;