24 files changed, 2 insertions, 99 deletions

diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 6807544..f05e21a 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -36,45 +36,43 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include "katedocument.h"
 
 
 #include <qfileinfo.h>
 #include <qdatetime.h>
 
 #include <kmessagebox.h>
-#include <klocale.h>
 #include <qpe/config.h>
 #include <qstring.h>
 
 #include <sys/time.h>
 #include <unistd.h>
 
 #include <stdio.h>
 
 #include <qtimer.h>
 #include <qobject.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qfont.h>
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <kglobal.h>
 
-#include <klocale.h>
 //#include <kcharsets.h>
 #include <kdebug.h>
 //#include <kinstance.h>
 
 #include <kglobalsettings.h>
 //#include <kaction.h>
 //#include <kstdaction.h>
 
 #include "../view/kateview.h"
 #include "katebuffer.h"
 #include "katetextline.h"
 
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 06ac49f..96f91fb 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -10,26 +10,24 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
 #include <qmessagebox.h>
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include <qtextcodec.h>
 #endif
 #include <qtextstream.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp
index 794fbdb..423634b 100644
--- a/noncore/apps/tinykate/libkate/view/kateview.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateview.cpp
@@ -35,62 +35,55 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 
 
 #include "kateview.h"
 
 #include "../document/katedocument.h"
 #include "../document/katecmd.h"
 #include "../document/katehighlight.h"
-#include "kateviewdialog.h"
 #include "../document/katedialogs.h"
+#include "kateviewdialog.h"
 #include <kateconfig.h>
 
-#include <qfocusdata.h>
-#include <kdebug.h>
 #include <kapplication.h>
 #include <qscrollbar.h>
-#include <qiodevice.h>
 #include <qpopupmenu.h>
 #include <kpopupmenu.h>
 #include <qkeycode.h>
 #include <qintdict.h>
 #include <qfont.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qevent.h>
 #include <qdir.h>
 #include <qvbox.h>
 #include <qprintdialog.h>
 #include <qpaintdevicemetrics.h>
-#include <qiodevice.h>
 #include <qbuffer.h>
-#include <qfocusdata.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kdebug.h>
 #include <kmessagebox.h>
 #include <qregexp.h>
 #include <kdialogbase.h>
 #include <klineeditdlg.h>
 #include <qapplication.h>
 #include <kfiledialog.h>
 #include <kiconloader.h>
 #include "../document/katetextline.h"
-#include "kateviewdialog.h"
 #include "kateundohistory.h"
 #include <qlayout.h>
 #include <qpe/qpeapplication.h>
 
 KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) : QWidget(view)
 {
   waitForPreHighlight=-1;
   myView = view;
   myDoc = doc;
 
   iconBorderWidth  = 16;
   iconBorderHeight = 800;
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index bd5b74f..a85fb87 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -16,41 +16,39 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 // Dialogs
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <qgrid.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlistbox.h>
-#include <qspinbox.h>
-#include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qcollection.h>
 #include <qpushbutton.h>
 #include <qobjectlist.h>
 #include <qradiobutton.h>
 #include <qwhatsthis.h>
 #include <qstringlist.h>
 #include <klocale.h>
 #include <kcolorbtn.h>
-#include <qcombobox.h>
 #include <kglobal.h>
 #include <qvbox.h>
 #include <qspinbox.h>
+#include <qcombobox.h>
 #include <kfontdialog.h>
 
 #include "../document/katedocument.h"
 #include "kateviewdialog.h"
 #include <opie2/ofontselector.h>
 
 
 SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
   : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
   , m_replace( 0L )
 {
   QWidget *page = new QWidget( this );
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index bbf80ce..19a0127 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -5,40 +5,35 @@
     begin                : November 2002
     copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free softwaSre; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation.                                         *
  *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
  *                                                                         *
  ***************************************************************************/
-#include <qwidget.h>
 #include <qaction.h>
-#include <qlayout.h>
 #include <qtoolbutton.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
-#include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 
 #include <opie2/ofiledialog.h>
 
 #include "tinykate.h"
 
 #include <katedocument.h>
-#include <katehighlight.h>
-#include <kateview.h>
 #include <kglobal.h>
 
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     QMainWindow( parent, name, f )
 {
   shutDown=false;
   nextUnnamed=0;
   currentView=0;
   viewCount=0;
   setCaption(tr("TinyKATE"));
   KGlobal::setAppName("TinyKATE");
 
diff --git a/noncore/apps/zsafe/category.cpp b/noncore/apps/zsafe/category.cpp
index ce1d614..15448f0 100644
--- a/noncore/apps/zsafe/category.cpp
+++ b/noncore/apps/zsafe/category.cpp
@@ -1,18 +1,17 @@
 /* C implementation of RC2 encryption algorithm, as described in RFC2268 */
 /* By Matthew Palmer <mjp16@uow.edu.au> */
 /* $Id$ */
 
 #include "category.h"
-#include <qlistview.h>
 
 Category::Category()
 {
 }
 
 Category::~Category()
 {
 }
 
 QString Category::getIconName()
 {
    return iconName;
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp
index 7ff549b..4fe319b 100644
--- a/noncore/apps/zsafe/main.cpp
+++ b/noncore/apps/zsafe/main.cpp
@@ -6,25 +6,24 @@
 ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html
 */
 
 
 #include "zsafe.h"
 #ifdef DESKTOP
 #include <qapplication.h>
 #else
 #include <qpe/qpeapplication.h>
 #endif
 #include <stdio.h>
 #include <signal.h>
-#include "qsettings.h"
 
 ZSafe *zs;
 #ifdef DESKTOP
 QApplication   *appl;
 #else
 QPEApplication *appl;
 #endif
 
 int DeskW;
 int DeskH;
 
 void suspend (int signum)
diff --git a/noncore/apps/zsafe/qsettings.cpp b/noncore/apps/zsafe/qsettings.cpp
index 62a9947..ee55339 100755
--- a/noncore/apps/zsafe/qsettings.cpp
+++ b/noncore/apps/zsafe/qsettings.cpp
@@ -1,18 +1,17 @@
 /*

 ** $Id$

 */

 

 #include "qsettings.h"

-#include <qstringlist.h>

 #include <stdio.h>

 #include <qfile.h>

 #include <qtextstream.h>

 

 

 QSettings::QSettings(const QString &_fn)

 {

 	// read the prefs from the file

 	fn = _fn;

 	

 	QFile f(_fn);

     if ( f.open(IO_ReadOnly) ) {    // file opened successfully

diff --git a/noncore/apps/zsafe/scqtfiledlg.cpp b/noncore/apps/zsafe/scqtfiledlg.cpp
index d6cea64..dd72fdf 100644
--- a/noncore/apps/zsafe/scqtfiledlg.cpp
+++ b/noncore/apps/zsafe/scqtfiledlg.cpp
@@ -1,34 +1,29 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'scqtfiledlg.ui'
 **
 ** Created: Sun Jun 8 15:51:12 2003
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #include "scqtfiledlg.h"
 
 #include <qcombobox.h>
-#include <qheader.h>
 #include <qlineedit.h>
 #include <qlistview.h>
-#include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
-#include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
-#include <qimage.h>
-#include <qpixmap.h>
 
 static const char* const image0_data[] = { 
 "24 16 3 1",
 ". c None",
 "# c #000040",
 "a c #808080",
 "........................",
 "........................",
 ".................####...",
 ".................####...",
 ".......##........#aa#...",
 "......###........#aa#...",
diff --git a/noncore/apps/zsafe/scqtfileedit.cpp b/noncore/apps/zsafe/scqtfileedit.cpp
index 7a3d906..08fc2b5 100644
--- a/noncore/apps/zsafe/scqtfileedit.cpp
+++ b/noncore/apps/zsafe/scqtfileedit.cpp
@@ -10,28 +10,24 @@
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "qdir.h"
-#include "qdialog.h"
-#include "qpixmap.h"
-#include "qlistview.h"
 #include "qlineedit.h"
 #include "qtoolbutton.h"
 
 #include "scqtfileedit.h"
 
 #include <qpe/qpeapplication.h>
 
 // #define DEBUGFILEEDIT
 
 /* XPM */
 static const char* const file_xpm[]={
     "16 16 5 1",
diff --git a/noncore/apps/zsafe/zlistview.cpp b/noncore/apps/zsafe/zlistview.cpp
index 23bbc4e..ba02a15 100644
--- a/noncore/apps/zsafe/zlistview.cpp
+++ b/noncore/apps/zsafe/zlistview.cpp
@@ -1,19 +1,17 @@
 /*
 ** $Id$
 */
 
 #include "zlistview.h"
-#include <qlistview.h>
-#include <qevent.h>
 #include <stdio.h>
 #include "zsafe.h"
 
 ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id)
 {
    zs = zsafe;
 }
 
 ZListView::~ZListView()
 {
 }
 
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index f43a206..a3e805e 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -70,25 +70,24 @@ using Opie::OFileSelector;
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #endif
 
 #include <qtimer.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qtoolbutton.h>
-#include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qregexp.h>
 #include <qdir.h>
 #include <qtextbrowser.h>
 #include <qlabel.h>
 #include <qcombobox.h>
diff --git a/noncore/comm/keypebble/krfbbuffer.cpp b/noncore/comm/keypebble/krfbbuffer.cpp
index f1cb929..92918d4 100644
--- a/noncore/comm/keypebble/krfbbuffer.cpp
+++ b/noncore/comm/keypebble/krfbbuffer.cpp
@@ -1,22 +1,19 @@
 #include <assert.h>
-#include <qpixmap.h>
-#include <qbrush.h>
 #include <qimage.h>
 #include <qpainter.h>
 #include <qapplication.h>
 #include "krfbdecoder.h"
 #include "krfbbuffer.h"
 #include "krfbconnection.h"
-#include "krfbserver.h"
 #include "krfbserverinfo.h"
 
 //
 // Endian stuff
 //
 #ifndef KDE_USE_FINAL
 const int endianTest = 1;
 #endif
 
 #define Swap16IfLE(s) \
     (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
 
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp
index bc71c90..75cba68 100644
--- a/noncore/comm/keypebble/krfbcanvas.cpp
+++ b/noncore/comm/keypebble/krfbcanvas.cpp
@@ -1,28 +1,19 @@
 #include "krfbconnection.h"
 #include "krfbcanvas.h"
-#include "krfbserver.h"
 #include "krfbbuffer.h"
 
-#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
-#include <qapplication.h>
 #include <qclipboard.h>
-#include <qaction.h>
-#include <qpixmap.h>
-#include <qpoint.h>
-#include <qapplication.h>
-#include <qmainwindow.h>
-#include <qiconset.h>
 
 KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name )
   : QScrollView( parent, name )
 {
     connection_ = new KRFBConnection();
     connect( connection_, SIGNAL( loggedIn() ),
 	    this, SLOT( loggedIn() ) );
 
     loggedIn_ = false;
 
 		//QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold);
 
diff --git a/noncore/comm/keypebble/krfbconnection.cpp b/noncore/comm/keypebble/krfbconnection.cpp
index 389c836..e6c33c6 100644
--- a/noncore/comm/keypebble/krfbconnection.cpp
+++ b/noncore/comm/keypebble/krfbconnection.cpp
@@ -1,20 +1,19 @@
 #include <assert.h>
 #include <qsocket.h>
 #include <qtimer.h>
 #include <string.h>
 
 #include "krfbconnection.h"
 #include "krfblogin.h"
-#include "krfbserver.h"
 #include "krfbdecoder.h"
 #include "krfbbuffer.h"
 
 KRFBConnection::KRFBConnection( QObject *parent )
 		: QObject( parent, "KRFBConnection" )
 {
 		portBase_ = 5900;
 		currentState_ = Disconnected;
 		sock = 0;
 		minData_ = 0;
 		options_ = new KRFBServer();
 		updater = 0;
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index c43aed5..2c9ad71 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -1,25 +1,19 @@
 #include "krfbconnection.h"
-#include "krfbserver.h"
 #include "krfbserverinfo.h"
 #include "krfbdecoder.h"
 #include "krfbbuffer.h"
 
-#include <qpe/qpeapplication.h>
 
 #include <qpixmap.h>
-#include <qsocket.h>
-#include <qevent.h>
-#include <qstring.h>
-#include <qclipboard.h>
 
 #include <assert.h>
 
 //
 // Endian stuff
 //
 #ifndef KDE_USE_FINAL
 const int endianTest = 1;
 #endif
 
 #define Swap16IfLE(s) \
     (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
diff --git a/noncore/comm/keypebble/krfblogin.cpp b/noncore/comm/keypebble/krfblogin.cpp
index 0d2a205..0b4a757 100644
--- a/noncore/comm/keypebble/krfblogin.cpp
+++ b/noncore/comm/keypebble/krfblogin.cpp
@@ -1,23 +1,22 @@
 #include <assert.h>
 
 
 extern "C" {
 #include "vncauth.h"
 }
 
 #include "krfblogin.h"
 #include "krfbconnection.h"
 #include <qtimer.h>
-#include <qregexp.h>
 
 // The length of the various messages (used to decide how many bytes to
 // wait for).
 const int ServerVersionLength = 12;
 const int ClientVersionLength = 12;
 const int AuthSchemeLength = 4;
 const int FailureReasonSizeLength = 4;
 const int ChallengeLength = 16;
 const int AuthResultLength = 4;
 
 // Authentication results
 enum AuthResult {
diff --git a/noncore/comm/keypebble/krfbserver.cpp b/noncore/comm/keypebble/krfbserver.cpp
index b47534e..fda81a1 100644
--- a/noncore/comm/keypebble/krfbserver.cpp
+++ b/noncore/comm/keypebble/krfbserver.cpp
@@ -1,13 +1,12 @@
-#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include "krfbserver.h"
 
 KRFBServer::KRFBServer()
 {
 	QString name;
 	QString hostname;
 	QString password;
 	display=0;
 
 	scaleFactor=1;
 
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 2fa8d1f..c678edf 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -1,39 +1,26 @@
-#include <qiconset.h>
-#include <qdialog.h>
-#include <qpixmap.h>
-#include <qdom.h>
 #include <qaction.h>
-#include <qmenubar.h>
-#include <qstatusbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
-#include <qpe/qpetoolbar.h>
-#include <qtimer.h>
 #include <qmessagebox.h>
-#include <qspinbox.h>
 #include <qlistbox.h>
-#include <qlineedit.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/global.h>
-#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
 #include <assert.h>
 
 #include "kvnc.h"
 #include "krfbcanvas.h"
 #include "krfbconnection.h"
 #include "kvncconndlg.h"
-#include "krfbserver.h"
 
 static int u_id = 1;
 static int get_unique_id()
 {
 		return u_id++;
 }
 
 
 /* XPM */
 static char * menu_xpm[] = {
 "12 12 5 1",
 " 	c None",
diff --git a/noncore/comm/keypebble/kvncbookmarkdlg.cpp b/noncore/comm/keypebble/kvncbookmarkdlg.cpp
index 8556d49..ef2fa12 100644
--- a/noncore/comm/keypebble/kvncbookmarkdlg.cpp
+++ b/noncore/comm/keypebble/kvncbookmarkdlg.cpp
@@ -1,30 +1,16 @@
-#include <qframe.h>
-#include <qvbox.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qfile.h>
 #include <qdir.h>
-#include <qstring.h>
-#include <qapplication.h>
-#include <qlineedit.h>
 #include <qtextstream.h>
-#include <qpushbutton.h>
 #include <qlistbox.h>
-#include <qpe/config.h>
 #include <qpe/global.h>
-#include "krfbserver.h"
 #include "kvncbookmarkdlg.h"
 
 KVNCBookmarkDlg::KVNCBookmarkDlg( QWidget * parent, const char * name, WFlags f ) 
 
 : KVNCBookmarkDlgBase( parent, name,f)
 {
 		readBookmarks();
 		refresh();
 
 }
 
 KVNCBookmarkDlg::~KVNCBookmarkDlg()
diff --git a/noncore/comm/keypebble/kvncconndlg.cpp b/noncore/comm/keypebble/kvncconndlg.cpp
index cd55bb0..420c816 100644
--- a/noncore/comm/keypebble/kvncconndlg.cpp
+++ b/noncore/comm/keypebble/kvncconndlg.cpp
@@ -1,24 +1,16 @@
-#include <qframe.h>
-#include <qvbox.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qapplication.h>
 #include <qlineedit.h>
-#include <qpushbutton.h>
-#include "krfbserver.h"
 
 #include "kvncconndlg.h"
 
 KVNCConnDlg::KVNCConnDlg( KRFBServer *options,
 				QWidget *parent, char *name, bool modal )
 : KVNCConnDlgBase( parent, name, modal, WStyle_ContextHelp )
 {
     this->options=options;
     tmpOptions=*options;
 
     serverHostname->setText(options->hostname);
     serverDisplay->setValue(options->display);
diff --git a/noncore/comm/keypebble/main.cpp b/noncore/comm/keypebble/main.cpp
index 11f67fc..fc34099 100644
--- a/noncore/comm/keypebble/main.cpp
+++ b/noncore/comm/keypebble/main.cpp
@@ -1,10 +1,9 @@
 
 
 
-#include <qpe/qpeapplication.h>
 #include "kvnc.h"
 #include <opie/oapplicationfactory.h>
 
 
 
 OPIE_EXPORT_APP( OApplicationFactory<KVNC> )
diff --git a/noncore/comm/mobilemsg/mobilemsg.cpp b/noncore/comm/mobilemsg/mobilemsg.cpp
index 707872e..9a4db35 100644
--- a/noncore/comm/mobilemsg/mobilemsg.cpp
+++ b/noncore/comm/mobilemsg/mobilemsg.cpp
@@ -1,20 +1,15 @@
 #include "mobilemsg.h"
-#include <qpushbutton.h>
 
-#include <qpe/qpeapplication.h>
 
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
 
 
 /* 
  *  Constructs a MobileMsg which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
 MobileMsg::MobileMsg( QWidget* parent,  const char* name, WFlags fl )
     : MobileMsgBase( parent, name, fl )
 {
     //connect(add, SIGNAL(clicked()), this, SLOT(goodBye()));
     //connect(remove, SIGNAL(clicked()), this, SLOT(goodBye()));
     //connect(props, SIGNAL(clicked()), this, SLOT(goodBye()));
diff --git a/noncore/decorations/liquid/liquid.cpp b/noncore/decorations/liquid/liquid.cpp
index ef2ac3c..0bd4b1d 100644
--- a/noncore/decorations/liquid/liquid.cpp
+++ b/noncore/decorations/liquid/liquid.cpp
@@ -1,17 +1,15 @@
 #include "liquid.h"
 
 #include <qapplication.h>
-#include <qpainter.h>
-#include <qpalette.h>
 #include <qdrawutil.h>
 
 
 LiquidDecoInterface::LiquidDecoInterface ( ) 
 {
 }
     
 LiquidDecoInterface::~LiquidDecoInterface ( )
 {
 }