diff -ur mozilla-release.orig/intl/locale/src/nsLocaleService.cpp mozilla-release/intl/locale/src/nsLocaleService.cpp
--- mozilla-release.orig/intl/locale/src/nsLocaleService.cpp	2012-06-14 11:49:38.000000000 -0700
+++ mozilla-release/intl/locale/src/nsLocaleService.cpp	2012-06-19 12:45:43.268705718 -0700
@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef MOZ_WIDGET_QT
-#include <QString>
+#include <QtCore/QString>
 #include <QtCore/QLocale>
 #endif
 
diff -ur mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.h mozilla-release/netwerk/system/qt/nsQtNetworkManager.h
--- mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.h	2012-06-14 11:50:01.000000000 -0700
+++ mozilla-release/netwerk/system/qt/nsQtNetworkManager.h	2012-06-19 14:13:24.574853212 -0700
@@ -38,11 +38,11 @@
 #ifndef NSQTNETWORKMANAGER_H_
 #define NSQTNETWORKMANAGER_H_
 
-#include <QNetworkConfigurationManager>
-#include <QObject>
-#include <QTimer>
-#include <QNetworkConfiguration>
-#include <QNetworkSession>
+#include <QtNetwork/QNetworkConfigurationManager>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtNetwork/QNetworkConfiguration>
+#include <QtNetwork/QNetworkSession>
 #include "nscore.h"
 
 class nsQtNetworkManager;

diff -ur mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.cpp mozilla-release/netwerk/system/qt/nsQtNetworkManager.cpp
--- mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.cpp	2012-06-14 11:50:01.000000000 -0700
+++ mozilla-release/netwerk/system/qt/nsQtNetworkManager.cpp	2012-06-19 14:48:42.839925278 -0700
@@ -44,9 +44,9 @@
 #include "nsIObserverService.h"
 #include "nsIOService.h"
 
-#include <QHostInfo>
-#include <QHostAddress>
-#include <QTime>
+#include <QtNetwork/QHostInfo>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QTime>
 
 nsQtNetworkManager* nsQtNetworkManager::gQtNetworkManager = nsnull;
 
diff -ur mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.h mozilla-release/ipc/chromium/src/base/message_pump_qt.h
--- mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.h	2012-06-14 11:49:39.000000000 -0700
+++ mozilla-release/ipc/chromium/src/base/message_pump_qt.h	2012-06-19 15:14:15.833946578 -0700
@@ -10,7 +10,7 @@
 #  include "mozilla/mozalloc_undef_macro_wrappers.h"
 #endif
  
-#include <qobject.h>
+#include <QtCore/qobject.h>
 
 #include "base/message_pump.h"
 #include "base/time.h"
diff -ur mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.cc mozilla-release/ipc/chromium/src/base/message_pump_qt.cc
--- mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.cc	2012-06-14 11:49:39.000000000 -0700
+++ mozilla-release/ipc/chromium/src/base/message_pump_qt.cc	2012-06-19 15:53:43.584712314 -0700
@@ -4,10 +4,10 @@
 
 #include "base/message_pump_qt.h"
 
-#include <qabstracteventdispatcher.h>
-#include <qevent.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <QtCore/qabstracteventdispatcher.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qapplication.h>
+#include <QtCore/qtimer.h>
 
 #include <fcntl.h>
 #include <limits>
diff -ur mozilla-release.orig/gfx/src/X11Util.h mozilla-release/gfx/src/X11Util.h
--- mozilla-release.orig/gfx/src/X11Util.h	2012-06-19 16:50:14.784819916 -0700
+++ mozilla-release/gfx/src/X11Util.h	2012-06-19 16:50:27.481437066 -0700
@@ -48,7 +48,7 @@
 // X11/X.h has #define CursorShape 0, but Qt's qnamespace.h defines
 //   enum CursorShape { ... }.  Good times!
 #undef CursorShape
-#  include <QX11Info>
+#  include <QtGui/QX11Info>
 #  include <X11/Xlib.h>
 #else
 #  error Unknown toolkit
diff -ur mozilla-release.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- mozilla-release.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-06-14 11:50:07.000000000 -0700
+++ mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-06-19 17:46:00.931769892 -0700
@@ -45,9 +45,9 @@
 #include <libosso.h>
 #endif
 #ifdef MOZ_WIDGET_QT
-#include <QDesktopServices>
-#include <QUrl>
-#include <QString>
+#include <QtGui/QDesktopServices>
+#include <QtCore/QUrl>
+#include <QtCore/QString>
 #if (MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
 #include "nsContentHandlerApp.h"
