3 files changed, 9 insertions, 41 deletions
diff --git a/src/helper/action.h b/src/helper/action.h
index 7e4da3312..e7c799992 100644
--- a/src/helper/action.h
+++ b/src/helper/action.h
@@ -14,9 +14,11 @@
 
 #include <sigc++/sigc++.h>
 #include <glibmm/ustring.h>
-#include "helper/helper-forward.h"
 #include "forward.h"
 
+struct SPAction;
+struct SPActionClass;
+
 #define SP_TYPE_ACTION (sp_action_get_type())
 #define SP_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ACTION, SPAction))
 #define SP_ACTION_CLASS(o) (G_TYPE_CHECK_CLASS_CAST((o), SP_TYPE_ACTION, SPActionClass))
diff --git a/src/helper/helper-forward.h b/src/helper/helper-forward.h
deleted file mode 100644
index f9b7f985b..000000000
--- a/src/helper/helper-forward.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __HELPER_FORWARD_H__
-#define __HELPER_FORWARD_H__
-
-/*
- * Forward declarations
- *
- * Author:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *
- * Copyright (C) 2002 Lauris Kaplinski
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-
-struct SPAction;
-struct SPActionClass;
-struct SPActionEventVector;
-
-struct SPUnit;
-struct SPUnitSelector;
-struct SPUnitSelectorClass;
-
-#endif
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h
index 919873c58..b495a3c15 100644
--- a/src/helper/unit-menu.h
+++ b/src/helper/unit-menu.h
@@ -1,5 +1,5 @@
-#ifndef __SP_UNIT_MENU_H__
-#define __SP_UNIT_MENU_H__
+#ifndef SP_UNIT_MENU_H
+#define SP_UNIT_MENU_H
 
 /*
  * SPUnitMenu
@@ -13,8 +13,9 @@
 #include <glib/gtypes.h>
 #include <gtk/gtk.h>
 
-#include <helper/helper-forward.h>
-
+struct SPUnit;
+struct SPUnitSelector;
+struct SPUnitSelectorClass;
 
 /* Unit selector Widget */
 
@@ -45,7 +46,7 @@ void sp_unit_selector_set_value_in_pixels(SPUnitSelector *selector, GtkAdjustmen
 
 
 
-#endif
+#endif // SP_UNIT_MENU_H
 
 /*
   Local Variables: