7 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
index e43c0cb..2c98dd3 100644
--- a/src/declarative/fx/fx.pri
+++ b/src/declarative/fx/fx.pri
@@ -31,7 +31,7 @@ HEADERS += \
            fx/qfxrect_p.h \
            fx/qfxrepeater.h \
            fx/qfxrepeater_p.h \
-           fx/qfxscalegrid.h \
+           fx/qfxscalegrid_p.h \
            fx/qfxlineedit.h \
            fx/qfxlineedit_p.h \
            fx/qfxtextedit.h \
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h
index 9ab4456..9c2ef30 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qfximage.h
@@ -43,7 +43,6 @@
 #define QFXIMAGE_H
 
 #include <QtDeclarative/qfxitem.h>
-#include <QtDeclarative/qfxscalegrid.h>
 #include <QtNetwork/qnetworkreply.h>
 
 
@@ -53,6 +52,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 class QFxImagePrivate;
+class QFxScaleGrid;
+class QFxGridScaledImage;
+
 class Q_DECLARATIVE_EXPORT QFxImage : public QFxItem
 {
     Q_OBJECT
@@ -72,8 +74,6 @@ public:
     QFxImage(QFxItem *parent=0);
     ~QFxImage();
 
-    QFxScaleGrid *scaleGrid();
-
     enum FillMode { Stretch, PreserveAspect, Tile, TileVertically, TileHorizontally };
     FillMode fillMode() const;
     void setFillMode(FillMode);
@@ -112,6 +112,7 @@ private:
     Q_DISABLE_COPY(QFxImage)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImage)
     void setGridScaledImage(const QFxGridScaledImage& sci);
+    QFxScaleGrid *scaleGrid();
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfximage_p.h b/src/declarative/fx/qfximage_p.h
index 32529c4..41b628c 100644
--- a/src/declarative/fx/qfximage_p.h
+++ b/src/declarative/fx/qfximage_p.h
@@ -54,6 +54,7 @@
 //
 
 #include "qfxitem_p.h"
+#include "qfxscalegrid_p.h"
 
 #include <QtCore/qpointer.h>
 
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 5eb2516..6488e0d 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -55,7 +55,6 @@
 #include "qlistmodelinterface.h"
 #include "qfxanchors_p.h"
 
-#include "qfxscalegrid.h"
 #include "qfxview.h"
 #include "qmlstategroup.h"
 
diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qfxscalegrid.cpp
index abe8e0d..74ef0a1 100644
--- a/src/declarative/fx/qfxscalegrid.cpp
+++ b/src/declarative/fx/qfxscalegrid.cpp
@@ -41,7 +41,7 @@
 
 #include <QBuffer>
 #include <qml.h>
-#include "qfxscalegrid.h"
+#include "qfxscalegrid_p.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/fx/qfxscalegrid.h b/src/declarative/fx/qfxscalegrid_p.h
index 986bcda..986bcda 100644
--- a/src/declarative/fx/qfxscalegrid.h
+++ b/src/declarative/fx/qfxscalegrid_p.h
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 75cb624..47199ef 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -55,7 +55,6 @@
 #include "qml.h"
 #include "qmlengine.h"
 #include "qmlstate.h"
-#include "qfxscalegrid.h"
 #include "qlistmodelinterface.h"
 
 #include "qfxwebview.h"