diff -ur mozilla-release.orig/gfx/gl/GLContextProviderGLX.cpp mozilla-release/gfx/gl/GLContextProviderGLX.cpp
--- mozilla-release.orig/gfx/gl/GLContextProviderGLX.cpp	2012-06-19 18:25:26.595877099 -0700
+++ mozilla-release/gfx/gl/GLContextProviderGLX.cpp	2012-06-19 18:25:40.702488750 -0700
@@ -39,8 +39,8 @@
 #include <gdk/gdkx.h>
 #define GET_NATIVE_WINDOW(aWidget) GDK_WINDOW_XID((GdkWindow *) aWidget->GetNativeData(NS_NATIVE_WINDOW))
 #elif defined(MOZ_WIDGET_QT)
-#include <QWidget>
-#include <QX11Info>
+#include <QtGui/QWidget>
+#include <QtGui/QX11Info>
 #define GET_NATIVE_WINDOW(aWidget) static_cast<QWidget*>(aWidget->GetNativeData(NS_NATIVE_SHELLWIDGET))->handle()
 #endif
 
diff -ur mozilla-release.orig/gfx/thebes/gfxQtPlatform.cpp mozilla-release/gfx/thebes/gfxQtPlatform.cpp

--- mozilla-release.orig/gfx/thebes/gfxQtPlatform.cpp	2012-06-14 11:49:37.000000000 -0700
+++ mozilla-release/gfx/thebes/gfxQtPlatform.cpp	2012-06-19 19:09:45.432174263 -0700
@@ -36,11 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QPixmap>
-#include <QX11Info>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QPaintEngine>
+#include <QtGui/QPixmap>
+#include <QtGui/QX11Info>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QPaintEngine>
 
 #include "gfxQtPlatform.h"
 
diff -ur mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.h mozilla-release/toolkit/xre/nsNativeAppSupportQt.h
--- mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.h	2012-06-14 11:50:07.000000000 -0700
+++ mozilla-release/toolkit/xre/nsNativeAppSupportQt.h	2012-06-19 21:00:02.506367573 -0700
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include <QObject>
+#include <QtCore/QObject>
 #ifdef MOZ_ENABLE_QMSYSTEM2
 #include "qmdevicemode.h"
 #include "qmdisplaystate.h"
diff -ur mozilla-release.orig/widget/qt/nsPrintSettingsQt.h mozilla-release/widget/qt/nsPrintSettingsQt.h
--- mozilla-release.orig/widget/qt/nsPrintSettingsQt.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsPrintSettingsQt.h	2012-06-19 21:01:25.599376843 -0700
@@ -40,7 +40,7 @@
 #ifndef nsPrintSettingsQt_h_
 #define nsPrintSettingsQt_h_
 
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 #include "nsPrintSettingsImpl.h"
 #define NS_PRINTSETTINGSQT_IID \
 {0x5bc4c746, 0x8970, 0x43a3, {0xbf, 0xb1, 0x5d, 0xe1, 0x74, 0xaf, 0x7c, 0xea}}
diff -ur mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.h mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.h
--- mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.h	2012-06-19 21:02:57.575684801 -0700
@@ -39,10 +39,10 @@
 #ifndef FAST_STARTUP_H
 #define FAST_STARTUP_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "nscore.h"
-#include <QThread>
-#include <QEventLoop>
+#include <QtCore/QThread>
+#include <QtCore/QEventLoop>
 #include <sys/time.h>
 
 class QGraphicsView;
diff -ur mozilla-release.orig/widget/qt/mozqorientationsensorfilter.h mozilla-release/widget/qt/mozqorientationsensorfilter.h
--- mozilla-release.orig/widget/qt/mozqorientationsensorfilter.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/mozqorientationsensorfilter.h	2012-06-19 21:03:52.375471080 -0700
@@ -40,8 +40,8 @@
 
 #include <QtSensors/QOrientationReading>
 #include <QtSensors/QOrientationFilter>
-#include <QObject>
-#include <QTransform>
+#include <QtCore/QObject>
+#include <QtGui/QTransform>
 
 using namespace QtMobility;
 
diff -ur mozilla-release.orig/widget/qt/nsDragService.h mozilla-release/widget/qt/nsDragService.h
--- mozilla-release.orig/widget/qt/nsDragService.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsDragService.h	2012-06-19 21:05:41.335046137 -0700
@@ -39,7 +39,7 @@
 #ifndef nsDragService_h__
 #define nsDragService_h__
 
-#include <qdrag.h>
+#include <QtGui/qdrag.h>
 
 #include "nsBaseDragService.h"
 
diff -ur mozilla-release.orig/widget/qt/nsMFilePicker.h mozilla-release/widget/qt/nsMFilePicker.h
--- mozilla-release.orig/widget/qt/nsMFilePicker.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsMFilePicker.h	2012-06-19 21:06:42.108142453 -0700
@@ -43,9 +43,9 @@
 #ifndef NSMFILEDIALOG_H
 #define NSMFILEDIALOG_H
 
