12 files changed, 2 insertions, 77 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index d296d27..355062b 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -23,9 +23,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
-#include <qpe/custom.h>
 #include <qmessagebox.h>
 
 #include "audiodevice.h"
 
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index fbc5072..8bcc567 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -20,14 +20,8 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
-#include <qwidget.h>
-#include <qpixmap.h>
-#include <qbutton.h>
-#include <qpainter.h>
-#include <qframe.h>
-#include <qlayout.h>
 #include <qdir.h>
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index 753b2e3..b77708c 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -17,17 +17,10 @@
 ** not clear to you.
 **
 **********************************************************************/
 
-#include <qpe/qpeapplication.h>
-#include <qpe/qlibrary.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
 
-#include <qmainwindow.h>
 #include <qmessagebox.h>
-#include <qwidgetstack.h>
-#include <qfile.h>
 
 #include "mediaplayer.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index 6823076..5bfb87e 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -19,10 +19,8 @@
  **********************************************************************/
 #include <qpe/qpeapplication.h>
 #include <qpe/qlibrary.h>
 #include <qpe/config.h>
-#include <qvaluelist.h>
-#include <qobject.h>
 #include <qdir.h>
 #include <qpe/mediaplayerplugininterface.h>
 #include "mediaplayerstate.h"
 
diff --git a/core/multimedia/opieplayer/modplug/load_j2b.cpp b/core/multimedia/opieplayer/modplug/load_j2b.cpp
index 4f0b85c..8b4cccd 100644
--- a/core/multimedia/opieplayer/modplug/load_j2b.cpp
+++ b/core/multimedia/opieplayer/modplug/load_j2b.cpp
@@ -12,6 +12,5 @@
 //
 // J2B module loader
 //
 ///////////////////////////////////////////////////
-#include "stdafx.h"
 
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp
index 778eb22..ae89518 100644
--- a/core/multimedia/opieplayer/om3u.cpp
+++ b/core/multimedia/opieplayer/om3u.cpp
@@ -28,24 +28,11 @@
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include "playlistwidget.h"
 #include "om3u.h"
 
-#include <qpe/applnk.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/storage.h>
-#include <qpe/mimetype.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-
-#include <qdir.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qstringlist.h>
-#include <qcstring.h>
+
 
 static inline QString fullBaseName ( const QFileInfo &fi )
 {
   QString str = fi. fileName ( );
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 94567f2..ad831cf 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -16,18 +16,10 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#include <qpe/applnk.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
 
-#include <qpainter.h>
-#include <qimage.h>
 #include <qheader.h>
-#include <qlistview.h>
-#include <qlist.h>
-#include <qpixmap.h>
 
 #include "playlistselection.h"
 
 #include <stdlib.h>
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index db99866..a359843 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -18,41 +18,16 @@
 **
 **********************************************************************/
 // code added by L. J. Potter Sat 03-02-2002 06:17:54
 #define QTOPIA_INTERNAL_FSLP
-#include <qpe/qcopenvelope_qws.h>
 
-#include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qpe/qpemenubar.h>
-#include <qpe/fileselector.h>
-#include <qpe/qpeapplication.h>
 #include <qpe/lnkproperties.h>
-#include <qpe/storage.h>
 
-#include <qpe/applnk.h>
-#include <qpe/config.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
 #include <qaction.h>
-#include <qcursor.h>
-#include <qimage.h>
-#include <qfile.h>
-#include <qdir.h>
 #include <qlayout.h>
-#include <qlabel.h>
-#include <qlist.h>
-#include <qlistbox.h>
-#include <qmainwindow.h>
 #include <qmessagebox.h>
-#include <qtoolbutton.h>
-#include <qtabwidget.h>
-#include <qlistview.h>
-#include <qpoint.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
-#include <qtextstream.h>
 
 //#include <qtimer.h>
 
 #include "playlistselection.h"
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 5273ad3..d002c42 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -22,13 +22,9 @@
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 #include <qdir.h>
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qpixmap.h>
 #include <qslider.h>
-#include <qdrawutil.h>
 #include "videowidget.h"
 #include "mediaplayerstate.h"
 
 
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 330fac5..3037ba3 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -24,20 +24,16 @@
                              Boston, MA 02111-1307, USA.
 
 */
 #include <qpe/version.h>
-#include <qapplication.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qframe.h>
 #include <qlineedit.h>
 #include <qtimer.h>
 #include <qcombobox.h>
-#include <qpixmap.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
-#include <qimage.h>
 #if QT_VERSION < 300
 #include <qgfx_qws.h>
 #endif
 #include <qwindowsystem_qws.h>
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 7d2ed63..bf98735 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -39,23 +39,19 @@
 #include <signal.h>
 #include <getopt.h>
 #include <string.h>
 
-#include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpestyle.h>
 #include <qpe/power.h>
 #include <qpe/config.h>
 
 #include <opie/odevice.h>
 
 #include <qwindowsystem_qws.h>
-#include <qwsmouse_qws.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qfile.h>
-#include <qtextstream.h>
 
 #include "loginapplication.h"
 #include "loginwindowimpl.h"
 #include "calibrate.h"
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index f9dbe2b..0fdd8e1 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,6 +1,6 @@
 TEMPLATE    = app
-CONFIG      = qt warn_on debug usepam
+CONFIG      = qt warn_on debug
 
 HEADERS     = loginwindowimpl.h \
               loginapplication.h \
               ../launcher/inputmethods.h \