More forward.h purging.

(bzr r10665)

5 files changed, 25 insertions, 11 deletions

diff --git a/src/extension/internal/bitmap/imagemagick.h b/src/extension/internal/bitmap/imagemagick.h
index 1b150fc3d..08b322503 100644
--- a/src/extension/internal/bitmap/imagemagick.h
+++ b/src/extension/internal/bitmap/imagemagick.h
@@ -1,5 +1,5 @@
-#ifndef __INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H__
-#define __INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H__
+#ifndef INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H
+#define INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H
 
 /*
  * Copyright (C) 2007 Authors:
@@ -10,11 +10,14 @@
  */
 
 #include "extension/implementation/implementation.h"
-#include "extension/extension-forward.h"
 #include <Magick++.h>
 
 namespace Inkscape {
 namespace Extension {
+
+class Effect;
+class Extension;
+
 namespace Internal {
 namespace Bitmap {
 
@@ -37,4 +40,4 @@ public:
 }; /* namespace Extension */
 }; /* namespace Inkscape */
 
-#endif /* __INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H__ */
+#endif // INKSCAPE_EXTENSION_INTERNAL_BITMAP_IMAGEMAGICK_H
diff --git a/src/extension/internal/bluredge.h b/src/extension/internal/bluredge.h
index 48e30c054..d8fe056f7 100644
--- a/src/extension/internal/bluredge.h
+++ b/src/extension/internal/bluredge.h
@@ -7,11 +7,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "extension/extension-forward.h"
 #include "extension/implementation/implementation.h"
 
 namespace Inkscape {
 namespace Extension {
+
+class Effect;
+class Extension;
+
 namespace Internal {
 
 /** \brief  Implementation class of the GIMP gradient plugin.  This mostly
diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h
index a5d5d9d4e..08bc1c3f0 100644
--- a/src/extension/internal/filter/filter.h
+++ b/src/extension/internal/filter/filter.h
@@ -1,5 +1,5 @@
-#ifndef __INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H__
-#define __INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H__
+#ifndef INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H
+#define INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H
 
 /*
  * Copyright (C) 2008 Authors:
@@ -11,10 +11,13 @@
 #include <glibmm/i18n.h>
 
 #include "extension/implementation/implementation.h"
-#include "extension/extension-forward.h"
 
 namespace Inkscape {
 namespace Extension {
+
+class Effect;
+class Extension;
+
 namespace Internal {
 namespace Filter {
 
@@ -52,4 +55,4 @@ public:
 }; /* namespace Extension */
 }; /* namespace Inkscape */
 
-#endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H__ */
+#endif // INKSCAPE_EXTENSION_INTERNAL_FILTER_FILTER_H
diff --git a/src/extension/internal/gimpgrad.h b/src/extension/internal/gimpgrad.h
index ed409ef93..5ab48a147 100644
--- a/src/extension/internal/gimpgrad.h
+++ b/src/extension/internal/gimpgrad.h
@@ -13,10 +13,12 @@
 #include <glibmm/ustring.h>
 
 #include "extension/implementation/implementation.h"
-#include "extension/extension-forward.h"
 
 namespace Inkscape {
 namespace Extension {
+
+class Extension;
+
 namespace Internal {
 
 /** \brief  Implementation class of the GIMP gradient plugin.  This mostly
diff --git a/src/extension/internal/grid.h b/src/extension/internal/grid.h
index 1f37b1441..c54135d81 100644
--- a/src/extension/internal/grid.h
+++ b/src/extension/internal/grid.h
@@ -8,10 +8,13 @@
  */
 
 #include "extension/implementation/implementation.h"
-#include "extension/extension-forward.h"
 
 namespace Inkscape {
 namespace Extension {
+
+class Effect;
+class Extension;
+
 namespace Internal {
 
 /** \brief  Implementation class of the GIMP gradient plugin.  This mostly