-#include <QEventLoop>
-#include <QStringList>
-#include <QUrl>
+#include <QtCore/QEventLoop>
+#include <QtCore/QStringList>
+#include <QtCore/QUrl>
 
 class MApplicationPage;
 class MeegoFileDialog : public QObject
diff -ur mozilla-release.orig/widget/qt/nsFilePicker.h mozilla-release/widget/qt/nsFilePicker.h
--- mozilla-release.orig/widget/qt/nsFilePicker.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsFilePicker.h	2012-06-19 21:07:26.891301132 -0700
@@ -40,7 +40,7 @@
 #ifndef NSFILEPICKER_H
 #define NSFILEPICKER_H
 
-#include <QPointer>
+#include <QtCore/QPointer>
 #include "nsBaseFilePicker.h"
 #include "nsCOMArray.h"
 #include "nsString.h"
diff -ur mozilla-release.orig/widget/qt/nsNativeThemeQt.h mozilla-release/widget/qt/nsNativeThemeQt.h
--- mozilla-release.orig/widget/qt/nsNativeThemeQt.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsNativeThemeQt.h	2012-06-19 21:08:23.051082110 -0700
@@ -39,8 +39,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QStyle>
-#include <QPalette>
+#include <QtGui/QStyle>
+#include <QtGui/QPalette>
 
 #include "nsITheme.h"
 #include "nsCOMPtr.h"
diff -ur mozilla-release.orig/widget/qt/moziqwidget.h mozilla-release/widget/qt/moziqwidget.h
--- mozilla-release.orig/widget/qt/moziqwidget.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/moziqwidget.h	2012-06-19 21:09:42.290773074 -0700
@@ -48,7 +48,7 @@
 #include <MSceneWindow>
 #include <MInputMethodState>
 #include <QtGui/QGraphicsSceneResizeEvent>
-#include <QTimer>
+#include <QtCore/QTimer>
 #endif
 
 class nsWindow;
diff -ur mozilla-release.orig/widget/qt/nsClipboard.h mozilla-release/widget/qt/nsClipboard.h
--- mozilla-release.orig/widget/qt/nsClipboard.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsClipboard.h	2012-06-19 21:11:18.657063909 -0700
@@ -45,7 +45,7 @@
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 
-#include <qclipboard.h>
+#include <QtGui/qclipboard.h>
 
 /* Native Qt Clipboard wrapper */
 class nsClipboard : public nsIClipboard
diff -ur mozilla-release.orig/widget/qt/nsWindow.h mozilla-release/widget/qt/nsWindow.h
--- mozilla-release.orig/widget/qt/nsWindow.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsWindow.h	2012-06-19 21:13:20.699921273 -0700
@@ -41,9 +41,9 @@
 #ifndef __nsWindow_h__
 #define __nsWindow_h__
 
-#include <QKeyEvent>
-#include <qgraphicswidget.h>
-#include <QTime>
+#include <QtGui/QKeyEvent>
+#include <QtGui/qgraphicswidget.h>
+#include <QtCore/QTime>
 
 #include "nsAutoPtr.h"
 
diff -ur mozilla-release.orig/widget/qt/nsAppShell.h mozilla-release/widget/qt/nsAppShell.h
--- mozilla-release.orig/widget/qt/nsAppShell.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsAppShell.h	2012-06-19 21:14:10.189728263 -0700
@@ -39,7 +39,7 @@
 #ifndef nsAppShell_h__
 #define nsAppShell_h__
 
-#include <qsocketnotifier.h>
+#include <QtCore/qsocketnotifier.h>
 #include "nsBaseAppShell.h"
 #include "nsCOMPtr.h"
 
diff -ur mozilla-release.orig/widget/qt/mozSwipeGesture.h mozilla-release/widget/qt/mozSwipeGesture.h
--- mozilla-release.orig/widget/qt/mozSwipeGesture.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/mozSwipeGesture.h	2012-06-19 21:15:47.986013523 -0700
@@ -41,9 +41,9 @@
 #ifndef MOZSWIPEGESTURE_H
 #define MOZSWIPEGESTURE_H
 
-#include <QGestureRecognizer>
-#include <QGesture>
-#include <QTouchEvent>
+#include <QtGui/QGestureRecognizer>
+#include <QtGui/QGesture>
+#include <QtGui/QTouchEvent>
 
 class MozSwipeGestureRecognizer: public QGestureRecognizer
 {
diff -ur mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.h mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.h
--- mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.h	2012-06-14 11:49:32.000000000 -0700
+++ mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.h	2012-06-19 21:18:05.428810827 -0700
@@ -37,7 +37,7 @@
 #ifndef nsDeviceMotionSystem_h
 #define nsDeviceMotionSystem_h
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtSensors/QAccelerometer>
 #include <QtSensors/QRotationSensor>
 #include "nsDeviceMotion.h"
diff -ur mozilla-release.orig/dom/plugins/base/npapi.h mozilla-release/dom/plugins/base/npapi.h
--- mozilla-release.orig/dom/plugins/base/npapi.h	2012-06-14 11:49:32.000000000 -0700
+++ mozilla-release/dom/plugins/base/npapi.h	2012-06-19 21:19:30.611811945 -0700
@@ -92,8 +92,8 @@
 #endif
 
 #if defined(XP_SYMBIAN)
-#include <QEvent>
-#include <QRegion>
+#include <QtCore/QEvent>
+#include <QtGui/QRegion>
 #endif
 
 /*----------------------------------------------------------------------*/
diff -ur mozilla-release.orig/toolkit/components/remote/nsQtRemoteService.cpp mozilla-release/toolkit/components/remote/nsQtRemoteService.cpp
--- mozilla-release.orig/toolkit/components/remote/nsQtRemoteService.cpp	2012-06-14 11:50:05.000000000 -0700
+++ mozilla-release/toolkit/components/remote/nsQtRemoteService.cpp	2012-06-19 22:25:32.919692213 -0700
@@ -39,8 +39,8 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include <QWidget>
-#include <QX11Info>
+#include <QtGui/QWidget>
+#include <QtGui/QX11Info>
 #include "nsQtRemoteService.h"
 
 #include "mozilla/ModuleUtils.h"
diff -ur mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.cpp mozilla-release/toolkit/xre/nsNativeAppSupportQt.cpp
--- mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.cpp	2012-06-14 11:50:07.000000000 -0700
+++ mozilla-release/toolkit/xre/nsNativeAppSupportQt.cpp	2012-06-19 22:25:51.639619209 -0700
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "nsNativeAppSupportQt.h"
 #include "nsCOMPtr.h"
diff -ur mozilla-release.orig/toolkit/xre/nsQAppInstance.cpp mozilla-release/toolkit/xre/nsQAppInstance.cpp
--- mozilla-release.orig/toolkit/xre/nsQAppInstance.cpp	2012-06-14 11:50:07.000000000 -0700
+++ mozilla-release/toolkit/xre/nsQAppInstance.cpp	2012-06-19 22:26:28.609475008 -0700
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsQAppInstance.h"
-#include <QApplication>
+#include <QtGui/QApplication>
 #ifdef MOZ_ENABLE_MEEGOTOUCH
 #include <MComponentData>
 #include <MApplicationService>
diff -ur mozilla-release.orig/widget/shared/nsShmImage.cpp mozilla-release/widget/shared/nsShmImage.cpp
--- mozilla-release.orig/widget/shared/nsShmImage.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/shared/nsShmImage.cpp	2012-06-19 22:26:42.832752892 -0700
@@ -42,7 +42,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #elif defined(MOZ_WIDGET_QT)
-#include <QWidget>
+#include <QtGui/QWidget>
 #endif
 
 #include "nsShmImage.h"
diff -ur mozilla-release.orig/widget/qt/nsWindow.cpp mozilla-release/widget/qt/nsWindow.cpp
--- mozilla-release.orig/widget/qt/nsWindow.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsWindow.cpp	2012-06-19 22:28:57.098895462 -0700
@@ -59,14 +59,14 @@
 #include <QtGui/QGraphicsSceneWheelEvent>
 #include <QtGui/QGraphicsSceneResizeEvent>
 #include <QtGui/QStyleOptionGraphicsItem>
-#include <QPaintEngine>
+#include <QtGui/QPaintEngine>
 
 #include <QtCore/QDebug>
 #include <QtCore/QEvent>
 #include <QtCore/QVariant>
 #if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0))
-#include <QPinchGesture>
-#include <QGestureRecognizer>
+#include <QtGui/QPinchGesture>
+#include <QtGui/QGestureRecognizer>
 #include "mozSwipeGesture.h"
 static Qt::GestureType gSwipeGestureId = Qt::CustomGesture;
 
@@ -80,7 +80,7 @@
 #endif // QT version check 4.6
 
 #ifdef MOZ_X11
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #include <X11/Xlib.h>
 #endif //MOZ_X11
 
@@ -133,7 +133,7 @@
 #include <X11/Xatom.h>
 static Atom sPluginIMEAtom = nsnull;
 #define PLUGIN_VKB_REQUEST_PROP "_NPAPI_PLUGIN_REQUEST_VKB"
-#include <QThread>
+#include <QtCore/QThread>
 #endif
 #endif //MOZ_X11
 
diff -ur mozilla-release.orig/widget/qt/nsScreenQt.cpp mozilla-release/widget/qt/nsScreenQt.cpp
--- mozilla-release.orig/widget/qt/nsScreenQt.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsScreenQt.cpp	2012-06-19 22:30:45.335140256 -0700
@@ -37,12 +37,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <qcolor.h>
-#include <qcolormap.h>
-#include <qrect.h>
-#include <qdesktopwidget.h>
-#include <qapplication.h>
-#include <QTransform>
+#include <QtGui/qcolor.h>
+#include <QtGui/qcolormap.h>
+#include <QtCore/qrect.h>
+#include <QtGui/qdesktopwidget.h>
+#include <QtGui/qapplication.h>
+#include <QtGui/QTransform>
 
 #include "nsScreenQt.h"
 #include "nsXULAppAPI.h"
diff -ur mozilla-release.orig/widget/qt/nsNativeThemeQt.cpp mozilla-release/widget/qt/nsNativeThemeQt.cpp
--- mozilla-release.orig/widget/qt/nsNativeThemeQt.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsNativeThemeQt.cpp	2012-06-19 22:32:18.608110027 -0700
@@ -38,16 +38,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QApplication>
-#include <QStyle>
-#include <QPalette>
-#include <QRect>
-#include <QPainter>
-#include <QStyleOption>
-#include <QStyleOptionFrameV2>
-#include <QStyleOptionButton>
-#include <QFlags>
-#include <QStyleOptionComboBox>
+#include <QtGui/QApplication>
+#include <QtGui/QStyle>
+#include <QtGui/QPalette>
+#include <QtCore/QRect>
+#include <QtGui/QPainter>
+#include <QtGui/QStyleOption>
+#include <QtGui/QStyleOptionFrameV2>
+#include <QtGui/QStyleOptionButton>
+#include <QtCore/QFlags>
+#include <QtGui/QStyleOptionComboBox>
 
 #include "nsIFrame.h"
 
diff -ur mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.cpp mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.cpp
--- mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.cpp	2012-06-19 22:32:33.774717737 -0700
@@ -39,7 +39,7 @@
 #include <QtGui/QApplication>
 #include "nsQAppInstance.h"
 #include <QtOpenGL/QGLWidget>
-#include <QThread>
+#include <QtCore/QThread>
 #if defined MOZ_ENABLE_MEEGOTOUCH
 #include <MScene>
 #endif
diff -ur mozilla-release.orig/widget/qt/nsBidiKeyboard.cpp mozilla-release/widget/qt/nsBidiKeyboard.cpp
--- mozilla-release.orig/widget/qt/nsBidiKeyboard.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsBidiKeyboard.cpp	2012-06-19 22:33:04.184598597 -0700
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <Qt>
-#include <QApplication>
+#include <QtCore/Qt>
+#include <QtGui/QApplication>
 
 #include "nsBidiKeyboard.h"
 
diff -ur mozilla-release.orig/widget/qt/nsLookAndFeel.cpp mozilla-release/widget/qt/nsLookAndFeel.cpp
--- mozilla-release.orig/widget/qt/nsLookAndFeel.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsLookAndFeel.cpp	2012-06-19 22:34:15.637653622 -0700
@@ -40,20 +40,20 @@
 
 // Qt headers must be included before anything that might pull in our
 // malloc wrappers.
-#include <QApplication>
-#include <QFont>
-#include <QPalette>
-#include <QStyle>
+#include <QtGui/QApplication>
+#include <QtGui/QFont>
+#include <QtGui/QPalette>
+#include <QtGui/QStyle>
 
 #undef NS_LOOKANDFEEL_DEBUG
 #ifdef NS_LOOKANDFEEL_DEBUG
-#include <QDebug>
+#include <QtCore/QDebug>
 #endif
 
 #include "nsLookAndFeel.h"
 #include "nsStyleConsts.h"
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 #define QCOLOR_TO_NS_RGB(c)                     \
   ((nscolor)NS_RGB(c.red(),c.green(),c.blue()))
diff -ur mozilla-release.orig/widget/qt/nsIdleServiceQt.cpp mozilla-release/widget/qt/nsIdleServiceQt.cpp
--- mozilla-release.orig/widget/qt/nsIdleServiceQt.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsIdleServiceQt.cpp	2012-06-19 22:34:31.357592302 -0700
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #if !defined(MOZ_PLATFORM_MAEMO) && defined(MOZ_X11)
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #endif
 
 #include "nsIdleServiceQt.h"
diff -ur mozilla-release.orig/widget/qt/nsAppShell.cpp mozilla-release/widget/qt/nsAppShell.cpp
--- mozilla-release.orig/widget/qt/nsAppShell.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsAppShell.cpp	2012-06-19 22:35:03.430800236 -0700
@@ -37,12 +37,12 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsAppShell.h"
-#include <qapplication.h>
+#include <QtGui/qapplication.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#include <qabstracteventdispatcher.h>
+#include <QtCore/qabstracteventdispatcher.h>
 
 #include "prenv.h"
 #include "nsQAppInstance.h"
diff -ur mozilla-release.orig/widget/qt/nsDeviceContextSpecQt.cpp mozilla-release/widget/qt/nsDeviceContextSpecQt.cpp
--- mozilla-release.orig/widget/qt/nsDeviceContextSpecQt.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsDeviceContextSpecQt.cpp	2012-06-19 22:36:02.750569204 -0700
@@ -41,8 +41,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 
-#include <QTemporaryFile>
-#include <QPrinterInfo>
+#include <QtCore/QTemporaryFile>
+#include <QtGui/QPrinterInfo>
 
 #define SET_PRINTER_FEATURES_VIA_PREFS 1
 #define PRINTERFEATURES_PREF "print.tmp.printerfeatures"
diff -ur mozilla-release.orig/widget/qt/mozSwipeGesture.cpp mozilla-release/widget/qt/mozSwipeGesture.cpp
--- mozilla-release.orig/widget/qt/mozSwipeGesture.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/mozSwipeGesture.cpp	2012-06-19 22:36:21.933827719 -0700
@@ -35,8 +35,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "mozSwipeGesture.h"
-#include <QTouchEvent>
-#include <QGraphicsWidget>
+#include <QtGui/QTouchEvent>
+#include <QtGui/QGraphicsWidget>
 #include <prtypes.h>
 #include <nsIDOMSimpleGestureEvent.h>
 #include <math.h>
diff -ur mozilla-release.orig/widget/qt/nsPrintSettingsQt.cpp mozilla-release/widget/qt/nsPrintSettingsQt.cpp
--- mozilla-release.orig/widget/qt/nsPrintSettingsQt.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsPrintSettingsQt.cpp	2012-06-19 22:36:44.173740632 -0700
@@ -37,8 +37,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QPrinter>
-#include <QDebug>
+#include <QtGui/QPrinter>
+#include <QtCore/QDebug>
 #include "nsPrintSettingsQt.h"
 #include "nsILocalFile.h"
 #include "nsCRTGlue.h"
diff -ur mozilla-release.orig/widget/qt/mozqwidget.cpp mozilla-release/widget/qt/mozqwidget.cpp
--- mozilla-release.orig/widget/qt/mozqwidget.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/mozqwidget.cpp	2012-06-19 22:37:05.023659509 -0700
@@ -50,7 +50,7 @@
 #ifdef MOZ_ENABLE_QTMOBILITY
 #include "mozqorientationsensorfilter.h"
 #ifdef MOZ_X11
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 # undef KeyPress
diff -ur mozilla-release.orig/widget/qt/nsFilePicker.cpp mozilla-release/widget/qt/nsFilePicker.cpp
--- mozilla-release.orig/widget/qt/nsFilePicker.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsFilePicker.cpp	2012-06-19 22:37:45.253504487 -0700
@@ -38,17 +38,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QStringList>
-#include <QGraphicsWidget>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QTemporaryFile>
+#include <QtCore/QStringList>
+#include <QtGui/QGraphicsWidget>
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsView>
+#include <QtCore/QTemporaryFile>
 
 #ifdef MOZ_ENABLE_CONTENTMANAGER
 #include "nsMFilePicker.h"
 #define MozFileDialog MeegoFileDialog
 #else
-#include <QFileDialog>
+#include <QtGui/QFileDialog>
 #define MozFileDialog QFileDialog
 #endif
 

diff -ur mozilla-release.orig/widget/qt/nsMFilePicker.cpp mozilla-release/widget/qt/nsMFilePicker.cpp
--- mozilla-release.orig/widget/qt/nsMFilePicker.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsMFilePicker.cpp	2012-06-19 22:38:39.793290063 -0700
@@ -39,7 +39,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
-#include <QWidget>
+#include <QtGui/QWidget>
 #include "nsMFilePicker.h"
 
 
@@ -53,8 +53,8 @@
 #include <MApplicationWindow>
 #include <MSceneManager>
 
-#include <QFileInfo>
-#include <QPointer>
+#include <QtCore/QFileInfo>
+#include <QtCore/QPointer>
 
 #include <SelectSingleContentItemPage.h>
 #include <SelectMultipleContentItemsPage.h>
diff -ur mozilla-release.orig/widget/qt/nsSound.cpp mozilla-release/widget/qt/nsSound.cpp
--- mozilla-release.orig/widget/qt/nsSound.cpp	2012-06-19 21:29:35.819451627 -0700
+++ mozilla-release/widget/qt/nsSound.cpp	2012-06-19 22:39:10.153172562 -0700
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QApplication>
-#include <QSound>
+#include <QtGui/QApplication>
+#include <QtGui/QSound>
 
 #include <string.h>
 #if defined(ANDROID) || defined(OS_POSIX)
diff -ur mozilla-release.orig/widget/qt/nsClipboard.cpp mozilla-release/widget/qt/nsClipboard.cpp
--- mozilla-release.orig/widget/qt/nsClipboard.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsClipboard.cpp	2012-06-19 22:41:13.729357011 -0700
@@ -40,14 +40,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QApplication>
-#include <QMimeData>
-#include <QString>
-#include <QStringList>
-#include <QByteArray>
-#include <QImage>
-#include <QImageWriter>
-#include <QBuffer>
+#include <QtGui/QApplication>
+#include <QtCore/QMimeData>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QByteArray>
+#include <QtGui/QImage>
+#include <QtGui/QImageWriter>
+#include <QtCore/QBuffer>
 
 #include "mozilla/Util.h"
 
diff -ur mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.cpp mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.cpp
--- mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.cpp	2012-06-14 11:49:32.000000000 -0700
+++ mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.cpp	2012-06-19 22:41:27.289303302 -0700
@@ -37,7 +37,7 @@
 
 #include "mozilla/dom/ContentChild.h"
 #include "nsQTMDeviceMotionSystem.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtSensors/QAccelerometer>
 #include <QtSensors/QRotationSensor>
 
diff -ur mozilla-release.orig/dom/system/unix/nsHapticFeedback.cpp mozilla-release/dom/system/unix/nsHapticFeedback.cpp
diff -ur mozilla-release.orig/dom/plugins/base/nsNPAPIPlugin.cpp mozilla-release/dom/plugins/base/nsNPAPIPlugin.cpp
--- mozilla-release.orig/dom/plugins/base/nsNPAPIPlugin.cpp	2012-06-14 11:49:32.000000000 -0700
+++ mozilla-release/dom/plugins/base/nsNPAPIPlugin.cpp	2012-06-19 22:42:53.402300984 -0700
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef MOZ_WIDGET_QT
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #endif
 
 #include "base/basictypes.h"
diff -ur mozilla-release.orig/dom/plugins/base/nsPluginInstanceOwner.cpp mozilla-release/dom/plugins/base/nsPluginInstanceOwner.cpp
--- mozilla-release.orig/dom/plugins/base/nsPluginInstanceOwner.cpp	2012-06-14 11:49:32.000000000 -0700
+++ mozilla-release/dom/plugins/base/nsPluginInstanceOwner.cpp	2012-06-19 22:43:47.698755931 -0700
@@ -45,10 +45,10 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef MOZ_WIDGET_QT
-#include <QWidget>
-#include <QKeyEvent>
+#include <QtGui/QWidget>
+#include <QtGui/QKeyEvent>
 #ifdef MOZ_X11
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #endif
 #undef slots
 #endif
diff -ur mozilla-release.orig/dom/plugins/ipc/PluginInstanceChild.cpp mozilla-release/dom/plugins/ipc/PluginInstanceChild.cpp
--- mozilla-release.orig/dom/plugins/ipc/PluginInstanceChild.cpp	2012-06-14 11:49:32.000000000 -0700
+++ mozilla-release/dom/plugins/ipc/PluginInstanceChild.cpp	2012-06-19 22:45:08.681773624 -0700
@@ -38,10 +38,10 @@
  * ***** END LICENSE BLOCK ***** */
 
 #if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
-#include <QEvent>
-#include <QKeyEvent>
-#include <QApplication>
-#include <QInputMethodEvent>
+#include <QtCore/QEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QInputMethodEvent>
 #include "nsQtKeyUtils.h"
 #endif
 
@@ -85,7 +85,7 @@
 #include "gtk2xtbin.h"
 
 #elif defined(MOZ_WIDGET_QT)
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #undef KeyPress
 #undef KeyRelease
 #elif defined(OS_WIN)
diff -ur mozilla-release.orig/dom/plugins/test/testplugin/nptest_qt.cpp mozilla-release/dom/plugins/test/testplugin/nptest_qt.cpp
--- mozilla-release.orig/dom/plugins/test/testplugin/nptest_qt.cpp	2012-06-14 11:49:32.000000000 -0700
+++ mozilla-release/dom/plugins/test/testplugin/nptest_qt.cpp	2012-06-19 22:45:27.448366875 -0700
@@ -30,8 +30,8 @@
  *   Josh Aas <josh@mozilla.com>
  * 
  * ***** END LICENSE BLOCK ***** */
-#include <QWidget>
-#include <QPainter>
+#include <QtGui/QWidget>
+#include <QtGui/QPainter>
 
 #include "nptest_platform.h"
 #include "npapi.h"
diff -ur mozilla-release.orig/gfx/thebes/gfxFT2FontList.cpp mozilla-release/gfx/thebes/gfxFT2FontList.cpp
--- mozilla-release.orig/gfx/thebes/gfxFT2FontList.cpp	2012-06-14 11:49:37.000000000 -0700
+++ mozilla-release/gfx/thebes/gfxFT2FontList.cpp	2012-06-19 22:46:20.361494301 -0700
@@ -45,7 +45,7 @@
 #include "gfxPlatformGtk.h"
 #define gfxToolkitPlatform gfxPlatformGtk
 #elif defined(MOZ_WIDGET_QT)
-#include <qfontinfo.h>
+#include <QtGui/qfontinfo.h>
 #include "gfxQtPlatform.h"
 #define gfxToolkitPlatform gfxQtPlatform
 #elif defined(XP_WIN)
diff -ur mozilla-release.orig/gfx/thebes/gfxFT2Fonts.cpp mozilla-release/gfx/thebes/gfxFT2Fonts.cpp
--- mozilla-release.orig/gfx/thebes/gfxFT2Fonts.cpp	2012-06-14 11:49:37.000000000 -0700
+++ mozilla-release/gfx/thebes/gfxFT2Fonts.cpp	2012-06-19 22:46:37.718092819 -0700
@@ -38,7 +38,7 @@
 #include "gfxPlatformGtk.h"
 #define gfxToolkitPlatform gfxPlatformGtk
 #elif defined(MOZ_WIDGET_QT)
-#include <qfontinfo.h>
+#include <QtGui/qfontinfo.h>
 #include "gfxQtPlatform.h"
 #define gfxToolkitPlatform gfxQtPlatform
 #elif defined(XP_WIN)
diff -ur mozilla-release.orig/image/decoders/icon/qt/nsIconChannel.cpp mozilla-release/image/decoders/icon/qt/nsIconChannel.cpp
--- mozilla-release.orig/image/decoders/icon/qt/nsIconChannel.cpp	2012-06-14 11:49:37.000000000 -0700
+++ mozilla-release/image/decoders/icon/qt/nsIconChannel.cpp	2012-06-19 22:47:14.887947855 -0700
@@ -35,9 +35,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <QIcon>
-#include <QStyle>
-#include <QApplication>
+#include <QtGui/QIcon>
+#include <QtGui/QStyle>
+#include <QtGui/QApplication>
 
 #include <stdlib.h>
 #include <unistd.h>
diff -ur mozilla-release.orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- mozilla-release.orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-06-14 11:50:07.000000000 -0700
+++ mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-06-19 22:47:30.334554277 -0700
@@ -43,7 +43,7 @@
 
 #if defined(MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
-#include <QString>
+#include <QtCore/QString>
 #endif
 
 #include "nsOSHelperAppService.h"
diff -ur mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp mozilla-release/xpcom/io/nsLocalFileUnix.cpp
--- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2012-06-19 22:48:12.887721482 -0700
@@ -70,8 +70,8 @@
 #endif
 
 #if (MOZ_PLATFORM_MAEMO == 6)
-#include <QUrl>
-#include <QString>
+#include <QtCore/QUrl>
+#include <QtCore/QString>
 #if (MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
 #endif
diff -ur mozilla-release.orig/widget/shared/nsShmImage.h mozilla-release/widget/shared/nsShmImage.h
--- mozilla-release.orig/widget/shared/nsShmImage.h	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/shared/nsShmImage.h	2012-06-20 01:56:43.810275551 -0700
@@ -59,7 +59,7 @@
 #if defined(MOZ_WIDGET_GTK2) || defined(MOZ_WIDGET_GTK3)
 #define DISPLAY gdk_x11_get_default_xdisplay
 #elif defined(MOZ_WIDGET_QT)
-#include "QX11Info"
+#include <QtGui/QX11Info>
 #define DISPLAY QX11Info().display
 #endif
 
diff -ur mozilla-release.orig/widget/qt/nsScreenManagerQt.cpp mozilla-release/widget/qt/nsScreenManagerQt.cpp
--- mozilla-release.orig/widget/qt/nsScreenManagerQt.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsScreenManagerQt.cpp	2012-06-20 09:36:07.522776653 -0700
@@ -37,8 +37,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "qdesktopwidget.h"
-#include "qapplication.h"
+#include <QtGui/qdesktopwidget.h>
+#include <QtGui/qapplication.h>
 
 #include "nsScreenManagerQt.h"
 #include "nsScreenQt.h"
diff -ur mozilla-release.orig/widget/qt/nsDragService.cpp mozilla-release/widget/qt/nsDragService.cpp
--- mozilla-release.orig/widget/qt/nsDragService.cpp	2012-06-14 11:50:08.000000000 -0700
+++ mozilla-release/widget/qt/nsDragService.cpp	2012-06-20 11:35:39.651471909 -0700
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "qmimedata.h"
-#include "qwidget.h"
+#include <QtCore/qmimedata.h>
+#include <QtGui/qwidget.h>
 
 #include "nsDragService.h"
 #include "nsISupportsPrimitives.h"