3 files changed, 10 insertions, 9 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 361c038..6e9250f 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -795,6 +795,9 @@ namespace QT_NAMESPACE {}
 #  define Q_WS_WIN
 #endif
 
+// forward declare std::exception
+namespace std { class exception; }
+
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
@@ -2315,8 +2318,6 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 
 #if defined(Q_OS_SYMBIAN)
 
-// forward declare std::exception
-namespace std { class exception; }
 
 Q_CORE_EXPORT void qt_translateSymbianErrorToException(int error);
 Q_CORE_EXPORT void qt_translateExceptionToSymbianErrorL(const std::exception& ex);
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index c11a7b9..976227d 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -47,11 +47,12 @@
 #include <e32std.h>
 #include "private/qcore_symbian_p.h"
 
-// Located in qlocale.cpp
-extern void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry);
 
 QT_BEGIN_NAMESPACE
 
+// Located in qlocale.cpp
+extern void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry);
+
 static TExtendedLocale _s60Locale;
 
 // Type definitions for runtime resolved function pointers
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 9ef5347..6c24055 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -51,6 +51,10 @@
 
 QT_BEGIN_HEADER
 
+#if defined(Q_OS_SYMBIAN)
+class CFbsBitmap;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
@@ -59,13 +63,8 @@ class QImageWriter;
 class QColor;
 class QVariant;
 class QX11Info;
-
 class QPixmapData;
 
-#if defined(Q_OS_SYMBIAN)
-class CFbsBitmap;
-#endif
-
 class Q_GUI_EXPORT QPixmap : public QPaintDevice
 {
 public: