--- a/src/gui/util/qdesktopservices_s60.cpp	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/gui/util/qdesktopservices_s60.cpp	Fri Apr 16 15:50:13 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -48,13 +48,6 @@
 #include <qurl.h>
 #include <private/qcore_symbian_p.h>
 
-/* :QTP:QTBUG-5713: illegal app layer dependency
-#include <miutset.h>                // KUidMsgTypeSMTP
-*/
-/** UID of an SMTP message type. */
-const TUid KUidMsgTypeSMTP			= {0x10001028};	// 268439592
-
-
 #include <txtrich.h>                // CRichText
 #include <f32file.h>                // TDriveUnit etc
 #include <eikenv.h>                 // CEikonEnv
@@ -63,11 +56,14 @@
 #include <rsendas.h>                // RSendAs
 #include <rsendasmessage.h>         // RSendAsMessage
 
+// copied from miutset.h, so we don't get a dependency into the app layer
+const TUid KUidMsgTypeSMTP			= {0x10001028};	// 268439592
+
 #ifdef Q_WS_S60
 #  include <pathinfo.h>             // PathInfo
 #  ifdef USE_DOCUMENTHANDLER
-#    include <documenthandler.h>    // CDocumentHandler
-#    include <aknserverapp.h>
+#    include <DocumentHandler.h>    // CDocumentHandler
+#    include <AknServerApp.h>
 #  endif
 #else
 #  warning CDocumentHandler requires support for S60