#include svg/svg-color.h instead of or as well as (as appropriate) svg/svg.h.

(bzr r232)

15 files changed, 15 insertions, 10 deletions

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 8a3074e2e..d4ce30e11 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -14,7 +14,7 @@
 #include "desktop.h"
 #include "color-rgba.h"
 #include "svg/css-ostringstream.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "selection.h"
 #include "sp-tspan.h"
 #include "sp-textpath.h"
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 304bf7c0e..b33d8b0f3 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -40,6 +40,7 @@
 #include "xml/repr.h"
 
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 
 #include "libnr/nr-matrix-fns.h"
 #include "libnr/nr-matrix-ops.h"
diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index 5ed09b3e0..17418186a 100644
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -24,7 +24,7 @@
 #include "desktop-handles.h"
 #include "extension/db.h"
 #include "inkscape.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "io/sys.h"
 #include "path-prefix.h"
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index b998b1b15..fbe1bd6ce 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -27,7 +27,7 @@
 #include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "display/curve.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "color.h"
 #include "color-rgba.h"
 #include "desktop-style.h"
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index 5e3924cef..21b689015 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -19,7 +19,7 @@
 #include "io/sys.h"
 #include "extension/system.h"
 #include "svg/css-ostringstream.h"
-#include "svg/svg.h" // svg-color.h
+#include "svg/svg-color.h"
 
 #include "gimpgrad.h"
 #include "streq.h"
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index b4a1eca92..85f3107f7 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -29,6 +29,7 @@
 #include <libnr/nr-matrix-fns.h>
 #include "xml/repr.h"
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 
 
 // Terminology:
diff --git a/src/interface.cpp b/src/interface.cpp
index f47d0ffa2..26552d510 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -56,7 +56,7 @@
 // Added for color drag-n-drop
 #include "display/sp-canvas.h"
 #include "color.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "style.h"
 
diff --git a/src/main.cpp b/src/main.cpp
index e791af153..32a4b6f94 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -65,6 +65,7 @@
 #include "unit-constants.h"
 
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/stringstream.h"
 
 #include "inkscape-private.h"
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index c2b0b32a3..dd7b7b257 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -29,6 +29,7 @@
 
 #include "display/nr-gradient-gpl.h"
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "attributes.h"
 #include "document-private.h"
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index f1d957d84..4dfdb1b28 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -20,7 +20,7 @@
 
 #include "display/canvas-grid.h"
 #include "helper/units.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "xml/repr.h"
 #include "attributes.h"
 #include "document.h"
diff --git a/src/style.cpp b/src/style.cpp
index ee67469ad..8a28b9f9e 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -23,6 +23,7 @@
 #include "xml/croco-node-iface.h"
 
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 
 #include "display/canvas-bpath.h"
 #include "attributes.h"
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index e1f0ee7a4..bed44ae16 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -24,7 +24,7 @@
 
 #include "helper/units.h"
 #include "xml/repr.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/stringstream.h"
 
 #include "inkscape.h"
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index be707e15e..066d72175 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -32,7 +32,7 @@
 #include "document.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "helper/units.h"
 
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 2917ab89d..5befb11d0 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -393,7 +393,7 @@ sp_gvs_defs_modified (SPObject *defs, guint flags, SPGradientVectorSelector *gvs
 #include "../widgets/sp-color-preview.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
-#include "../svg/svg.h"
+#include "../svg/svg-color.h"
 
 
 #define PAD 4
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index f16bc5852..5fc740979 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -41,7 +41,7 @@
 #include <document-private.h>
 #include <desktop-style.h>
 #include <style.h>
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 
 #include "paint-selector.h"