diff --git a/designer/qscintillaplugin.cpp b/designer/qscintillaplugin.cpp
index b22c5ec..cd2b042 100644
--- a/designer/qscintillaplugin.cpp
+++ b/designer/qscintillaplugin.cpp
@@ -121,7 +121,7 @@ TQIconSet TQScintillaPlugin::iconSet(const TQString &) const
 TQString TQScintillaPlugin::includeFile(const TQString &feature) const
 {
 	if (feature == "QextScintilla")
-		return "tqextscintilla.h";
+		return "qextscintilla.h";
 
 	return TQString();
 }
diff --git a/example/application.cpp b/example/application.cpp
index 6a2b548..fbc03be 100644
--- a/example/application.cpp
+++ b/example/application.cpp
@@ -29,8 +29,8 @@
 #include <tqwhatsthis.h>
 #include <tqsimplerichtext.h>
 
-#include <tqextscintilla.h>
-#include <tqextscintillaprinter.h>
+#include <qextscintilla.h>
+#include <qextscintillaprinter.h>
 
 #include "filesave.xpm"
 #include "fileopen.xpm"
diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp
index 4f63082..db5e94a 100644
--- a/qt/PlatQt.cpp
+++ b/qt/PlatQt.cpp
@@ -40,7 +40,7 @@
 #include "Platform.h"
 #include "XPM.h"
 
-#include "tqextscintillabase.h"
+#include "qextscintillabase.h"
 
 
 // Type convertors.
diff --git a/qt/ScintillaQt.cpp b/qt/ScintillaQt.cpp
index 2fde58f..519e65e 100644
--- a/qt/ScintillaQt.cpp
+++ b/qt/ScintillaQt.cpp
@@ -29,7 +29,7 @@
 #include <tqdragobject.h>
 #include <tqpainter.h>
 
-#include "tqextscintillabase.h"
+#include "qextscintillabase.h"
 #include "ScintillaTQt.h"
 
 
diff --git a/qt/qextscintilla.cpp b/qt/qextscintilla.cpp
index e784750..4b33791 100644
--- a/qt/qextscintilla.cpp
+++ b/qt/qextscintilla.cpp
@@ -26,10 +26,10 @@
 #include <tqapplication.h>
 #include <tqcolor.h>
 
-#include "tqextscintilla.h"
-#include "tqextscintillalexer.h"
-#include "tqextscintillaapis.h"
-#include "tqextscintillacommandset.h"
+#include "qextscintilla.h"
+#include "qextscintillalexer.h"
+#include "qextscintillaapis.h"
+#include "qextscintillacommandset.h"
 
 
 // Make sure these match the values in Scintilla.h.  We don't #include that
diff --git a/qt/qextscintilla.h b/qt/qextscintilla.h
index 471032f..c34c88d 100644
--- a/qt/qextscintilla.h
+++ b/qt/qextscintilla.h
@@ -28,9 +28,9 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillabase.h>
-#include <tqextscintilladocument.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillabase.h>
+#include <qextscintilladocument.h>
 
 
 class QextScintillaLexer;
diff --git a/qt/qextscintillaapis.cpp b/qt/qextscintillaapis.cpp
index d6b0dda..58abda0 100644
--- a/qt/qextscintillaapis.cpp
+++ b/qt/qextscintillaapis.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include "tqextscintillaapis.h"
+#include "qextscintillaapis.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillaapis.h b/qt/qextscintillaapis.h
index 79d8e41..30e90f3 100644
--- a/qt/qextscintillaapis.h
+++ b/qt/qextscintillaapis.h
@@ -26,7 +26,7 @@
 
 #include <tqstringlist.h>
 
-#include <tqextscintillaglobal.h>
+#include <qextscintillaglobal.h>
 
 
 //! \brief The QextScintillaAPIs class represents the textual API information
diff --git a/qt/qextscintillabase.cpp b/qt/qextscintillabase.cpp
index 86c4857..4f51877 100644
--- a/qt/qextscintillabase.cpp
+++ b/qt/qextscintillabase.cpp
@@ -30,7 +30,7 @@
 #include <tqpainter.h>
 #include <tqptrlist.h>
 
-#include "tqextscintillabase.h"
+#include "qextscintillabase.h"
 #include "ScintillaTQt.h"
 
 
diff --git a/qt/qextscintillabase.h b/qt/qextscintillabase.h
index 2bf2092..d4e73ba 100644
--- a/qt/qextscintillabase.h
+++ b/qt/qextscintillabase.h
@@ -29,7 +29,7 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-#include <tqextscintillaglobal.h>
+#include <qextscintillaglobal.h>
 
 
 class ScintillaTQt;
diff --git a/qt/qextscintillacommand.cpp b/qt/qextscintillacommand.cpp
index ab37b92..816303f 100644
--- a/qt/qextscintillacommand.cpp
+++ b/qt/qextscintillacommand.cpp
@@ -23,9 +23,9 @@
 #include <tqnamespace.h>
 #include <tqapplication.h>
 
-#include "tqextscintillacommand.h"
-#include "tqextscintilla.h"
-#include "tqextscintillabase.h"
+#include "qextscintillacommand.h"
+#include "qextscintilla.h"
+#include "qextscintillabase.h"
 
 
 static int convert(int key);
diff --git a/qt/qextscintillacommand.h b/qt/qextscintillacommand.h
index 0cd365e..d8f5f12 100644
--- a/qt/qextscintillacommand.h
+++ b/qt/qextscintillacommand.h
@@ -26,7 +26,7 @@
 
 #include <tqstring.h>
 
-#include <tqextscintillaglobal.h>
+#include <qextscintillaglobal.h>
 
 
 class QextScintilla;
diff --git a/qt/qextscintillacommandset.cpp b/qt/qextscintillacommandset.cpp
index b9c126c..aa7479d 100644
--- a/qt/qextscintillacommandset.cpp
+++ b/qt/qextscintillacommandset.cpp
@@ -22,9 +22,9 @@
 
 #include <tqsettings.h>
 
-#include "tqextscintillacommandset.h"
-#include "tqextscintillacommand.h"
-#include "tqextscintilla.h"
+#include "qextscintillacommandset.h"
+#include "qextscintillacommand.h"
+#include "qextscintilla.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillacommandset.h b/qt/qextscintillacommandset.h
index eb02e0d..8959d64 100644
--- a/qt/qextscintillacommandset.h
+++ b/qt/qextscintillacommandset.h
@@ -26,8 +26,8 @@
 
 #include <tqptrlist.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillacommand.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillacommand.h>
 
 
 class TQSettings;
diff --git a/qt/qextscintilladocument.cpp b/qt/qextscintilladocument.cpp
index a3e8540..36dcb4a 100644
--- a/qt/qextscintilladocument.cpp
+++ b/qt/qextscintilladocument.cpp
@@ -20,8 +20,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-#include "tqextscintilladocument.h"
-#include "tqextscintillabase.h"
+#include "qextscintilladocument.h"
+#include "qextscintillabase.h"
 
 
 // This internal class encapsulates the underlying document and is shared by
diff --git a/qt/qextscintilladocument.h b/qt/qextscintilladocument.h
index fe0be6e..5e333df 100644
--- a/qt/qextscintilladocument.h
+++ b/qt/qextscintilladocument.h
@@ -24,7 +24,7 @@
 #define TQEXTSCINTILLADOCUMENT_H
 
 
-#include <tqextscintillaglobal.h>
+#include <qextscintillaglobal.h>
 
 
 class QextScintillaBase;
diff --git a/qt/qextscintillalexer.cpp b/qt/qextscintillalexer.cpp
index 6ecfee5..327206f 100644
--- a/qt/qextscintillalexer.cpp
+++ b/qt/qextscintillalexer.cpp
@@ -25,9 +25,9 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexer.h"
-#include "tqextscintilla.h"
-#include "tqextscintillabase.h"
+#include "qextscintillalexer.h"
+#include "qextscintilla.h"
+#include "qextscintillabase.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexer.h b/qt/qextscintillalexer.h
index 9e46fdb..689200f 100644
--- a/qt/qextscintillalexer.h
+++ b/qt/qextscintillalexer.h
@@ -29,7 +29,7 @@
 #include <tqcolor.h>
 #include <tqfont.h>
 
-#include <tqextscintillaglobal.h>
+#include <qextscintillaglobal.h>
 
 
 class TQSettings;
diff --git a/qt/qextscintillalexerbash.cpp b/qt/qextscintillalexerbash.cpp
index 8edb55f..b74f97c 100644
--- a/qt/qextscintillalexerbash.cpp
+++ b/qt/qextscintillalexerbash.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerbash.h"
+#include "qextscintillalexerbash.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerbash.h b/qt/qextscintillalexerbash.h
index a52cf0e..56c184e 100644
--- a/qt/qextscintillalexerbash.h
+++ b/qt/qextscintillalexerbash.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerBash class encapsulates the Scintilla Bash
diff --git a/qt/qextscintillalexerbatch.cpp b/qt/qextscintillalexerbatch.cpp
index 076a378..8a7482c 100644
--- a/qt/qextscintillalexerbatch.cpp
+++ b/qt/qextscintillalexerbatch.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerbatch.h"
+#include "qextscintillalexerbatch.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerbatch.h b/qt/qextscintillalexerbatch.h
index e20e831..e652249 100644
--- a/qt/qextscintillalexerbatch.h
+++ b/qt/qextscintillalexerbatch.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerBatch class encapsulates the Scintilla batch
diff --git a/qt/qextscintillalexercpp.cpp b/qt/qextscintillalexercpp.cpp
index 2f94bc1..0d1ddb8 100644
--- a/qt/qextscintillalexercpp.cpp
+++ b/qt/qextscintillalexercpp.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexercpp.h"
+#include "qextscintillalexercpp.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexercpp.h b/qt/qextscintillalexercpp.h
index 420c473..95e8011 100644
--- a/qt/qextscintillalexercpp.h
+++ b/qt/qextscintillalexercpp.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerCPP class encapsulates the Scintilla C++
diff --git a/qt/qextscintillalexercsharp.cpp b/qt/qextscintillalexercsharp.cpp
index 2497b46..03e5ad1 100644
--- a/qt/qextscintillalexercsharp.cpp
+++ b/qt/qextscintillalexercsharp.cpp
@@ -23,7 +23,7 @@
 #include <tqcolor.h>
 #include <tqfont.h>
 
-#include "tqextscintillalexercsharp.h"
+#include "qextscintillalexercsharp.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexercsharp.h b/qt/qextscintillalexercsharp.h
index 77971d0..441ea53 100644
--- a/qt/qextscintillalexercsharp.h
+++ b/qt/qextscintillalexercsharp.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexercpp.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexercpp.h>
 
 
 //! \brief The QextScintillaLexerCSharp class encapsulates the Scintilla C#
diff --git a/qt/qextscintillalexercss.cpp b/qt/qextscintillalexercss.cpp
index c32371d..ff15caa 100644
--- a/qt/qextscintillalexercss.cpp
+++ b/qt/qextscintillalexercss.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexercss.h"
+#include "qextscintillalexercss.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexercss.h b/qt/qextscintillalexercss.h
index d8344a2..32421fa 100644
--- a/qt/qextscintillalexercss.h
+++ b/qt/qextscintillalexercss.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerCSS class encapsulates the Scintilla CSS
diff --git a/qt/qextscintillalexerdiff.cpp b/qt/qextscintillalexerdiff.cpp
index 8b8c4b4..9fecf20 100644
--- a/qt/qextscintillalexerdiff.cpp
+++ b/qt/qextscintillalexerdiff.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerdiff.h"
+#include "qextscintillalexerdiff.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerdiff.h b/qt/qextscintillalexerdiff.h
index e80bd6e..ab1412e 100644
--- a/qt/qextscintillalexerdiff.h
+++ b/qt/qextscintillalexerdiff.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerDiff class encapsulates the Scintilla Diff
diff --git a/qt/qextscintillalexerhtml.cpp b/qt/qextscintillalexerhtml.cpp
index cc76a9f..5013ff9 100644
--- a/qt/qextscintillalexerhtml.cpp
+++ b/qt/qextscintillalexerhtml.cpp
@@ -24,9 +24,9 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerhtml.h"
-#include "tqextscintillalexerjavascript.h"
-#include "tqextscintillalexerpython.h"
+#include "qextscintillalexerhtml.h"
+#include "qextscintillalexerjavascript.h"
+#include "qextscintillalexerpython.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerhtml.h b/qt/qextscintillalexerhtml.h
index a5fac6e..06b94d9 100644
--- a/qt/qextscintillalexerhtml.h
+++ b/qt/qextscintillalexerhtml.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerHTML class encapsulates the Scintilla HTML
diff --git a/qt/qextscintillalexeridl.cpp b/qt/qextscintillalexeridl.cpp
index ecf7773..ceba60c 100644
--- a/qt/qextscintillalexeridl.cpp
+++ b/qt/qextscintillalexeridl.cpp
@@ -23,7 +23,7 @@
 #include <tqcolor.h>
 #include <tqfont.h>
 
-#include "tqextscintillalexeridl.h"
+#include "qextscintillalexeridl.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexeridl.h b/qt/qextscintillalexeridl.h
index e4e601c..0f14c65 100644
--- a/qt/qextscintillalexeridl.h
+++ b/qt/qextscintillalexeridl.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexercpp.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexercpp.h>
 
 
 //! \brief The QextScintillaLexerIDL class encapsulates the Scintilla IDL
diff --git a/qt/qextscintillalexerjava.cpp b/qt/qextscintillalexerjava.cpp
index 5026b9a..3b08246 100644
--- a/qt/qextscintillalexerjava.cpp
+++ b/qt/qextscintillalexerjava.cpp
@@ -20,7 +20,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-#include "tqextscintillalexerjava.h"
+#include "qextscintillalexerjava.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerjava.h b/qt/qextscintillalexerjava.h
index a0d5ad1..8cd66fe 100644
--- a/qt/qextscintillalexerjava.h
+++ b/qt/qextscintillalexerjava.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexercpp.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexercpp.h>
 
 
 //! \brief The QextScintillaLexerJava class encapsulates the Scintilla Java
diff --git a/qt/qextscintillalexerjavascript.cpp b/qt/qextscintillalexerjavascript.cpp
index 2969d14..4d67dfb 100644
--- a/qt/qextscintillalexerjavascript.cpp
+++ b/qt/qextscintillalexerjavascript.cpp
@@ -23,7 +23,7 @@
 #include <tqcolor.h>
 #include <tqfont.h>
 
-#include "tqextscintillalexerjavascript.h"
+#include "qextscintillalexerjavascript.h"
 
 
 // The list of JavaScript keywords that can be used by other friendly lexers.
diff --git a/qt/qextscintillalexerjavascript.h b/qt/qextscintillalexerjavascript.h
index c94f772..d39a914 100644
--- a/qt/qextscintillalexerjavascript.h
+++ b/qt/qextscintillalexerjavascript.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexercpp.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexercpp.h>
 
 
 //! \brief The QextScintillaLexerJavaScript class encapsulates the Scintilla
diff --git a/qt/qextscintillalexerlua.cpp b/qt/qextscintillalexerlua.cpp
index 2025068..eedc21e 100644
--- a/qt/qextscintillalexerlua.cpp
+++ b/qt/qextscintillalexerlua.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerlua.h"
+#include "qextscintillalexerlua.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerlua.h b/qt/qextscintillalexerlua.h
index d82b0b2..1e4f26d 100644
--- a/qt/qextscintillalexerlua.h
+++ b/qt/qextscintillalexerlua.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerLua class encapsulates the Scintilla Lua
diff --git a/qt/qextscintillalexermakefile.cpp b/qt/qextscintillalexermakefile.cpp
index 5cb68f3..5454c96 100644
--- a/qt/qextscintillalexermakefile.cpp
+++ b/qt/qextscintillalexermakefile.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexermakefile.h"
+#include "qextscintillalexermakefile.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexermakefile.h b/qt/qextscintillalexermakefile.h
index 8f4d14d..dcd5d6f 100644
--- a/qt/qextscintillalexermakefile.h
+++ b/qt/qextscintillalexermakefile.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerMakefile class encapsulates the Scintilla
diff --git a/qt/qextscintillalexerperl.cpp b/qt/qextscintillalexerperl.cpp
index 380b9a9..8a191f5 100644
--- a/qt/qextscintillalexerperl.cpp
+++ b/qt/qextscintillalexerperl.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerperl.h"
+#include "qextscintillalexerperl.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerperl.h b/qt/qextscintillalexerperl.h
index f6e52e1..08160ab 100644
--- a/qt/qextscintillalexerperl.h
+++ b/qt/qextscintillalexerperl.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerPerl class encapsulates the Scintilla Perl
diff --git a/qt/qextscintillalexerpov.cpp b/qt/qextscintillalexerpov.cpp
index a9fe9a2..6864d80 100644
--- a/qt/qextscintillalexerpov.cpp
+++ b/qt/qextscintillalexerpov.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerpov.h"
+#include "qextscintillalexerpov.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerpov.h b/qt/qextscintillalexerpov.h
index 24edd6d..36bcec4 100644
--- a/qt/qextscintillalexerpov.h
+++ b/qt/qextscintillalexerpov.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerPOV class encapsulates the Scintilla POV
diff --git a/qt/qextscintillalexerproperties.cpp b/qt/qextscintillalexerproperties.cpp
index 914b1ff..3503f31 100644
--- a/qt/qextscintillalexerproperties.cpp
+++ b/qt/qextscintillalexerproperties.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerproperties.h"
+#include "qextscintillalexerproperties.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerproperties.h b/qt/qextscintillalexerproperties.h
index 90f85a0..a25cd59 100644
--- a/qt/qextscintillalexerproperties.h
+++ b/qt/qextscintillalexerproperties.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerProperties class encapsulates the Scintilla
diff --git a/qt/qextscintillalexerpython.cpp b/qt/qextscintillalexerpython.cpp
index 92b8d2e..c644b68 100644
--- a/qt/qextscintillalexerpython.cpp
+++ b/qt/qextscintillalexerpython.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerpython.h"
+#include "qextscintillalexerpython.h"
 
 
 // The list of Python keywords that can be used by other friendly lexers.
diff --git a/qt/qextscintillalexerpython.h b/qt/qextscintillalexerpython.h
index 3c13614..ad92e8a 100644
--- a/qt/qextscintillalexerpython.h
+++ b/qt/qextscintillalexerpython.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerPython class encapsulates the Scintilla Python
diff --git a/qt/qextscintillalexerruby.cpp b/qt/qextscintillalexerruby.cpp
index ef0ac2f..7972d50 100644
--- a/qt/qextscintillalexerruby.cpp
+++ b/qt/qextscintillalexerruby.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexerruby.h"
+#include "qextscintillalexerruby.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexerruby.h b/qt/qextscintillalexerruby.h
index 9ad23f6..2fa6c03 100644
--- a/qt/qextscintillalexerruby.h
+++ b/qt/qextscintillalexerruby.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerRuby class encapsulates the Scintilla Ruby
diff --git a/qt/qextscintillalexersql.cpp b/qt/qextscintillalexersql.cpp
index 4ee26ab..b934cda 100644
--- a/qt/qextscintillalexersql.cpp
+++ b/qt/qextscintillalexersql.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexersql.h"
+#include "qextscintillalexersql.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexersql.h b/qt/qextscintillalexersql.h
index 8d9902d..586d1e0 100644
--- a/qt/qextscintillalexersql.h
+++ b/qt/qextscintillalexersql.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerSQL class encapsulates the Scintilla SQL
diff --git a/qt/qextscintillalexertex.cpp b/qt/qextscintillalexertex.cpp
index 1e8a1c5..aa21e80 100644
--- a/qt/qextscintillalexertex.cpp
+++ b/qt/qextscintillalexertex.cpp
@@ -24,7 +24,7 @@
 #include <tqfont.h>
 #include <tqsettings.h>
 
