2010-12-03 Nikolas Zimmermann <nzimmermann@rim.com>
Reviewed by Dirk Schulze.
1336 files in WebCore rebuild when you touch SVGNames
https://bugs.webkit.org/show_bug.cgi?id=42025
Remove global SVGNames.h dependency, as SVGAnimatedPropertyMacros.h included it.
This requires to add the SVGNames.h include to lots of cpp files.
No functional changes, thus no new tests.
* css/CSSCursorImageValue.cpp:
* css/CSSFontFaceSource.cpp:
* dom/Node.cpp:
* loader/cache/CachedFont.cpp:
* rendering/RenderSVGResourceClipper.cpp:
* rendering/RenderSVGResourceFilter.cpp:
* rendering/RenderSVGTransformableContainer.cpp:
* rendering/RenderSVGViewportContainer.cpp:
* rendering/SVGRenderTreeAsText.cpp:
* rendering/SVGResources.cpp:
* rendering/svg/RenderSVGTextPath.cpp:
* rendering/svg/SVGRootInlineBox.cpp:
* svg/SVGAnimateElement.cpp:
* svg/SVGAnimateMotionElement.cpp:
* svg/SVGAnimateTransformElement.cpp:
* svg/SVGDefsElement.cpp:
* svg/SVGFEBlendElement.cpp:
* svg/SVGFEDisplacementMapElement.cpp:
* svg/SVGFEMergeElement.cpp:
* svg/SVGFEMergeNodeElement.cpp:
* svg/SVGFEOffsetElement.cpp:
* svg/SVGFETileElement.cpp:
* svg/SVGFETurbulenceElement.cpp:
* svg/SVGFont.cpp:
* svg/SVGGElement.cpp:
* svg/SVGImageElement.cpp:
* svg/SVGLength.cpp:
* svg/SVGMPathElement.cpp:
* svg/SVGPathElement.cpp:
* svg/SVGPathSegList.cpp:
* svg/SVGStyledTransformableElement.cpp:
* svg/SVGSymbolElement.cpp:
* svg/SVGTextContentElement.cpp:
* svg/SVGTextElement.cpp:
* svg/SVGTextPathElement.cpp:
* svg/SVGUseElement.cpp:
* svg/SVGViewSpec.cpp:
* svg/animation/SMILTimeContainer.cpp:
* svg/properties/SVGAnimatedPropertyMacros.h:
* svg/properties/SVGPathSegListPropertyTearOff.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4953a54..ded261c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,56 @@
+2010-12-03 Nikolas Zimmermann <nzimmermann@rim.com>
+
+ Reviewed by Dirk Schulze.
+
+ 1336 files in WebCore rebuild when you touch SVGNames
+ https://bugs.webkit.org/show_bug.cgi?id=42025
+
+ Remove global SVGNames.h dependency, as SVGAnimatedPropertyMacros.h included it.
+ This requires to add the SVGNames.h include to lots of cpp files.
+
+ No functional changes, thus no new tests.
+
+ * css/CSSCursorImageValue.cpp:
+ * css/CSSFontFaceSource.cpp:
+ * dom/Node.cpp:
+ * loader/cache/CachedFont.cpp:
+ * rendering/RenderSVGResourceClipper.cpp:
+ * rendering/RenderSVGResourceFilter.cpp:
+ * rendering/RenderSVGTransformableContainer.cpp:
+ * rendering/RenderSVGViewportContainer.cpp:
+ * rendering/SVGRenderTreeAsText.cpp:
+ * rendering/SVGResources.cpp:
+ * rendering/svg/RenderSVGTextPath.cpp:
+ * rendering/svg/SVGRootInlineBox.cpp:
+ * svg/SVGAnimateElement.cpp:
+ * svg/SVGAnimateMotionElement.cpp:
+ * svg/SVGAnimateTransformElement.cpp:
+ * svg/SVGDefsElement.cpp:
+ * svg/SVGFEBlendElement.cpp:
+ * svg/SVGFEDisplacementMapElement.cpp:
+ * svg/SVGFEMergeElement.cpp:
+ * svg/SVGFEMergeNodeElement.cpp:
+ * svg/SVGFEOffsetElement.cpp:
+ * svg/SVGFETileElement.cpp:
+ * svg/SVGFETurbulenceElement.cpp:
+ * svg/SVGFont.cpp:
+ * svg/SVGGElement.cpp:
+ * svg/SVGImageElement.cpp:
+ * svg/SVGLength.cpp:
+ * svg/SVGMPathElement.cpp:
+ * svg/SVGPathElement.cpp:
+ * svg/SVGPathSegList.cpp:
+ * svg/SVGStyledTransformableElement.cpp:
+ * svg/SVGSymbolElement.cpp:
+ * svg/SVGTextContentElement.cpp:
+ * svg/SVGTextElement.cpp:
+ * svg/SVGTextPathElement.cpp:
+ * svg/SVGUseElement.cpp:
+ * svg/SVGViewSpec.cpp:
+ * svg/animation/SMILTimeContainer.cpp:
+ * svg/properties/SVGAnimatedPropertyMacros.h:
+ * svg/properties/SVGPathSegListPropertyTearOff.cpp:
+
2010-12-02 Philippe Normand <pnormand@igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebCore/css/CSSCursorImageValue.cpp b/WebCore/css/CSSCursorImageValue.cpp
index b0dda58..1c3f0bb 100644
--- a/WebCore/css/CSSCursorImageValue.cpp
+++ b/WebCore/css/CSSCursorImageValue.cpp
@@ -30,6 +30,7 @@
#if ENABLE(SVG)
#include "SVGCursorElement.h"
+#include "SVGNames.h"
#include "SVGURIReference.h"
#endif
diff --git a/WebCore/css/CSSFontFaceSource.cpp b/WebCore/css/CSSFontFaceSource.cpp
index 30a0072..12d2e1e 100644
--- a/WebCore/css/CSSFontFaceSource.cpp
+++ b/WebCore/css/CSSFontFaceSource.cpp
@@ -37,10 +37,10 @@
#if ENABLE(SVG_FONTS)
#include "FontCustomPlatformData.h"
-#include "HTMLNames.h"
#include "SVGFontData.h"
#include "SVGFontElement.h"
#include "SVGFontFaceElement.h"
+#include "SVGNames.h"
#include "SVGURIReference.h"
#endif
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index 15a5ab1..3bfeab2 100644
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -97,6 +97,7 @@
#if ENABLE(SVG)
#include "SVGElementInstance.h"
+#include "SVGNames.h"
#include "SVGUseElement.h"
#endif
diff --git a/WebCore/loader/cache/CachedFont.cpp b/WebCore/loader/cache/CachedFont.cpp
index 96654a5..772a386 100644
--- a/WebCore/loader/cache/CachedFont.cpp
+++ b/WebCore/loader/cache/CachedFont.cpp
@@ -31,10 +31,10 @@
#define STORE_FONT_CUSTOM_PLATFORM_DATA
#endif
-#include "MemoryCache.h"
#include "CachedResourceClient.h"
#include "CachedResourceClientWalker.h"
#include "FontPlatformData.h"
+#include "MemoryCache.h"
#include "SharedBuffer.h"
#include "TextResourceDecoder.h"
#include "loader.h"
@@ -45,11 +45,11 @@
#endif
#if ENABLE(SVG_FONTS)
-#include "HTMLNames.h"
#include "NodeList.h"
#include "SVGElement.h"
#include "SVGFontElement.h"
#include "SVGGElement.h"
+#include "SVGNames.h"
#endif
namespace WebCore {
diff --git a/WebCore/rendering/RenderSVGResourceClipper.cpp b/WebCore/rendering/RenderSVGResourceClipper.cpp
index 25ed1c3..190c1a4 100644
--- a/WebCore/rendering/RenderSVGResourceClipper.cpp
+++ b/WebCore/rendering/RenderSVGResourceClipper.cpp
@@ -38,6 +38,7 @@
#include "SVGClipPathElement.h"
#include "SVGElement.h"
#include "SVGImageBufferTools.h"
+#include "SVGNames.h"
#include "SVGRenderSupport.h"
#include "SVGResources.h"
#include "SVGStyledElement.h"
diff --git a/WebCore/rendering/RenderSVGResourceFilter.cpp b/WebCore/rendering/RenderSVGResourceFilter.cpp
index 38d2357..2ed92bd 100644
--- a/WebCore/rendering/RenderSVGResourceFilter.cpp
+++ b/WebCore/rendering/RenderSVGResourceFilter.cpp
@@ -41,6 +41,7 @@
#include "SVGFilterElement.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGImageBufferTools.h"
+#include "SVGNames.h"
#include "SVGStyledElement.h"
#include "SVGUnitTypes.h"
#include <wtf/Vector.h>
diff --git a/WebCore/rendering/RenderSVGTransformableContainer.cpp b/WebCore/rendering/RenderSVGTransformableContainer.cpp
index c7d2029..3c91170 100644
--- a/WebCore/rendering/RenderSVGTransformableContainer.cpp
+++ b/WebCore/rendering/RenderSVGTransformableContainer.cpp
@@ -24,6 +24,7 @@
#if ENABLE(SVG)
#include "RenderSVGTransformableContainer.h"
+#include "SVGNames.h"
#include "SVGShadowTreeElements.h"
#include "SVGStyledTransformableElement.h"
diff --git a/WebCore/rendering/RenderSVGViewportContainer.cpp b/WebCore/rendering/RenderSVGViewportContainer.cpp
index ccf67fa..8031328 100644
--- a/WebCore/rendering/RenderSVGViewportContainer.cpp
+++ b/WebCore/rendering/RenderSVGViewportContainer.cpp
@@ -28,6 +28,7 @@
#include "GraphicsContext.h"
#include "RenderView.h"
+#include "SVGNames.h"
#include "SVGSVGElement.h"
namespace WebCore {
diff --git a/WebCore/rendering/SVGRenderTreeAsText.cpp b/WebCore/rendering/SVGRenderTreeAsText.cpp
index 9393fd6..ea843c2 100644
--- a/WebCore/rendering/SVGRenderTreeAsText.cpp
+++ b/WebCore/rendering/SVGRenderTreeAsText.cpp
@@ -62,6 +62,7 @@
#include "SVGInlineTextBox.h"
#include "SVGLineElement.h"
#include "SVGLinearGradientElement.h"
+#include "SVGNames.h"
#include "SVGPathElement.h"
#include "SVGPathParserFactory.h"
#include "SVGPatternElement.h"
diff --git a/WebCore/rendering/SVGResources.cpp b/WebCore/rendering/SVGResources.cpp
index f796f3b..e162f83 100644
--- a/WebCore/rendering/SVGResources.cpp
+++ b/WebCore/rendering/SVGResources.cpp
@@ -27,6 +27,7 @@
#include "RenderSVGResourceMasker.h"
#include "SVGFilterElement.h"
#include "SVGGradientElement.h"
+#include "SVGNames.h"
#include "SVGPaint.h"
#include "SVGPatternElement.h"
#include "SVGRenderStyle.h"
diff --git a/WebCore/rendering/svg/RenderSVGTextPath.cpp b/WebCore/rendering/svg/RenderSVGTextPath.cpp
index 64ebc6d..4ba2eeb 100644
--- a/WebCore/rendering/svg/RenderSVGTextPath.cpp
+++ b/WebCore/rendering/svg/RenderSVGTextPath.cpp
@@ -28,6 +28,7 @@
#include "FloatQuad.h"
#include "RenderBlock.h"
#include "SVGInlineTextBox.h"
+#include "SVGNames.h"
#include "SVGPathElement.h"
#include "SVGRootInlineBox.h"
#include "SVGTextPathElement.h"
diff --git a/WebCore/rendering/svg/SVGRootInlineBox.cpp b/WebCore/rendering/svg/SVGRootInlineBox.cpp
index 7109e1f..49c76de 100644
--- a/WebCore/rendering/svg/SVGRootInlineBox.cpp
+++ b/WebCore/rendering/svg/SVGRootInlineBox.cpp
@@ -30,6 +30,7 @@
#include "RenderSVGInlineText.h"
#include "SVGInlineFlowBox.h"
#include "SVGInlineTextBox.h"
+#include "SVGNames.h"
#include "SVGRenderSupport.h"
#include "SVGTextPositioningElement.h"
diff --git a/WebCore/svg/SVGAnimateElement.cpp b/WebCore/svg/SVGAnimateElement.cpp
index 152b3423..fadb845 100644
--- a/WebCore/svg/SVGAnimateElement.cpp
+++ b/WebCore/svg/SVGAnimateElement.cpp
@@ -20,17 +20,18 @@
*/
#include "config.h"
+
#if ENABLE(SVG) && ENABLE(SVG_ANIMATION)
#include "SVGAnimateElement.h"
#include "ColorDistance.h"
#include "FloatConversion.h"
#include "SVGColor.h"
+#include "SVGNames.h"
#include "SVGParserUtilities.h"
#include "SVGPathParserFactory.h"
#include "SVGPathSegList.h"
#include "SVGPointList.h"
-#include <math.h>
using namespace std;
diff --git a/WebCore/svg/SVGAnimateMotionElement.cpp b/WebCore/svg/SVGAnimateMotionElement.cpp
index 26151ed..828c15d 100644
--- a/WebCore/svg/SVGAnimateMotionElement.cpp
+++ b/WebCore/svg/SVGAnimateMotionElement.cpp
@@ -29,6 +29,7 @@
#include "RenderSVGResource.h"
#include "SVGElementInstance.h"
#include "SVGMPathElement.h"
+#include "SVGNames.h"
#include "SVGParserUtilities.h"
#include "SVGPathParserFactory.h"
#include "SVGPathElement.h"
diff --git a/WebCore/svg/SVGAnimateTransformElement.cpp b/WebCore/svg/SVGAnimateTransformElement.cpp
index f5d5aa8..bdcab38 100644
--- a/WebCore/svg/SVGAnimateTransformElement.cpp
+++ b/WebCore/svg/SVGAnimateTransformElement.cpp
@@ -32,6 +32,7 @@
#include "SVGAngle.h"
#include "SVGElementInstance.h"
#include "SVGGradientElement.h"
+#include "SVGNames.h"
#include "SVGParserUtilities.h"
#include "SVGSVGElement.h"
#include "SVGStyledTransformableElement.h"
diff --git a/WebCore/svg/SVGDefsElement.cpp b/WebCore/svg/SVGDefsElement.cpp
index c5061c5..59c5415 100644
--- a/WebCore/svg/SVGDefsElement.cpp
+++ b/WebCore/svg/SVGDefsElement.cpp
@@ -24,6 +24,7 @@
#include "SVGDefsElement.h"
#include "RenderSVGHiddenContainer.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEBlendElement.cpp b/WebCore/svg/SVGFEBlendElement.cpp
index 20c320e..86299fe 100644
--- a/WebCore/svg/SVGFEBlendElement.cpp
+++ b/WebCore/svg/SVGFEBlendElement.cpp
@@ -24,6 +24,7 @@
#include "SVGFEBlendElement.h"
#include "Attribute.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEDisplacementMapElement.cpp b/WebCore/svg/SVGFEDisplacementMapElement.cpp
index 33e392b..2edd174 100644
--- a/WebCore/svg/SVGFEDisplacementMapElement.cpp
+++ b/WebCore/svg/SVGFEDisplacementMapElement.cpp
@@ -23,6 +23,7 @@
#include "SVGFEDisplacementMapElement.h"
#include "Attribute.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEMergeElement.cpp b/WebCore/svg/SVGFEMergeElement.cpp
index bc6bed5..4499001 100644
--- a/WebCore/svg/SVGFEMergeElement.cpp
+++ b/WebCore/svg/SVGFEMergeElement.cpp
@@ -24,6 +24,7 @@
#include "SVGFEMergeElement.h"
#include "SVGFEMergeNodeElement.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEMergeNodeElement.cpp b/WebCore/svg/SVGFEMergeNodeElement.cpp
index e478464..83739de 100644
--- a/WebCore/svg/SVGFEMergeNodeElement.cpp
+++ b/WebCore/svg/SVGFEMergeNodeElement.cpp
@@ -27,6 +27,7 @@
#include "RenderObject.h"
#include "RenderSVGResource.h"
#include "SVGFilterElement.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEOffsetElement.cpp b/WebCore/svg/SVGFEOffsetElement.cpp
index 202415b..d41e6db 100644
--- a/WebCore/svg/SVGFEOffsetElement.cpp
+++ b/WebCore/svg/SVGFEOffsetElement.cpp
@@ -23,7 +23,8 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEOffsetElement.h"
-#include "Attr.h"
+#include "Attribute.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFETileElement.cpp b/WebCore/svg/SVGFETileElement.cpp
index 301fb43..e981482 100644
--- a/WebCore/svg/SVGFETileElement.cpp
+++ b/WebCore/svg/SVGFETileElement.cpp
@@ -23,7 +23,8 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFETileElement.h"
-#include "Attr.h"
+#include "Attribute.h"
+#include "SVGNames.h"
#include "SVGRenderStyle.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFETurbulenceElement.cpp b/WebCore/svg/SVGFETurbulenceElement.cpp
index c1c1309..0f59bf7 100644
--- a/WebCore/svg/SVGFETurbulenceElement.cpp
+++ b/WebCore/svg/SVGFETurbulenceElement.cpp
@@ -24,6 +24,7 @@
#include "SVGFETurbulenceElement.h"
#include "Attribute.h"
+#include "SVGNames.h"
#include "SVGParserUtilities.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFont.cpp b/WebCore/svg/SVGFont.cpp
index ffa01f2..4bda2d8 100644
--- a/WebCore/svg/SVGFont.cpp
+++ b/WebCore/svg/SVGFont.cpp
@@ -35,6 +35,7 @@
#include "SVGFontElement.h"
#include "SVGFontFaceElement.h"
#include "SVGMissingGlyphElement.h"
+#include "SVGNames.h"
#include "XMLNames.h"
using namespace WTF::Unicode;
diff --git a/WebCore/svg/SVGGElement.cpp b/WebCore/svg/SVGGElement.cpp
index 42069dd..233aa74 100644
--- a/WebCore/svg/SVGGElement.cpp
+++ b/WebCore/svg/SVGGElement.cpp
@@ -26,6 +26,7 @@
#include "RenderSVGHiddenContainer.h"
#include "RenderSVGResource.h"
#include "RenderSVGTransformableContainer.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGImageElement.cpp b/WebCore/svg/SVGImageElement.cpp
index 4404a6c..80bf34b 100644
--- a/WebCore/svg/SVGImageElement.cpp
+++ b/WebCore/svg/SVGImageElement.cpp
@@ -29,9 +29,7 @@
#include "RenderImageResource.h"
#include "RenderSVGImage.h"
#include "RenderSVGResource.h"
-#include "SVGDocument.h"
-#include "SVGLength.h"
-#include "SVGPreserveAspectRatio.h"
+#include "SVGNames.h"
#include "SVGSVGElement.h"
#include "XLinkNames.h"
diff --git a/WebCore/svg/SVGLength.cpp b/WebCore/svg/SVGLength.cpp
index 8168cf6..b0b7d1c 100644
--- a/WebCore/svg/SVGLength.cpp
+++ b/WebCore/svg/SVGLength.cpp
@@ -29,6 +29,7 @@
#include "FrameView.h"
#include "RenderObject.h"
#include "RenderView.h"
+#include "SVGNames.h"
#include "SVGParserUtilities.h"
#include "SVGSVGElement.h"
diff --git a/WebCore/svg/SVGMPathElement.cpp b/WebCore/svg/SVGMPathElement.cpp
index eb0b998..0df262e 100644
--- a/WebCore/svg/SVGMPathElement.cpp
+++ b/WebCore/svg/SVGMPathElement.cpp
@@ -23,6 +23,7 @@
#include "SVGMPathElement.h"
#include "Document.h"
+#include "SVGNames.h"
#include "SVGPathElement.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGPathElement.cpp b/WebCore/svg/SVGPathElement.cpp
index e976fc1..75665c1 100644
--- a/WebCore/svg/SVGPathElement.cpp
+++ b/WebCore/svg/SVGPathElement.cpp
@@ -26,6 +26,7 @@
#include "Attribute.h"
#include "RenderSVGPath.h"
#include "RenderSVGResource.h"
+#include "SVGNames.h"
#include "SVGPathParserFactory.h"
#include "SVGPathSegArc.h"
#include "SVGPathSegClosePath.h"
diff --git a/WebCore/svg/SVGPathSegList.cpp b/WebCore/svg/SVGPathSegList.cpp
index 09a3c0d..3782e19 100644
--- a/WebCore/svg/SVGPathSegList.cpp
+++ b/WebCore/svg/SVGPathSegList.cpp
@@ -25,6 +25,7 @@
#if ENABLE(SVG)
#include "SVGPathSegList.h"
+#include "SVGNames.h"
#include "SVGPathElement.h"
#include "SVGPathParserFactory.h"
diff --git a/WebCore/svg/SVGStyledTransformableElement.cpp b/WebCore/svg/SVGStyledTransformableElement.cpp
index 18f902a..71be01d 100644
--- a/WebCore/svg/SVGStyledTransformableElement.cpp
+++ b/WebCore/svg/SVGStyledTransformableElement.cpp
@@ -24,11 +24,9 @@
#include "SVGStyledTransformableElement.h"
#include "AffineTransform.h"
-#include "Attr.h"
+#include "Attribute.h"
#include "RenderSVGPath.h"
-#include "SVGDocument.h"
-#include "SVGStyledElement.h"
-#include "SVGTransformList.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGSymbolElement.cpp b/WebCore/svg/SVGSymbolElement.cpp
index 358ea6e..ee4278d 100644
--- a/WebCore/svg/SVGSymbolElement.cpp
+++ b/WebCore/svg/SVGSymbolElement.cpp
@@ -24,6 +24,7 @@
#include "SVGSymbolElement.h"
#include "SVGFitToViewBox.h"
+#include "SVGNames.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGTextContentElement.cpp b/WebCore/svg/SVGTextContentElement.cpp
index e1a5140..037ce3b 100644
--- a/WebCore/svg/SVGTextContentElement.cpp
+++ b/WebCore/svg/SVGTextContentElement.cpp
@@ -27,6 +27,7 @@
#include "CSSValueKeywords.h"
#include "Frame.h"
#include "RenderObject.h"
+#include "SVGNames.h"
#include "SVGTextQuery.h"
#include "SelectionController.h"
#include "XMLNames.h"
diff --git a/WebCore/svg/SVGTextElement.cpp b/WebCore/svg/SVGTextElement.cpp
index dc7ce55..e2cef48 100644
--- a/WebCore/svg/SVGTextElement.cpp
+++ b/WebCore/svg/SVGTextElement.cpp
@@ -28,10 +28,9 @@
#include "FloatRect.h"
#include "RenderSVGResource.h"
#include "RenderSVGText.h"
-#include "SVGLengthList.h"
+#include "SVGNames.h"
#include "SVGRenderStyle.h"
#include "SVGTSpanElement.h"
-#include "SVGTransformList.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGTextPathElement.cpp b/WebCore/svg/SVGTextPathElement.cpp
index 3ffc752..2a93ff9 100644
--- a/WebCore/svg/SVGTextPathElement.cpp
+++ b/WebCore/svg/SVGTextPathElement.cpp
@@ -24,6 +24,7 @@
#include "SVGTextPathElement.h"
#include "Attribute.h"
+#include "SVGNames.h"
#include "RenderSVGResource.h"
#include "RenderSVGTextPath.h"
diff --git a/WebCore/svg/SVGUseElement.cpp b/WebCore/svg/SVGUseElement.cpp
index b5cd8aa..c8228ca 100644
--- a/WebCore/svg/SVGUseElement.cpp
+++ b/WebCore/svg/SVGUseElement.cpp
@@ -37,8 +37,7 @@
#include "SVGElementInstance.h"
#include "SVGElementInstanceList.h"
#include "SVGGElement.h"
-#include "SVGLength.h"
-#include "SVGPreserveAspectRatio.h"
+#include "SVGNames.h"
#include "SVGSMILElement.h"
#include "SVGSVGElement.h"
#include "SVGShadowTreeElements.h"
diff --git a/WebCore/svg/SVGViewSpec.cpp b/WebCore/svg/SVGViewSpec.cpp
index 8cd656d..a1663d4 100644
--- a/WebCore/svg/SVGViewSpec.cpp
+++ b/WebCore/svg/SVGViewSpec.cpp
@@ -23,8 +23,8 @@
#include "SVGViewSpec.h"
#include "Document.h"
+#include "SVGNames.h"
#include "SVGParserUtilities.h"
-#include "SVGPreserveAspectRatio.h"
#include "SVGSVGElement.h"
#include "SVGTransformable.h"
diff --git a/WebCore/svg/animation/SMILTimeContainer.cpp b/WebCore/svg/animation/SMILTimeContainer.cpp
index b790859..3251d5b 100644
--- a/WebCore/svg/animation/SMILTimeContainer.cpp
+++ b/WebCore/svg/animation/SMILTimeContainer.cpp
@@ -27,11 +27,11 @@
#include "SMILTimeContainer.h"
#if ENABLE(SVG)
-
#include "CSSComputedStyleDeclaration.h"
#include "CSSParser.h"
#include "Document.h"
#include "SVGAnimationElement.h"
+#include "SVGNames.h"
#include "SVGSMILElement.h"
#include "SVGSVGElement.h"
#include <wtf/CurrentTime.h>
diff --git a/WebCore/svg/properties/SVGAnimatedPropertyMacros.h b/WebCore/svg/properties/SVGAnimatedPropertyMacros.h
index defbc6e..d5ba21a 100644
--- a/WebCore/svg/properties/SVGAnimatedPropertyMacros.h
+++ b/WebCore/svg/properties/SVGAnimatedPropertyMacros.h
@@ -24,7 +24,6 @@
#if ENABLE(SVG)
#include "SVGAnimatedPropertySynchronizer.h"
-#include "SVGNames.h" // FIXME: Temporary hack, until we expand the macros in all files, so we don't need a global SVGNames.h include
#include "SVGPropertyTraits.h"
namespace WebCore {
diff --git a/WebCore/svg/properties/SVGPathSegListPropertyTearOff.cpp b/WebCore/svg/properties/SVGPathSegListPropertyTearOff.cpp
index af1b30c..a4eaf73 100644
--- a/WebCore/svg/properties/SVGPathSegListPropertyTearOff.cpp
+++ b/WebCore/svg/properties/SVGPathSegListPropertyTearOff.cpp
@@ -23,6 +23,7 @@
#include "SVGPathSegListPropertyTearOff.h"
#include "SVGAnimatedPathSegListPropertyTearOff.h"
+#include "SVGNames.h"
#include "SVGPathElement.h"
#include "SVGPathSegWithContext.h"
