diff --git a/include/wx/qt/app.h b/include/wx/qt/app.h
index 68d8e701d1..2c7d51ff97 100644
--- a/include/wx/qt/app.h
+++ b/include/wx/qt/app.h
@@ -9,7 +9,7 @@
 #ifndef _WX_QT_APP_H_
 #define _WX_QT_APP_H_
 
-#include <QtCore/QScopedPointer>
+#include <wx/scopedarray.h>
 
 class QApplication;
 class WXDLLIMPEXP_CORE wxApp : public wxAppBase
@@ -21,9 +21,9 @@ public:
     virtual bool Initialize(int& argc, wxChar **argv);
 
 private:
-    QScopedPointer<QApplication> m_qtApplication;
+    wxScopedPtr<QApplication> m_qtApplication;
     int m_qtArgc;
-    QScopedArrayPointer<char*> m_qtArgv;
+    wxScopedArray<char*> m_qtArgv;
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxApp );
 };
diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h
index 25290319c6..681a28732e 100644
--- a/include/wx/qt/window.h
+++ b/include/wx/qt/window.h
@@ -9,8 +9,6 @@
 #ifndef _WX_QT_WINDOW_H_
 #define _WX_QT_WINDOW_H_
 
-#include <QtCore/QScopedPointer>
-
 class QShortcut;
 template < class T > class QList;
 
@@ -229,13 +227,13 @@ private:
     bool QtSetBackgroundStyle();
 
     QPicture *m_qtPicture;                                   // not owned
-    QScopedPointer<QPainter> m_qtPainter;                    // always allocated
+    wxScopedPtr<QPainter> m_qtPainter;                       // always allocated
 
     bool m_mouseInside;
 
 #if wxUSE_ACCEL
     wxVector<QShortcut*> m_qtShortcuts; // owned by whatever GetHandle() returns
-    QScopedPointer<wxQtShortcutHandler> m_qtShortcutHandler; // always allocated
+    wxScopedPtr<wxQtShortcutHandler> m_qtShortcutHandler;    // always allocated
     bool m_processingShortcut;
 #endif // wxUSE_ACCEL
 
diff --git a/src/qt/app.cpp b/src/qt/app.cpp
index 47aa92d2f2..a1a4b67d72 100644
--- a/src/qt/app.cpp
+++ b/src/qt/app.cpp
@@ -54,7 +54,7 @@ bool wxApp::Initialize( int &argc, wxChar **argv )
     m_qtArgv[argc] = NULL;
     m_qtArgc = argc;
 
-    m_qtApplication.reset(new QApplication(m_qtArgc, m_qtArgv.data()));
+    m_qtApplication.reset(new QApplication(m_qtArgc, m_qtArgv.get()));
 
     // Use the args returned by Qt as it may have deleted (processed) some of them
     // Using QApplication::arguments() forces argument processing
diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index 70a0d29f56..bfc7672e0e 100644
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -1001,8 +1001,8 @@ void wxWindowQt::SetAcceleratorTable( const wxAcceleratorTable& accel )
     for ( wxVector<QShortcut*>::const_iterator it = m_qtShortcuts.begin();
           it != m_qtShortcuts.end(); ++it )
     {
-        QObject::connect( *it, &QShortcut::activated, m_qtShortcutHandler.data(), &wxQtShortcutHandler::activated );
-        QObject::connect( *it, &QShortcut::activatedAmbiguously, m_qtShortcutHandler.data(), &wxQtShortcutHandler::activated );
+        QObject::connect( *it, &QShortcut::activated, m_qtShortcutHandler.get(), &wxQtShortcutHandler::activated );
+        QObject::connect( *it, &QShortcut::activatedAmbiguously, m_qtShortcutHandler.get(), &wxQtShortcutHandler::activated );
     }
 }
 #endif // wxUSE_ACCEL
@@ -1168,7 +1168,7 @@ bool wxWindowQt::QtHandlePaintEvent ( QWidget *handler, QPaintEvent *event )
             else
             {
                 // Data from wxClientDC, paint it
-                m_qtPicture->play( m_qtPainter.data() );
+                m_qtPicture->play( m_qtPainter.get() );
                 // Reset picture
                 m_qtPicture->setData( NULL, 0 );
                 handled = true;
@@ -1549,5 +1549,5 @@ void wxWindowQt::QtSetPicture( QPicture* pict )
 
 QPainter *wxWindowQt::QtGetPainter()
 {
-    return m_qtPainter.data();
+    return m_qtPainter.get();
 }