1 files changed, 8 insertions, 6 deletions
diff --git a/src/shape-editor.h b/src/shape-editor.h
index f400244b3..206ff269b 100644
--- a/src/shape-editor.h
+++ b/src/shape-editor.h
@@ -1,5 +1,5 @@
-#ifndef __SHAPE_EDITOR_H__
-#define __SHAPE_EDITOR_H__
+#ifndef SEEN_SHAPE_EDITOR_H
+#define SEEN_SHAPE_EDITOR_H
 
 /*
  * Inkscape::ShapeEditor
@@ -12,19 +12,21 @@
  *
  */
 
-#include <forward.h>
+#include <glib.h>
+
 #include <2geom/forward.h>
 
+
 namespace Inkscape { namespace NodePath { class Path; } }
 namespace Inkscape { namespace XML { class Node; } }
 
 class KnotHolder;
+class LivePathEffectObject;
 class SPDesktop;
+class SPItem;
 class SPNodeContext;
 class ShapeEditorsCollective;
-class LivePathEffectObject;
 
-#include "libnr/nr-path-code.h"
 #include <2geom/point.h>
 #include <boost/optional.hpp>
 #include <vector>
@@ -74,7 +76,7 @@ private:
     Inkscape::XML::Node *knotholder_listener_attached_for;
 };
 
-#endif
+#endif // SEEN_SHAPE_EDITOR_H
 
 
 /*