removed obsolete static.h and useqpe.h

44 files changed, 21 insertions, 61 deletions

diff --git a/noncore/apps/opie-reader/Aportis.cpp b/noncore/apps/opie-reader/Aportis.cpp
index 7528e78..353996c 100644
--- a/noncore/apps/opie-reader/Aportis.cpp
+++ b/noncore/apps/opie-reader/Aportis.cpp
@@ -1,12 +1,11 @@
 #include <stdio.h>
 #include <string.h>
 #include "Aportis.h"
 #include "my_list.h"
 #include "Bkmks.h"
-#include "static.h"
 
 Aportis::Aportis() : peanutfile(false) { /*printf("constructing:%x\n",fin);*/ }
 
 void Aportis::dePeanut(int& ch)
 {
     if (peanutfile && ch != EOF)
diff --git a/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro b/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro
index 4b61a7a..fcab192 100644
--- a/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro
+++ b/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro
@@ -1,13 +1,12 @@
 DEFINES += OPIE USEQPE
 VPATH = ..
 TEMPLATE	= lib
 CONFIG		= qt warn_on release dll
 HEADERS		= Aportis.h \
 		  CExpander.h \
-		  ../OREADERINC/useqpe.h \
 		  config.h \
 		  ustring.h \
 		  StyleConsts.h \
 		  Markups.h \
 		  names.h \
 		  linktype.h \
@@ -21,10 +20,10 @@ SOURCES		= Aportis.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
 TARGET		= Aportis
 LIBS            += -lreader_pdb -lreader_codec
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
-include ( $(OPIEDIR)/include.pro )
\ No newline at end of file
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index 22934f9..1f0a524 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -1,13 +1,11 @@
-#include "static.h"
 #include "names.h"
 
 #define NEWLINEBREAK
 #define INCREMENTALWIDTH
 
-#include "useqpe.h"
 #include "usenef.h"
 #include "BuffDoc.h"
 #include "config.h"
 #include "CDrawBuffer.h"
 #include "ZText.h"
 #include "ebookcodec.h"
diff --git a/noncore/apps/opie-reader/BuffDoc.h b/noncore/apps/opie-reader/BuffDoc.h
index a7dd7bf..2b4fb57 100644
--- a/noncore/apps/opie-reader/BuffDoc.h
+++ b/noncore/apps/opie-reader/BuffDoc.h
@@ -1,10 +1,9 @@
 #ifndef __BuffDoc_h
 #define __BuffDoc_h
 
-#include "useqpe.h"
 #include "CDrawBuffer.h"
 #include "CFilter.h"
 #include "CExpander.h"
 #include <qfontmetrics.h>
 #include <qmessagebox.h>
 
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index caccf1b..bfb3027 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -1,13 +1,12 @@
 #include "CDrawBuffer.h"
 #include "FontControl.h"
 #include <qfontmetrics.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qimage.h>
-#include "useqpe.h"
 
 CDrawBuffer::~CDrawBuffer()
 {
     while (!segs.isEmpty()) segs.erase(0);
 }
 
diff --git a/noncore/apps/opie-reader/CExpander.h b/noncore/apps/opie-reader/CExpander.h
index e9aaf79..7fa84f9 100644
--- a/noncore/apps/opie-reader/CExpander.h
+++ b/noncore/apps/opie-reader/CExpander.h
@@ -5,13 +5,12 @@
 #include <unistd.h>
 #endif
 #include <stdio.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <qmessagebox.h>
-#include "useqpe.h"
 #include "config.h"
 #include "StyleConsts.h"
 #include "Markups.h"
 #include "names.h"
 #include "linktype.h"
 
diff --git a/noncore/apps/opie-reader/CFilter.cpp b/noncore/apps/opie-reader/CFilter.cpp
index 6f76e9a..6d94d70 100644
--- a/noncore/apps/opie-reader/CFilter.cpp
+++ b/noncore/apps/opie-reader/CFilter.cpp
@@ -1,11 +1,10 @@
 #include <qmap.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <qdir.h>
-#include "useqpe.h"
 #ifdef USEQPE
 #include <qpe/global.h>
 #endif
 #include "CDrawBuffer.h"
 #include "CFilter.h"
 #include "hrule.h"
diff --git a/noncore/apps/opie-reader/CFilter.h b/noncore/apps/opie-reader/CFilter.h
index cec9618..174e6b4 100644
--- a/noncore/apps/opie-reader/CFilter.h
+++ b/noncore/apps/opie-reader/CFilter.h
@@ -388,13 +388,12 @@ class HighlightFilter : public CFilter
   HighlightFilter(QTReader*);
   void getch(tchar& ch, CStyle& sty, unsigned long& pos);
   void refresh(unsigned long);
   QString about() { return QString("High-lighting filter (c) Tim Wentford\n")+parent->about(); }
 };
 
-#include "static.h"
 #ifndef __STATIC
 #include <dlfcn.h>
 
 class ExternFilter : public CFilter_IFace
 {
   CFilter* filt;
diff --git a/noncore/apps/opie-reader/CHM.cpp b/noncore/apps/opie-reader/CHM.cpp
index 9d1eb87..88d53bf 100644
--- a/noncore/apps/opie-reader/CHM.cpp
+++ b/noncore/apps/opie-reader/CHM.cpp
@@ -1,9 +1,8 @@
 #include "CHM.h"
 #include "chm_lib.h"
-#include "static.h"
 #include <qstring.h>
 #include <qstringlist.h>
 #include <stdio.h>
 #include <qimage.h>
 #include <qpixmap.h>
 
diff --git a/noncore/apps/opie-reader/CHM.h b/noncore/apps/opie-reader/CHM.h
index 7dac46f..001f7fc 100644
--- a/noncore/apps/opie-reader/CHM.h
+++ b/noncore/apps/opie-reader/CHM.h
@@ -1,11 +1,10 @@
 #ifndef __CHM_h
 #define __CHM_h
 #include <stdio.h>
 #include <sys/stat.h>
-#include "useqpe.h"
 #include "CExpander.h"
 #include "chm_lib.h"
 #include "my_list.h"
 #include "CExpander.h"
 
 struct Ref {
diff --git a/noncore/apps/opie-reader/CHM/CHM.pro b/noncore/apps/opie-reader/CHM/CHM.pro
index 6ed86f6..d3a2a28 100644
--- a/noncore/apps/opie-reader/CHM/CHM.pro
+++ b/noncore/apps/opie-reader/CHM/CHM.pro
@@ -9,10 +9,10 @@ SOURCES		= CHM.cpp chm_lib.c lzx.c
 
 INTERFACES	=
 DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
 TARGET		= CHM
 LIBS            += -lreader_codec
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
\ No newline at end of file
diff --git a/noncore/apps/opie-reader/CloseDialog.h b/noncore/apps/opie-reader/CloseDialog.h
index 62e6423..54aaf1c 100644
--- a/noncore/apps/opie-reader/CloseDialog.h
+++ b/noncore/apps/opie-reader/CloseDialog.h
@@ -6,13 +6,12 @@
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #ifndef __CLOSEDIALOG_H
 #define __CLOSEDIALOG_H
 
-#include "useqpe.h"
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qtabdialog.h>
 #include <qtabwidget.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp
index bbd9fe0..9bb3bc0 100644
--- a/noncore/apps/opie-reader/FontControl.cpp
+++ b/noncore/apps/opie-reader/FontControl.cpp
@@ -1,8 +1,7 @@
 #include <qfontdatabase.h>
-#include "useqpe.h"
 #include "FontControl.h"
 
 int FontControl::gzoom()
 {
   if (m_fixgraphics)
     {
diff --git a/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro b/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro
index cc049a9..8eb6f17 100644
--- a/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro
+++ b/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro
@@ -11,10 +11,10 @@ SOURCES		= striphtml.cpp
 QMAKE_PRE_LINK = mkdir -p $(OPIEDIR)/plugins/reader/data && cp ../HTMLentities $(OPIEDIR)/plugins/reader/data/HTMLentities
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/filters
 TARGET		= HTMLfilter
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/Palm2QImage.cpp b/noncore/apps/opie-reader/Palm2QImage.cpp
index c1b7b7a..c6907eb 100644
--- a/noncore/apps/opie-reader/Palm2QImage.cpp
+++ b/noncore/apps/opie-reader/Palm2QImage.cpp
@@ -1,8 +1,7 @@
 /* -*- mode: c; indent-tabs-mode: nil; -*- */
-#include "useqpe.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifndef _WINDOWS
 #include <unistd.h>     /* for link */
 #endif
diff --git a/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro b/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro
index 6ed4032..7042542 100644
--- a/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro
+++ b/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro
@@ -9,10 +9,10 @@ SOURCES		= plucker.cpp \
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
 TARGET		= Plucker
 LIBS            += -lreader_pdb -lreader_pluckerbase -lreader_codec
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index dfdba28..33884a0 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -7,13 +7,12 @@
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
 const int _SBARHEIGHT = 3;
 
-#include "useqpe.h"
 #include <qpainter.h>
 //#include <qdirectpainter_qws.h>
 #include <qimage.h>
 #include <qtimer.h>
 #include "config.h"
 #include "QTReader.h"
diff --git a/noncore/apps/opie-reader/QTReader.h b/noncore/apps/opie-reader/QTReader.h
index 7b0ebc8..3bcdde4 100644
--- a/noncore/apps/opie-reader/QTReader.h
+++ b/noncore/apps/opie-reader/QTReader.h
@@ -1,11 +1,10 @@
 #ifndef __QTREADER_H
 #define __QTREADER_H
 
 //#define _SCROLLPIPE
-#include "static.h"
 #include <qwidget.h>
 //#include <qpainter.h>
 #include "my_list.h"
 #include "BuffDoc.h"
 #include "FontControl.h"
 
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index ec7a29c..876b65a 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -14,13 +14,12 @@
 ** 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 "useqpe.h"
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qwidgetstack.h>
 #ifdef USEQPE
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
@@ -80,13 +79,12 @@ using namespace Opie::Ui;
 #include "qfiledialog.h"
 #endif
 
 #include "QTReaderApp.h"
 #include "CDrawBuffer.h"
 #include "Filedata.h"
-#include "useqpe.h"
 #include "names.h"
 #include "CEncoding_tables.h"
 #include "CloseDialog.h"
 
 #include "ButtonPrefs.h"
 
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index 5ecc42d..ad47fc9 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -23,13 +23,12 @@
 //#define _SCROLLPIPE
 //#define __ISEARCH
 
 //#define MAX_ENCODING 6
 #define MAX_ACTIONS 5
 
-#include "useqpe.h"
 #include <sys/timeb.h>
 #include <qmainwindow.h>
 #include "CExpander.h"
 #include "CEncoding.h"
 #include <qlist.h>
 //#include <qpe/filemanager.h>
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.cpp b/noncore/apps/opie-reader/ToolbarPrefs.cpp
index 5cf220a..56c4e9b 100644
--- a/noncore/apps/opie-reader/ToolbarPrefs.cpp
+++ b/noncore/apps/opie-reader/ToolbarPrefs.cpp
@@ -3,13 +3,12 @@
 **
 ** Created: Tue Feb 11 23:53:35 2003
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
-#include "useqpe.h"
 #include "ToolbarPrefs.h"
 
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.h b/noncore/apps/opie-reader/ToolbarPrefs.h
index a2686e5..0bdae6b 100644
--- a/noncore/apps/opie-reader/ToolbarPrefs.h
+++ b/noncore/apps/opie-reader/ToolbarPrefs.h
@@ -5,13 +5,12 @@
  **      by:  The User Interface Compiler (uic)
  **
  ** WARNING! All changes made in this file will be lost!
  ****************************************************************************/
 #ifndef CTOOLBARPREFS_H
 #define CTOOLBARPREFS_H
-#include "useqpe.h"
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qtabdialog.h>
 #include <qtabwidget.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
@@ -20,13 +19,12 @@
 #ifdef USEQPE
 #include <qpe/menubutton.h>
 #include <qpe/config.h>
 #else
 #include "preferences.h"
 #endif
-//#include "opie.h"
 //#ifdef OPIE
 #define USECOMBO
 //#endif
 
 class QVBoxLayout; 
 class QHBoxLayout; 
diff --git a/noncore/apps/opie-reader/URLDialog.h b/noncore/apps/opie-reader/URLDialog.h
index 1bcc4bd..792d13a 100644
--- a/noncore/apps/opie-reader/URLDialog.h
+++ b/noncore/apps/opie-reader/URLDialog.h
@@ -6,13 +6,12 @@
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #ifndef __URLDIALOG_H
 #define __URLDIALOG_H
 
-#include "useqpe.h"
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qtabdialog.h>
 #include <qtabwidget.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
diff --git a/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro b/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro
index 61e7dc9..f20bdc6 100644
--- a/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro
+++ b/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro
@@ -8,10 +8,10 @@ SOURCES		= ztxt.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
 TARGET		= Weasel
 LIBS            += -lreader_pdb -lreader_codec
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/ZText.h b/noncore/apps/opie-reader/ZText.h
index 06e3bf8..199c7da 100644
--- a/noncore/apps/opie-reader/ZText.h
+++ b/noncore/apps/opie-reader/ZText.h
@@ -1,12 +1,11 @@
 #ifndef __Text_h
 #define __Text_h
 #include <stdio.h>
 #include <zlib.h>
 #include <sys/stat.h>
-#include "useqpe.h"
 #include "CExpander.h"
 
 class Text: public CExpander {
   gzFile file;
   unsigned long fsize;
 public:
diff --git a/noncore/apps/opie-reader/codeclib/codeclib.pro b/noncore/apps/opie-reader/codeclib/codeclib.pro
index 6adcda8..c24767b 100644
--- a/noncore/apps/opie-reader/codeclib/codeclib.pro
+++ b/noncore/apps/opie-reader/codeclib/codeclib.pro
@@ -8,10 +8,10 @@ SOURCES		= CExpander.cpp CBuffer.cpp StyleConsts.cpp \
 		  hrule.cpp Navigation.cpp Bkmks.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/lib
 TARGET		= reader_codec
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/ebookcodec.h b/noncore/apps/opie-reader/ebookcodec.h
index b341e55..f6e2daf 100644
--- a/noncore/apps/opie-reader/ebookcodec.h
+++ b/noncore/apps/opie-reader/ebookcodec.h
@@ -1,19 +1,17 @@
 #include "CExpander.h"
 
 #include <qfileinfo.h>
 #include <qdir.h>
 
-#include "useqpe.h"
 #ifdef USEQPE
 #include <qpe/global.h>
 #endif
 
 #include "util.h"
 
-#include "static.h"
 #ifndef __STATIC
 #include <dlfcn.h>
 class ebookcodec : public CExpander_Interface
 {
   CExpander *codec;
   void *handle;
diff --git a/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro b/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro
index 78d5a49..5cf075e 100644
--- a/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro
+++ b/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro
@@ -9,11 +9,11 @@ SOURCES		= iSilo.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
 TARGET		= iSilo
 LIBS            += -lreader_pdb -lreader_codec
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/apps/opie-reader/main.cpp b/noncore/apps/opie-reader/main.cpp
index 3e1f5e7..af276da 100644
--- a/noncore/apps/opie-reader/main.cpp
+++ b/noncore/apps/opie-reader/main.cpp
@@ -1,7 +1,6 @@
-#include "useqpe.h"
 #ifdef USEQPE
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include "QTReaderApp.h"
diff --git a/noncore/apps/opie-reader/pdb.cpp b/noncore/apps/opie-reader/pdb.cpp
index 39551cc..6719af4 100644
--- a/noncore/apps/opie-reader/pdb.cpp
+++ b/noncore/apps/opie-reader/pdb.cpp
@@ -1,12 +1,11 @@
 #include "pdb.h"
 #ifdef _WINDOWS
 #include <winsock2.h>
 #endif
 
-#include "useqpe.h"
 
 #ifdef USEQPE
 void Cpdb::suspend()
 {
   CExpander::suspend(fin);
 }
diff --git a/noncore/apps/opie-reader/pdb.h b/noncore/apps/opie-reader/pdb.h
index 7a6580d..7458919 100644
--- a/noncore/apps/opie-reader/pdb.h
+++ b/noncore/apps/opie-reader/pdb.h
@@ -12,13 +12,12 @@
 #define __PDB_H__
 
 #ifndef _WINDOWS
 #include <netinet/in.h>
 #endif
 #include <stdio.h>
-#include "useqpe.h"
 #include "CExpander.h"
 
 /* Normal Palm typedefs */
 typedef unsigned char   UInt8;
 typedef unsigned short  UInt16;
 typedef signed short  Int16;
diff --git a/noncore/apps/opie-reader/pdblib/pdblib.pro b/noncore/apps/opie-reader/pdblib/pdblib.pro
index cb861a8..830d988 100644
--- a/noncore/apps/opie-reader/pdblib/pdblib.pro
+++ b/noncore/apps/opie-reader/pdblib/pdblib.pro
@@ -7,10 +7,10 @@ HEADERS		= pdb.h
 SOURCES		= pdb.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/lib
 TARGET		= reader_pdb
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp
index d1ccd6f..4ea807a 100644
--- a/noncore/apps/opie-reader/plucker.cpp
+++ b/noncore/apps/opie-reader/plucker.cpp
@@ -1,7 +1,6 @@
-#include "useqpe.h"
 #include <stdio.h>
 #include <string.h>
 #include <qmessagebox.h>
 #include <qpixmap.h>
 #ifdef USEQPE
 #include <qpe/qcopenvelope_qws.h>
@@ -17,13 +16,12 @@
 #endif
 #include <qclipboard.h>
 
 #include "plucker.h"
 #include "Aportis.h"
 #include "Palm2QImage.h"
-#include "static.h"
 
 
 struct CPlucker_dataRecord
 {
     UInt16 uid;
     UInt16 nParagraphs;
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index 0b7fae8..d7d538f 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,7 +1,6 @@
-#include "useqpe.h"
 #include "usenef.h"
 #include <stdio.h>
 #include <string.h>
 #include <qmessagebox.h>
 #include <qpixmap.h>
 #ifdef USEQPE
@@ -18,13 +17,12 @@
 #include <qapplication.h>
 #else /* USEQPE */
 #include <qpe/qpeapplication.h>
 #endif /* USEQPE */
 #include <qimage.h>
 
-#include "static.h"
 #include "plucker_base.h"
 #include "Aportis.h"
 #include "hrule.h"
 #include "util.h"
 
 const UInt8 CPlucker_base::continuation_bit = 1;
@@ -1356,13 +1354,12 @@ tchar CPlucker_base::getch_base(bool fast)
 
   m_lastIsBreak = (ch == 10);
 
   return (ch == EOF) ? UEOF : ch;
 }
 
-#include "static.h"
 #if defined(__STATIC) && defined(USENEF)
 #include "Model.h"
 void (*CPlucker_base::getdecompressor(const QString& _s))(UInt8*, size_t, UInt8*, size_t)
 {
 	if (_s == "PluckerDecompress3")
 	{
diff --git a/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro b/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro
index bee1a2d..7c2f31e 100644
--- a/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro
+++ b/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro
@@ -9,10 +9,10 @@ SOURCES		= plucker_base.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/lib
 TARGET		= reader_pluckerbase
 LIBS		+= -ldl
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/ppm_expander.cpp b/noncore/apps/opie-reader/ppm_expander.cpp
index ea5b955..2a4318b 100644
--- a/noncore/apps/opie-reader/ppm_expander.cpp
+++ b/noncore/apps/opie-reader/ppm_expander.cpp
@@ -5,13 +5,12 @@
 
 #include <stdlib.h>
 //#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include "static.h"
 
 /***************************************************************************
  * Interface avec les routines de compression
  */
 
 #define METHOD_NB      2   /* nombre total de méthodes de compression */
diff --git a/noncore/apps/opie-reader/ppm_expander.h b/noncore/apps/opie-reader/ppm_expander.h
index a1a3b60..ccc89c2 100644
--- a/noncore/apps/opie-reader/ppm_expander.h
+++ b/noncore/apps/opie-reader/ppm_expander.h
@@ -1,10 +1,9 @@
 #ifndef __ppm_expander_h
 #define __ppm_expander_h
 
-#include "useqpe.h"
 #include "CExpander.h"
 #include <sys/stat.h>
 
 
 #include "utypes.h"
 #include "ppm.h"
diff --git a/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro b/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro
index 8699d3b..d6ec97b 100644
--- a/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro
+++ b/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro
@@ -10,10 +10,10 @@ SOURCES		= ppm_expander.cpp \
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
 TARGET		= ppms
 LIBS            += -lreader_codec
 
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/preferences.cpp b/noncore/apps/opie-reader/preferences.cpp
index b9397cf..0f59a22 100755
--- a/noncore/apps/opie-reader/preferences.cpp
+++ b/noncore/apps/opie-reader/preferences.cpp
@@ -1,7 +1,6 @@
-#include "useqpe.h"
 #ifndef USEQPE
 
 #include "preferences.h"
 
 #include <qfile.h>
 #include <qtextstream.h>
diff --git a/noncore/apps/opie-reader/preferences.h b/noncore/apps/opie-reader/preferences.h
index 69d1774..aeb2a84 100644
--- a/noncore/apps/opie-reader/preferences.h
+++ b/noncore/apps/opie-reader/preferences.h
@@ -1,7 +1,6 @@
-#include "useqpe.h"
 #ifndef USEQPE
 #ifndef __PREFERENCES_H
 #define __PREFERENCES_H
 
 #include <qstring.h>
 #include <qmap.h>
diff --git a/noncore/apps/opie-reader/static.h b/noncore/apps/opie-reader/static.h
deleted file mode 100644
index e69de29..0000000
--- a/noncore/apps/opie-reader/static.h
+++ b/dev/null
diff --git a/noncore/apps/opie-reader/striphtml.cpp b/noncore/apps/opie-reader/striphtml.cpp
index 9cd6a0d..e86402b 100644
--- a/noncore/apps/opie-reader/striphtml.cpp
+++ b/noncore/apps/opie-reader/striphtml.cpp
@@ -1,11 +1,10 @@
 #include <qmap.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <qdir.h>
-#include "useqpe.h"
 #ifdef USEQPE
 #include <qpe/global.h>
 #endif
 #include "CDrawBuffer.h"
 #include "striphtml.h"
 #include "hrule.h"
diff --git a/noncore/apps/opie-reader/useqpe.h b/noncore/apps/opie-reader/useqpe.h
deleted file mode 100644
index e69de29..0000000
--- a/noncore/apps/opie-reader/useqpe.h
+++ b/dev/null
diff --git a/noncore/apps/opie-reader/ztxt.cpp b/noncore/apps/opie-reader/ztxt.cpp
index 79c5fa4..35db05e 100644
--- a/noncore/apps/opie-reader/ztxt.cpp
+++ b/noncore/apps/opie-reader/ztxt.cpp
@@ -1,12 +1,11 @@
 #include <stdio.h>
 #include <string.h>
 #include "ztxt.h"
 #include "my_list.h"
 #include "Bkmks.h"
-#include "static.h"
 
 ztxt::ztxt() : bInit(false), expandedtextbuffer(NULL), compressedtextbuffer(NULL) { /*printf("constructing:%x\n",fin);*/ }
 
 
 int ztxt::OpenFile(const char *src)
 {