77 files changed, 2 insertions, 223 deletions

diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index e9e5467..51020a0 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -6,13 +6,10 @@
 #include "rulesdialog.h"
 #include "themedialog.h"
 
-#include <qdatetime.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
-#include <qstring.h>
 #include <qtimer.h>
-#include <qmainwindow.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qmenubar.h>
diff --git a/noncore/games/backgammon/filedialog.cpp b/noncore/games/backgammon/filedialog.cpp
index a5e71c9..e0a2914 100644
--- a/noncore/games/backgammon/filedialog.cpp
+++ b/noncore/games/backgammon/filedialog.cpp
@@ -1,10 +1,6 @@
 #include "filedialog.h"

 

 #include <qdir.h>

-#include <qfileinfo.h>

-#include <qmessagebox.h>

-#include <qpixmap.h>

-#include <qpushbutton.h>

 #include <qpe/qpeapplication.h>

 

 FileDialog::FileDialog(QWidget* parent,QString header,QString extension,const char* name,bool modal,WFlags f)

diff --git a/noncore/games/backgammon/main.cpp b/noncore/games/backgammon/main.cpp
index 58ced10..6316040 100644
--- a/noncore/games/backgammon/main.cpp
+++ b/noncore/games/backgammon/main.cpp
@@ -1,4 +1,3 @@
-#include <qpe/qpeapplication.h>
 #include "backgammon.h"
 
 #include <opie/oapplicationfactory.h>
diff --git a/noncore/games/backgammon/moveengine.cpp b/noncore/games/backgammon/moveengine.cpp
index 37b73a6..7de7147 100644
--- a/noncore/games/backgammon/moveengine.cpp
+++ b/noncore/games/backgammon/moveengine.cpp
@@ -1,6 +1,5 @@
 #include "moveengine.h"
 
-#include <qmessagebox.h>
 #include <qtimer.h>
 #include <stdlib.h>
 
diff --git a/noncore/games/backgammon/themedialog.cpp b/noncore/games/backgammon/themedialog.cpp
index f342381..afd6a1b 100644
--- a/noncore/games/backgammon/themedialog.cpp
+++ b/noncore/games/backgammon/themedialog.cpp
@@ -1,9 +1,7 @@
 #include "themedialog.h"
 
 #include <qdir.h>
-#include <qfileinfo.h>
 #include <qlabel.h>
-#include <qpushbutton.h>
 #include <qpe/qpeapplication.h>
 
 
diff --git a/noncore/games/bounce/game.cpp b/noncore/games/bounce/game.cpp
index 6ded218..c07f453 100644
--- a/noncore/games/bounce/game.cpp
+++ b/noncore/games/bounce/game.cpp
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
-#include <qimage.h>
 
 #include "game.h"
 
diff --git a/noncore/games/bounce/kbounce.cpp b/noncore/games/bounce/kbounce.cpp
index 211f0ff..3b0cb6f 100644
--- a/noncore/games/bounce/kbounce.cpp
+++ b/noncore/games/bounce/kbounce.cpp
@@ -18,14 +18,10 @@
 
 #include <qlayout.h>
 #include <qtimer.h>
-#include <qlcdnumber.h>
 #include <qmessagebox.h>
-#include <qmainwindow.h>
-#include <qpe/qpeapplication.h>
 
 #include "kbounce.h"
 #include "game.h"
-#include <qlabel.h>
 
 KJezzball::KJezzball(QWidget *p, const char* n, WFlags f) 
     : QMainWindow(p,n,f), m_gameWidget( 0 )
diff --git a/noncore/games/bounce/main.cpp b/noncore/games/bounce/main.cpp
index 9ea86a6..a070c4b 100644
--- a/noncore/games/bounce/main.cpp
+++ b/noncore/games/bounce/main.cpp
@@ -16,7 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <qpe/qpeapplication.h>
 #include "kbounce.h"
 #include <opie/oapplicationfactory.h>
 
diff --git a/noncore/games/buzzword/buzzword.cpp b/noncore/games/buzzword/buzzword.cpp
index f746065..13eb481 100644
--- a/noncore/games/buzzword/buzzword.cpp
+++ b/noncore/games/buzzword/buzzword.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <qlayout.h>
-#include <qmessagebox.h>
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qgrid.h>
diff --git a/noncore/games/buzzword/main.cpp b/noncore/games/buzzword/main.cpp
index 67f2c26..95b3176 100644
--- a/noncore/games/buzzword/main.cpp
+++ b/noncore/games/buzzword/main.cpp
@@ -16,7 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 #include "buzzword.h"
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index b4e0308..506e87a 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -25,15 +25,10 @@
 
 #include <qvbox.h>
 #include <qaction.h>