-#include "tqextscintillalexertex.h"
+#include "qextscintillalexertex.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillalexertex.h b/qt/qextscintillalexertex.h
index 250f92d..89fa694 100644
--- a/qt/qextscintillalexertex.h
+++ b/qt/qextscintillalexertex.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintillalexer.h>
+#include <qextscintillaglobal.h>
+#include <qextscintillalexer.h>
 
 
 //! \brief The QextScintillaLexerTeX class encapsulates the Scintilla TeX
diff --git a/qt/qextscintillamacro.cpp b/qt/qextscintillamacro.cpp
index 25555f7..767717a 100644
--- a/qt/qextscintillamacro.cpp
+++ b/qt/qextscintillamacro.cpp
@@ -24,8 +24,8 @@
 
 #include <tqstring.h>
 
-#include "tqextscintillamacro.h"
-#include "tqextscintilla.h"
+#include "qextscintillamacro.h"
+#include "qextscintilla.h"
 
 
 static TQCString extract(const TQCString &asc,int &start);
diff --git a/qt/qextscintillamacro.h b/qt/qextscintillamacro.h
index b7dac63..4ef32ae 100644
--- a/qt/qextscintillamacro.h
+++ b/qt/qextscintillamacro.h
@@ -28,7 +28,7 @@
 #include <tqcstring.h>
 #include <tqvaluelist.h>
 
-#include <tqextscintillaglobal.h>
+#include <qextscintillaglobal.h>
 
 
 class TQString;
diff --git a/qt/qextscintillaprinter.cpp b/qt/qextscintillaprinter.cpp
index ec97032..ed6f279 100644
--- a/qt/qextscintillaprinter.cpp
+++ b/qt/qextscintillaprinter.cpp
@@ -25,8 +25,8 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqvaluestack.h>
 
-#include "tqextscintillaprinter.h"
-#include "tqextscintillabase.h"
+#include "qextscintillaprinter.h"
+#include "qextscintillabase.h"
 
 
 // The ctor.
diff --git a/qt/qextscintillaprinter.h b/qt/qextscintillaprinter.h
index 8c0ab57..3478b91 100644
--- a/qt/qextscintillaprinter.h
+++ b/qt/qextscintillaprinter.h
@@ -26,8 +26,8 @@
 
 #include <tqprinter.h>
 
-#include <tqextscintillaglobal.h>
-#include <tqextscintilla.h>
+#include <qextscintillaglobal.h>
+#include <qextscintilla.h>
 
 
 class TQRect;
diff --git a/qt/qscintilla.pro b/qt/qscintilla.pro
index 3180bab..53ba137 100644
--- a/qt/qscintilla.pro
+++ b/qt/qscintilla.pro
@@ -27,7 +27,7 @@ TEMPLATE = lib
 TARGET = qscintilla
 # DESTDIR = $(QTDIR)/lib
 CONFIG += qt warn_off release dll thread
-INCLUDEPATH = . ../include ../src
+INCLUDEPATH = . ../include ../src /usr/include/tqt
 DEFINES = QEXTSCINTILLA_MAKE_DLL QT SCI_LEXER
 
 HEADERS = \