1 files changed, 25 insertions, 11 deletions
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index e3d30d4c..9936b5df 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -20,17 +20,27 @@
 #include "GraphBox.hpp"
 #include "Window.hpp"
 
-#include "ingen/types.hpp"
-
-#include <gtkmm/builder.h>
+#include <gdk/gdk.h>
 
+#include <memory>
 #include <string>
 
+namespace Glib {
+template <class T> class RefPtr;
+} // namespace Glib
+
+namespace Gtk {
+class Builder;
+} // namespace Gtk
+
 namespace ingen {
 
+class Atom;
+
 namespace client {
 class GraphModel;
-}
+class PortModel;
+} // namespace client
 
 namespace gui {
 
@@ -44,12 +54,16 @@ public:
 	GraphWindow(BaseObjectType*                   cobject,
 	            const Glib::RefPtr<Gtk::Builder>& xml);
 
-	~GraphWindow();
+	~GraphWindow() override;
 
 	void init_window(App& app) override;
 
-	SPtr<const client::GraphModel> graph() const { return _box->graph(); }
-	GraphBox*                      box()   const { return _box; }
+	std::shared_ptr<const client::GraphModel> graph() const
+	{
+		return _box->graph();
+	}
+
+	GraphBox* box() const { return _box; }
 
 	bool documentation_is_visible() { return _box->documentation_is_visible(); }
 
@@ -68,10 +82,10 @@ protected:
 	bool on_key_press_event(GdkEventKey* event) override;
 
 private:
-	GraphBox* _box;
-	bool      _position_stored;
-	int       _x;
-	int       _y;
+	GraphBox* _box{nullptr};
+	bool      _position_stored{false};
+	int       _x{0};
+	int       _y{0};
 };
 
 } // namespace gui