-#include <qlayout.h>
 #include <qpainter.h>
-#include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <qtoolbar.h>
 #include <qmenubar.h>
-#include <qstringlist.h>
-#include <qapplication.h>
-#include <qtoolbutton.h>
 
 #include <stdlib.h>
 #include <time.h>
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index cf89267..79820b1 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -24,18 +24,14 @@
 #include <qpe/resource.h>
 
 #include <qpainter.h>
-#include <qpixmap.h>
 #include <qpe/qpetoolbar.h>
 #include <qmenubar.h>
-#include <qpopupmenu.h>
 #include <qaction.h>
 #include <qapplication.h> //processEvents()
 #include <qlabel.h>
 
 //#include <stdio.h>
 
-#include "amigo.h"
-#include "goplayutils.h"
 
 static const enum bVal computer_color = BLACK;
 
diff --git a/noncore/games/go/main.cpp b/noncore/games/go/main.cpp
index f24e3c3..66f34ab 100644
--- a/noncore/games/go/main.cpp
+++ b/noncore/games/go/main.cpp
@@ -20,7 +20,6 @@
 
 #include "gowidget.h"
 
-#include <qpe/qpeapplication.h>
 
 #include <opie/oapplicationfactory.h>
 
diff --git a/noncore/games/kbill/MCursor.cc b/noncore/games/kbill/MCursor.cc
index a3cb340..c581693 100644
--- a/noncore/games/kbill/MCursor.cc
+++ b/noncore/games/kbill/MCursor.cc
@@ -15,12 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "MCursor.h"
-#include "objects.h"
 
-#include <qcursor.h>
-#include <qbitmap.h>
-#include <qwidget.h>
-#include <qstring.h>
 #ifdef KDEVER
 #include <kapp.h>
 #include <kstandarddirs.h>
diff --git a/noncore/games/kbill/Picture.cc b/noncore/games/kbill/Picture.cc
index fe0eff8..9d46257 100644
--- a/noncore/games/kbill/Picture.cc
+++ b/noncore/games/kbill/Picture.cc
@@ -15,11 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 #include "Picture.h"
-#include "objects.h"
 
 #include <iostream>
 
-#include <qstring.h>
 #include <qpe/resource.h>
 #ifdef KDEVER
 #include <kapp.h>
diff --git a/noncore/games/kbill/UI.cpp b/noncore/games/kbill/UI.cpp
index 2afaf9b..611cebf 100644
--- a/noncore/games/kbill/UI.cpp
+++ b/noncore/games/kbill/UI.cpp
@@ -14,15 +14,12 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "kbill.h"
 #include "objects.h"
 #include "Strings.h"
 #ifdef KDEVER
 #include <kapplication.h>
 #endif
-#include <qpixmap.h>
 #include <qmessagebox.h>
-#include <qnamespace.h>
 
 #include "inputbox.h"
 
diff --git a/noncore/games/kbill/field.cpp b/noncore/games/kbill/field.cpp
index a1b3560..a974ab2 100644
--- a/noncore/games/kbill/field.cpp
+++ b/noncore/games/kbill/field.cpp
@@ -15,7 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qpainter.h>
 
 #include "objects.h"
 
diff --git a/noncore/games/kbill/inputbox.cpp b/noncore/games/kbill/inputbox.cpp
index b191ea8..5087fbb 100644
--- a/noncore/games/kbill/inputbox.cpp
+++ b/noncore/games/kbill/inputbox.cpp
@@ -16,7 +16,6 @@
  ***************************************************************************/
 
 #include "inputbox.h"
-#include <qdialog.h>
 InputBox::InputBox(QWidget *parent, const char *name, const char *caption, const char *text) : QDialog(parent, name, TRUE) {
         // setCaption(caption);
 // 
diff --git a/noncore/games/kbill/kbill.cpp b/noncore/games/kbill/kbill.cpp
index 18a6875..74d7c75 100644
--- a/noncore/games/kbill/kbill.cpp
+++ b/noncore/games/kbill/kbill.cpp
@@ -16,13 +16,9 @@
  ***************************************************************************/
 
 #include <qmessagebox.h>
-#include <qmultilinedit.h>
 #include <qmenubar.h>
 #include <qtextbrowser.h>
-#include <qfont.h>
-#include <qwidget.h>
 #include "kbill.h"
-#include "inputbox.h"
 #include "helpdialog.h"
 #include "objects.h"
 #include "Strings.h"
diff --git a/noncore/games/kcheckers/kcheckers.cpp b/noncore/games/kcheckers/kcheckers.cpp
index 2eb37e5..a27dd18 100644
--- a/noncore/games/kcheckers/kcheckers.cpp
+++ b/noncore/games/kcheckers/kcheckers.cpp
@@ -1,6 +1,5 @@
 
 #include <qimage.h>
-#include <qframe.h>
 #include <qlayout.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
diff --git a/noncore/games/kcheckers/main.cpp b/noncore/games/kcheckers/main.cpp
index 6ac570a..e22dbcc 100644
--- a/noncore/games/kcheckers/main.cpp
+++ b/noncore/games/kcheckers/main.cpp
@@ -1,6 +1,4 @@
 
-#include <qpe/qpeapplication.h>
-#include <qfont.h>
 
 #include "kcheckers.h"
 #include <opie/oapplicationfactory.h>
diff --git a/noncore/games/kpacman/board.cpp b/noncore/games/kpacman/board.cpp
index f95f699..f82b5f9 100644
--- a/noncore/games/kpacman/board.cpp
+++ b/noncore/games/kpacman/board.cpp
@@ -1,13 +1,10 @@
 
-#include "portable.h"
 
 #if defined( KDE2_PORT )
 #include <kapp.h>
 #include <klocale.h>
 #endif
 
-#include <qrect.h>
-#include <qregexp.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
diff --git a/noncore/games/kpacman/keys.cpp b/noncore/games/kpacman/keys.cpp
index 07ce135..5200bc2 100644
--- a/noncore/games/kpacman/keys.cpp
+++ b/noncore/games/kpacman/keys.cpp
@@ -18,11 +18,6 @@
 #endif
 
 #include <qpushbt.h>
-#include <qlabel.h>
-#include <qframe.h>
-#include <qkeycode.h>
-#include <qpixmap.h>
-#include <qstring.h>
 
 Keys::Keys( QWidget *parent, const char *name)
     : QDialog( parent, name, TRUE )
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp
index df27c76..be2e46d 100644
--- a/noncore/games/kpacman/kpacman.cpp
+++ b/noncore/games/kpacman/kpacman.cpp
@@ -12,11 +12,6 @@
 #include "kpacman.h"
 #endif
 
-#include <qkeycode.h>
-#include <qcolor.h>
-#include <qstring.h>
-#include <qpopmenu.h>
-#include <qmsgbox.h>
 
 Kpacman::Kpacman(QWidget *parent, const char *name)
         : KTMainWindow(parent, name)
diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp
index 823d2bf..9631495 100644
--- a/noncore/games/kpacman/kpacmanwidget.cpp
+++ b/noncore/games/kpacman/kpacmanwidget.cpp
@@ -13,12 +13,7 @@
 #include "kpacmanwidget.h"
 #endif
 
-#include <qmessagebox.h>
 
-#include "bitfont.h"
-#include "score.h"
-#include "referee.h"
-#include "status.h"
 
 KpacmanWidget::KpacmanWidget( QWidget *parent, const char *name)
         : QWidget( parent, name )
diff --git a/noncore/games/kpacman/monster.cpp b/noncore/games/kpacman/monster.cpp
index 2f402b4..80b4655 100644
--- a/noncore/games/kpacman/monster.cpp
+++ b/noncore/games/kpacman/monster.cpp
@@ -1,5 +1,4 @@
 #include "monster.h"
-#include "board.h"
 
 Monster::Monster(Board *b, int mid)
 {
diff --git a/noncore/games/kpacman/pacman.cpp b/noncore/games/kpacman/pacman.cpp
index 40f60a8..82524b4 100644
--- a/noncore/games/kpacman/pacman.cpp
+++ b/noncore/games/kpacman/pacman.cpp
@@ -1,5 +1,4 @@
 #include "pacman.h"
-#include "board.h"
 
 Pacman::Pacman(Board *b)
 {
diff --git a/noncore/games/kpacman/painter.cpp b/noncore/games/kpacman/painter.cpp
index d8c7460..410d3f5 100644
--- a/noncore/games/kpacman/painter.cpp
+++ b/noncore/games/kpacman/painter.cpp
@@ -10,18 +10,10 @@
 #include <qpe/config.h>
 #endif
 
-#include <qcolor.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qrect.h>
-#include <qstring.h>
-
-#include <qmessagebox.h>
+
 #include <qfileinfo.h>
 
 #include "painter.h"
-#include "board.h"
 
 Painter::Painter( Board *b, QWidget *parent, int Scheme, int Mode, Bitfont *font)
 {
diff --git a/noncore/games/kpacman/referee.cpp b/noncore/games/kpacman/referee.cpp
index 1b810d8..2d0f3be 100644
--- a/noncore/games/kpacman/referee.cpp
+++ b/noncore/games/kpacman/referee.cpp
@@ -15,19 +15,10 @@
 #include "referee.h"
 #endif
 
-#include <qdatetm.h>
 #include <stdlib.h>
 #include <qtimer.h>
-#include <qevent.h>
-#include <qcolor.h>
-#include <qkeycode.h>
 #include <qfileinfo.h>
 
-#include "board.h"
-#include "pacman.h"
-#include "monster.h"
-#include "fruit.h"
-#include "painter.h"
 
 Referee::Referee( QWidget *parent, const char *name, int Scheme, int Mode, Bitfont *font)
     : QWidget( parent, name )
diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp
index e91771b..6878b81 100644
--- a/noncore/games/kpacman/score.cpp
+++ b/noncore/games/kpacman/score.cpp
@@ -19,14 +19,8 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qdstream.h>
-#include <qkeycode.h>
 #include <qtimer.h>
-#include <qfileinfo.h>
 
-#include "bitfont.h"
 
 Score::Score(QWidget *parent, const char *name, int Scheme, int Mode, Bitfont *font) : QWidget(parent, name)
 {
diff --git a/noncore/games/kpacman/status.cpp b/noncore/games/kpacman/status.cpp
index 2a17c21..02ff63d 100644
--- a/noncore/games/kpacman/status.cpp
+++ b/noncore/games/kpacman/status.cpp
@@ -13,9 +13,7 @@
 #include "status.h"
 #endif
 
-#include <qpixmap.h>
 #include <qbitmap.h>
-#include <qstring.h>
 #include <qmsgbox.h>
 #include <qfileinfo.h>
 
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp
index e1f43d0..2b924c6 100644
--- a/noncore/games/mindbreaker/mindbreaker.cpp
+++ b/noncore/games/mindbreaker/mindbreaker.cpp
@@ -25,12 +25,8 @@
 #include <qtopia/qpeapplication.h>
 #include <qtoolbar.h>
 
-#include <qpainter.h>
-#include <qpixmap.h>
 #include <qtoolbutton.h>
-#include <qpushbutton.h>
 #include <qmessagebox.h>
-#include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 
diff --git a/noncore/games/minesweep/main.cpp b/noncore/games/minesweep/main.cpp
index bd70f7c..e187be5 100644
--- a/noncore/games/minesweep/main.cpp
+++ b/noncore/games/minesweep/main.cpp
@@ -20,7 +20,6 @@
 
 #include "minesweep.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<MineSweep> )
diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index 1790110..72c05b0 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -22,10 +22,6 @@
 #include <qtopia/config.h>
 #include <qtopia/qpeapplication.h>
 
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qpixmap.h>
-#include <qimage.h>
 #include <qtimer.h>
 
 #include <stdlib.h>
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index d707dab..4a6a92c 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -27,14 +27,9 @@
 
 #include <qtoolbar.h>
 #include <qmenubar.h>
-#include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qlcdnumber.h>
-#include <qmessagebox.h>
 #include <qtimer.h>
-#include <qpalette.h>
-#include <qapplication.h>
-#include <qlayout.h>
 #include <qlabel.h>
 
 #include <stdlib.h>
diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp
index 0bd22f6..86318db 100644
--- a/noncore/games/oyatzee/oyatzee.cpp
+++ b/noncore/games/oyatzee/oyatzee.cpp
@@ -1,15 +1,9 @@
 #include "oyatzee.h"
 
 #include <qmessagebox.h>
-#include <qapplication.h>
-#include <qdir.h>
-#include <qlabel.h>
 #include <qpushbutton.h>
-#include <qtimer.h>
-#include <qvbox.h>
 #include <qpainter.h>
 #include <qlayout.h>
-#include <qpoint.h>
 
 #include <stdlib.h>
 
diff --git a/noncore/games/parashoot/base.cpp b/noncore/games/parashoot/base.cpp
index cdf1dfa..5f3c79d 100644
--- a/noncore/games/parashoot/base.cpp
+++ b/noncore/games/parashoot/base.cpp
@@ -19,11 +19,9 @@
 **********************************************************************/
 #include "codes.h"  
 #include "base.h"
-#include "man.h"
 
 #include <qtopia/resource.h>
 
-#include <qregexp.h>
 
 int damage;
 
diff --git a/noncore/games/parashoot/cannon.cpp b/noncore/games/parashoot/cannon.cpp
index 5671351..330d850 100644
--- a/noncore/games/parashoot/cannon.cpp
+++ b/noncore/games/parashoot/cannon.cpp
@@ -20,7 +20,6 @@
 
 #include <qtopia/resource.h>
 
-#include <qregexp.h>
 
 #include "codes.h"  
 #include "cannon.h"
diff --git a/noncore/games/parashoot/helicopter.cpp b/noncore/games/parashoot/helicopter.cpp
index 036b21e..7d91cd1 100644
--- a/noncore/games/parashoot/helicopter.cpp
+++ b/noncore/games/parashoot/helicopter.cpp
@@ -24,7 +24,6 @@
 
 #include <qtopia/resource.h>
 
-#include <qregexp.h>
 
 static QList<Helicopter> all;
 
diff --git a/noncore/games/parashoot/interface.cpp b/noncore/games/parashoot/interface.cpp
index 948b92c..5c9b0ef 100644
--- a/noncore/games/parashoot/interface.cpp
+++ b/noncore/games/parashoot/interface.cpp
@@ -24,10 +24,6 @@
 #include <qtopia/qpeapplication.h>
 #include <qtopia/resource.h>
 
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
-#include <qstyle.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 
diff --git a/noncore/games/parashoot/main.cpp b/noncore/games/parashoot/main.cpp
index ee36d26..40f809f 100644
--- a/noncore/games/parashoot/main.cpp
+++ b/noncore/games/parashoot/main.cpp
@@ -20,7 +20,6 @@
 
 #include "interface.h"
 
-#include <qpe/qpeapplication.h> 
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<ParaShoot> )
diff --git a/noncore/games/parashoot/man.cpp b/noncore/games/parashoot/man.cpp
index 94807c2..0a151b0 100644
--- a/noncore/games/parashoot/man.cpp
+++ b/noncore/games/parashoot/man.cpp
@@ -24,7 +24,6 @@
 
 #include <qtopia/resource.h>
 
-#include <qregexp.h>
 
 int mancount;
 
diff --git a/noncore/games/qasteroids/main.cpp b/noncore/games/qasteroids/main.cpp
index c762990..18a13eb 100644
--- a/noncore/games/qasteroids/main.cpp
+++ b/noncore/games/qasteroids/main.cpp
@@ -20,7 +20,6 @@
 
 #include "toplevel.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 
diff --git a/noncore/games/qasteroids/toplevel.cpp b/noncore/games/qasteroids/toplevel.cpp
index c4fea89..9053d3d 100644
--- a/noncore/games/qasteroids/toplevel.cpp
+++ b/noncore/games/qasteroids/toplevel.cpp
@@ -29,11 +29,9 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
-#include <qaccel.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlcdnumber.h>
-#include <qpushbutton.h>
 
 #include <sys/utsname.h>
 
diff --git a/noncore/games/qasteroids/view.cpp b/noncore/games/qasteroids/view.cpp
index 448a54a..352c63b 100644
--- a/noncore/games/qasteroids/view.cpp
+++ b/noncore/games/qasteroids/view.cpp
@@ -26,9 +26,6 @@
 
 #include <qpe/resource.h>
 
-#include <qapplication.h>
-#include <qkeycode.h>
-#include <qaccel.h>
 
 #include <stdlib.h>
 #include <math.h>
diff --git a/noncore/games/sfcave/helpwindow.cpp b/noncore/games/sfcave/helpwindow.cpp
index 544e237..8a5d034 100644
--- a/noncore/games/sfcave/helpwindow.cpp
+++ b/noncore/games/sfcave/helpwindow.cpp
@@ -15,9 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qwidget.h>
 #include <qlayout.h>
-#include <qstring.h>
 #include <qtextview.h>
 
 #include <qpe/qpeapplication.h>
diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp
index 2c60693..b5fb5bf 100644
--- a/noncore/games/snake/interface.cpp
+++ b/noncore/games/snake/interface.cpp
@@ -21,13 +21,9 @@
 #include "interface.h"
 
 #include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qmessagebox.h>
 
 SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) :
     QMainWindow(parent,name,f),
diff --git a/noncore/games/snake/main.cpp b/noncore/games/snake/main.cpp
index 77a2769..9a9b167 100644
--- a/noncore/games/snake/main.cpp
+++ b/noncore/games/snake/main.cpp
@@ -20,7 +20,6 @@
 
 #include "interface.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 
diff --git a/noncore/games/snake/snake.cpp b/noncore/games/snake/snake.cpp
index 9f19841..8a683ab 100644
--- a/noncore/games/snake/snake.cpp
+++ b/noncore/games/snake/snake.cpp
@@ -20,11 +20,9 @@
 
 #include "snake.h"
 #include "target.h"
-#include "codes.h"
 
 #include <qpe/resource.h>
 
-#include <qregexp.h>
 
 static int Piecekey[4][4] = { {6, 0, 4, 3 }, {0, 6, 2, 1 }, { 1, 3, 5, 0 }, {2, 4, 0, 5 } };
 
diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp
index 7c4a5ba..c36da6c 100644
--- a/noncore/games/solitaire/canvascard.cpp
+++ b/noncore/games/solitaire/canvascard.cpp
@@ -18,15 +18,10 @@
 **
 **********************************************************************/
 
-#include "cardgame.h"
 #include "canvascard.h"
 
 #include <qpe/resource.h>
 
-#include <qpainter.h>
-#include <qimage.h>
-#include <qpaintdevice.h>
-#include <qbitmap.h>
 #include <qgfx_qws.h> // Needed to get the device's width
 
 #include <math.h>
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp
index 9ae2a23..ed5748e 100644
--- a/noncore/games/solitaire/canvascardgame.cpp
+++ b/noncore/games/solitaire/canvascardgame.cpp
@@ -18,17 +18,9 @@
 **
 **********************************************************************/
 
-#include "cardgame.h"
-#include "canvasshapes.h"
-#include "canvascard.h"
 #include "canvascardgame.h"
 
-#include <qpe/resource.h>
-#include <qpe/config.h>
 
-#include <qmainwindow.h>
-#include <qmenubar.h>
-#include <qpainter.h>
 #include <qgfx_qws.h>
 
 #include <stdlib.h>
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp
index c12344a..503bc92 100644
--- a/noncore/games/solitaire/canvascardwindow.cpp
+++ b/noncore/games/solitaire/canvascardwindow.cpp
@@ -19,17 +19,12 @@
 **********************************************************************/
 
 #include "canvascardwindow.h"
-#include "patiencecardgame.h"
 #include "freecellcardgame.h"
 #include "chicanecardgame.h"
 #include "harpcardgame.h"
 #include "teeclubcardgame.h"
 
-#include <qpe/resource.h>
 
-#include <qmainwindow.h>
-#include <qpopupmenu.h>
-#include <qstyle.h>
 
 
 CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) :
diff --git a/noncore/games/solitaire/canvasshapes.cpp b/noncore/games/solitaire/canvasshapes.cpp
index 6ccd4a4..011958d 100644
--- a/noncore/games/solitaire/canvasshapes.cpp
+++ b/noncore/games/solitaire/canvasshapes.cpp
@@ -17,8 +17,6 @@
 ** not clear to you.
 **
 **********************************************************************/
-#include <qpainter.h>
-#include <qcanvas.h>
 #include <qgfx_qws.h>
 #include "canvasshapes.h"
 
diff --git a/noncore/games/solitaire/card.cpp b/noncore/games/solitaire/card.cpp
index 609e280..52e38ac 100644
--- a/noncore/games/solitaire/card.cpp
+++ b/noncore/games/solitaire/card.cpp
@@ -20,10 +20,7 @@
 
 #include "card.h"
 
-#include <qpe/config.h>
 
-#include <qpoint.h>
-#include <qlist.h>
 
 /*
 Card( eValue v, eSuit s, bool f ) :
diff --git a/noncore/games/solitaire/cardpile.cpp b/noncore/games/solitaire/cardpile.cpp
index aace2e2..1d572be 100644
--- a/noncore/games/solitaire/cardpile.cpp
+++ b/noncore/games/solitaire/cardpile.cpp
@@ -22,9 +22,7 @@
 #include "card.h"
 
 #include <qpe/config.h>
-#include <qpoint.h>
 
-#include <qlist.h>
 
 
 CardPile::CardPile(int x, int y) : pileX(x), pileY(y), dealing(FALSE), PileResize(FALSE) {
diff --git a/noncore/games/solitaire/chicanecardgame.cpp b/noncore/games/solitaire/chicanecardgame.cpp
index 6729a94..6c607b9 100644
--- a/noncore/games/solitaire/chicanecardgame.cpp
+++ b/noncore/games/solitaire/chicanecardgame.cpp
@@ -26,7 +26,6 @@
         **deal 8 cards at once
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "chicanecardgame.h"
 
 
diff --git a/noncore/games/solitaire/freecellcardgame.cpp b/noncore/games/solitaire/freecellcardgame.cpp
index aeb32fc..d474f4e 100644
--- a/noncore/games/solitaire/freecellcardgame.cpp
+++ b/noncore/games/solitaire/freecellcardgame.cpp
@@ -17,7 +17,6 @@
 ** not clear to you.
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "freecellcardgame.h"
 
 
diff --git a/noncore/games/solitaire/harpcardgame.cpp b/noncore/games/solitaire/harpcardgame.cpp
index 0711622..d13d73b 100644
--- a/noncore/games/solitaire/harpcardgame.cpp
+++ b/noncore/games/solitaire/harpcardgame.cpp
@@ -28,7 +28,6 @@
 **
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "harpcardgame.h"
 
 
diff --git a/noncore/games/solitaire/main.cpp b/noncore/games/solitaire/main.cpp
index bd3cf8b..9301171 100644
--- a/noncore/games/solitaire/main.cpp
+++ b/noncore/games/solitaire/main.cpp
@@ -20,7 +20,6 @@
 
 #include "canvascardwindow.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<CanvasCardWindow> )
\ No newline at end of file
diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp
index 96a599c..756577a 100644
--- a/noncore/games/solitaire/patiencecardgame.cpp
+++ b/noncore/games/solitaire/patiencecardgame.cpp
@@ -17,7 +17,6 @@
 ** not clear to you.
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "patiencecardgame.h"
 
 
diff --git a/noncore/games/solitaire/teeclubcardgame.cpp b/noncore/games/solitaire/teeclubcardgame.cpp
index 0941e0d..b1af757 100644
--- a/noncore/games/solitaire/teeclubcardgame.cpp
+++ b/noncore/games/solitaire/teeclubcardgame.cpp
@@ -28,7 +28,6 @@
 **
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "teeclubcardgame.h"
   
  
diff --git a/noncore/games/tetrix/main.cpp b/noncore/games/tetrix/main.cpp
index fcf4b33..bf1242f 100644
--- a/noncore/games/tetrix/main.cpp
+++ b/noncore/games/tetrix/main.cpp
@@ -20,7 +20,6 @@
 
 #include "qtetrix.h"
 
-#include <qpe/qpeapplication.h>
 
 #include <opie/oapplicationfactory.h>
 
diff --git a/noncore/games/tetrix/ohighscoredlg.cpp b/noncore/games/tetrix/ohighscoredlg.cpp
index 7581f51..8d8079e 100644
--- a/noncore/games/tetrix/ohighscoredlg.cpp
+++ b/noncore/games/tetrix/ohighscoredlg.cpp
@@ -14,10 +14,9 @@
  **************************************************************************/
 
 #include <qdialog.h>
-#include <qpe/config.h>
 #include <qlayout.h>
-#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 
 #include <qstring.h>
 #include <qhbox.h>
diff --git a/noncore/games/tetrix/qtetrix.cpp b/noncore/games/tetrix/qtetrix.cpp
index 6d29c3f..20cf1a7 100644
--- a/noncore/games/tetrix/qtetrix.cpp
+++ b/noncore/games/tetrix/qtetrix.cpp
@@ -22,13 +22,10 @@
 #include "qtetrix.h"
 
 #include <qpe/resource.h>
-#include <qpe/config.h>
 
-#include <qapplication.h>
 #include <qlabel.h>
 #include <qdatetime.h>
 #include <qlayout.h>
-#include <qstring.h>
 
 #include "ohighscoredlg.h"
 
diff --git a/noncore/games/tetrix/qtetrixb.cpp b/noncore/games/tetrix/qtetrixb.cpp
index 521f171..3c179df 100644
--- a/noncore/games/tetrix/qtetrixb.cpp
+++ b/noncore/games/tetrix/qtetrixb.cpp
@@ -22,8 +22,6 @@
 #include "qtetrixb.h"
 #include "qtetrix.h"
 #include <qtimer.h>
-#include <qkeycode.h>
-#include <qpainter.h>
 
 const int waitAfterLineTime = 500;
 
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp
index cfff683..9aafe4c 100644
--- a/noncore/games/tictac/main.cpp
+++ b/noncore/games/tictac/main.cpp
@@ -6,7 +6,6 @@
 **
 *****************************************************************************/
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 #include "tictac.h"
 
diff --git a/noncore/games/tictac/tictac.cpp b/noncore/games/tictac/tictac.cpp
index 9de3b58..12ce35f 100644
--- a/noncore/games/tictac/tictac.cpp
+++ b/noncore/games/tictac/tictac.cpp
@@ -10,15 +10,11 @@
 
 #include "tictac.h"
 #include <qpe/qpeapplication.h>
-#include <qpainter.h>
 #include <qdrawutil.h>
 #include <qcombobox.h>
-#include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <stdlib.h>       // rand() function
-#include <qdatetime.h>        // seed for rand()
-#include <qstringlist.h> //needed for proper internationalization
 
 
 //***************************************************************************
diff --git a/noncore/games/wordgame/main.cpp b/noncore/games/wordgame/main.cpp
index f32acff..eb3e2f2 100644
--- a/noncore/games/wordgame/main.cpp
+++ b/noncore/games/wordgame/main.cpp
@@ -20,7 +20,6 @@
 
 #include "wordgame.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp
index c01551d..43a54f8 100644
--- a/noncore/games/wordgame/wordgame.cpp
+++ b/noncore/games/wordgame/wordgame.cpp
@@ -21,21 +21,14 @@
 
 #include "wordgame.h"
 
-#include <qpe/applnk.h>
 #include <qpe/global.h>
-#include <qpe/filemanager.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qapplication.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
-#include <qfile.h>
 #include <qdir.h>
-#include <qiconset.h>
-#include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qtextstream.h>
@@ -44,9 +37,7 @@
 #include <qtoolbutton.h>
 #include <qvbox.h>
 #include <qwidgetstack.h>
-#include <qpainter.h>
 #include <qlayout.h>
-#include <qregexp.h>
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/noncore/games/zlines/ballpainter.cpp b/noncore/games/zlines/ballpainter.cpp
index c2b34e1..622ec29 100644
--- a/noncore/games/zlines/ballpainter.cpp
+++ b/noncore/games/zlines/ballpainter.cpp
@@ -19,13 +19,10 @@
 
 #include <qpe/resource.h>
 
-#include <qapplication.h>
 #include "ballpainter.h"
 //#include "shotcounter.h"
 #include <qpainter.h>
-#include "linesboard.h"
 //#include <qcolor.h>
-#include <qjpegio.h>
 
 
 #define PIXSIZE 21
diff --git a/noncore/games/zlines/field.cpp b/noncore/games/zlines/field.cpp
index 2a87739..0adf4ac 100644
--- a/noncore/games/zlines/field.cpp
+++ b/noncore/games/zlines/field.cpp
@@ -17,7 +17,6 @@ email                : Roman.Razilov@gmx.de
  *                                                                         *
  ***************************************************************************/
 #include <stdlib.h>
-#include "cfg.h"
 #include "field.h"
 
 Field::Field(QWidget* parent, const char* name)
diff --git a/noncore/games/zlines/klines.cpp b/noncore/games/zlines/klines.cpp
index 02ff0db..76c94e2 100644
--- a/noncore/games/zlines/klines.cpp
+++ b/noncore/games/zlines/klines.cpp
@@ -23,22 +23,13 @@
 // The implementation of the KLines widget
 //
 
-#include <qkeycode.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qstring.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
 
 #include <qapplication.h>
-#include <qmenubar.h>
-#include <qpopupmenu.h>
 
 
-#include "cfg.h"
-#include <qstatusbar.h>
 #include "klines.h"
 
 
diff --git a/noncore/games/zlines/linesboard.cpp b/noncore/games/zlines/linesboard.cpp
index 0965b2c..1e59aeb 100644
--- a/noncore/games/zlines/linesboard.cpp
+++ b/noncore/games/zlines/linesboard.cpp
@@ -17,9 +17,6 @@
  *                                                                         *
  ***************************************************************************/
 #include <qpainter.h>
-#include <qpixmap.h>
-#include <qcolor.h>
-#include <qkeycode.h>
 #include <stdlib.h>
 
 #include "linesboard.h"
diff --git a/noncore/games/zlines/main.cpp b/noncore/games/zlines/main.cpp
index ff41f95..238e7d3 100644
--- a/noncore/games/zlines/main.cpp
+++ b/noncore/games/zlines/main.cpp
@@ -21,7 +21,6 @@
   * Roman Razilov 2000-05-21 qimgio
 */
 
-#include <qglobal.h>
 
 
 #include <opie/oapplicationfactory.h>
diff --git a/noncore/games/zlines/mwidget.cpp b/noncore/games/zlines/mwidget.cpp
index 6641fa2..211d3d3 100644
--- a/noncore/games/zlines/mwidget.cpp
+++ b/noncore/games/zlines/mwidget.cpp
@@ -18,7 +18,6 @@ email                : Roman.Razilov@gmx.de
  ***************************************************************************/
 #include "mwidget.h"
 #include <qlayout.h>
-#include "ballpainter.h"
 #include <qhbox.h>
 #include <qlabel.h>
 
diff --git a/noncore/games/zsame/StoneWidget.cpp b/noncore/games/zsame/StoneWidget.cpp
index 49fa1a4..646fc9c 100644
--- a/noncore/games/zsame/StoneWidget.cpp
+++ b/noncore/games/zsame/StoneWidget.cpp
@@ -21,11 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qcursor.h>
 
 
 #include <qpe/resource.h>
diff --git a/noncore/games/zsame/ZSameWidget.cpp b/noncore/games/zsame/ZSameWidget.cpp
index 5001b55..45a877f 100644
--- a/noncore/games/zsame/ZSameWidget.cpp
+++ b/noncore/games/zsame/ZSameWidget.cpp
@@ -21,11 +21,6 @@
 
 #include <stdio.h>
 
-#include <qwidget.h>
-#include <qpushbutton.h>
-#include <qpixmap.h>
-#include <qvbox.h>
-#include <qpopupmenu.h>
 #include <qtoolbar.h>
 #include <qmenubar.h>
 
@@ -39,8 +34,6 @@
 
 
 #include "ZSameWidget.h"
-#include "StoneWidget.h"
-#include "version.h"
 
 static int default_colors=3;