diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..a3b3c30
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,80 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+#### general package setup
+
+project( kbibtex )
+set( VERSION R14.1.0 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON                             )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL}         )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( src )
+add_subdirectory( xslt )
+tde_conditional_add_subdirectory( BUILD_DOC doc         )
+tde_conditional_add_subdirectory( BUILD_DOC man         )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) 
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..fa91474
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,51 @@
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 3   #
+#                                         #
+###########################################
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+    tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### check for libxml-2.0
+
+find_package( LibXml2 )
+if( NOT LIBXML2_FOUND )
+    tde_message_fatal( "libxml-2.0 is required, but was not found on your system" )
+endif( NOT LIBXML2_FOUND )
+
+
+##### check for libxslt
+
+find_package( LibXslt )
+if( NOT LIBXSLT_FOUND )
+    tde_message_fatal( "libxslt is required, but was not found on your system" )
+endif( NOT LIBXSLT_FOUND )
+
+
+##### check for libyaz
+
+pkg_search_module( LIBYAZ libyaz yaz )
+if( LIBYAZ_FOUND )
+    set( HAVE_YAZ 1 )
+ else()
+    tde_message_fatal( "libyaz is required, but was not found on your system" )
+endif( )
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..3581708
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,11 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+// Defined if you have libyaz
+#cmakedefine HAVE_YAZ 1
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000..c938175
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( en )
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
new file mode 100644
index 0000000..ba3ef3e
--- /dev/null
+++ b/doc/en/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} )
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
new file mode 100644
index 0000000..8512250
--- /dev/null
+++ b/man/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES ${PROJECT_NAME}.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 0000000..597c341
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,5 @@
+file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+
+if( _srcs )
+   tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
+endif( )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..a9c1ce3
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,128 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${LIBXML2_INCLUDE_DIR}
+  ${LIBXSLT_INCLUDE_DIR}
+  ${LIBYAZ_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+  ${LIBXML2_LIB_DIR}
+  ${LIBXSLT_LIB_DIR}
+  ${LIBYAZ_LIBRARY_DIRS}
+)
+
+
+##### kbibtex (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+  SOURCES
+        kbibtexshell.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+     tdeparts-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### libkbibtexpart (kpart)
+
+tde_add_kpart( libkbibtexpart AUTOMOC
+
+  SOURCES
+        comment.cpp fileexporterdocbook5.cpp
+        commentwidget.cpp documentlistview.cpp
+        documentlistviewitem.cpp documentsourceview.cpp
+        documentwidget.cpp element.cpp
+        encoder.cpp encoderlatex.cpp
+        encoderxml.cpp entry.cpp
+        entryfield.cpp entrywidget.cpp
+        entrywidgetauthor.cpp entrywidgetexternal.cpp
+        entrywidgetkeyword.cpp entrywidgetmisc.cpp
+        entrywidgetother.cpp entrywidgetpublication.cpp
+        entrywidgetsource.cpp entrywidgettab.cpp
+        entrywidgettitle.cpp entrywidgetuserdefined.cpp
+        entrywidgetwarningsitem.cpp z3950connection.cpp
+        fieldlineedit.cpp fieldlistview.cpp
+        file.cpp fileexporter.cpp
+        fileexporterbibtex.cpp fileexporterris.cpp
+        fileexporterbibutils.cpp fileexporterexternal.cpp
+        fileexporterpdf.cpp fileexporterps.cpp
+        fileexporterrtf.cpp fileexportertoolchain.cpp
+        fileexporterxml.cpp fileexporterxslt.cpp
+        fileimporter.cpp fileimporterbibtex.cpp
+        fileimporterbibutils.cpp fileimporterexternal.cpp
+        fileimporterris.cpp idsuggestions.cpp
+        idsuggestionswidget.cpp kbibtex_part.cpp
+        macrowidget.cpp macro.cpp
+        mergeelements.cpp preamble.cpp
+        webqueryieeexplore.cpp preamblewidget.cpp
+        searchbar.cpp settings.cpp
+        settingsdlg.cpp settingsediting.cpp
+        settingsfileio.cpp settingsidsuggestions.cpp
+        settingskeyword.cpp settingssearchurl.cpp
+        settingsuserdefinedinput.cpp sidebar.cpp value.cpp
+        valuewidget.cpp webquery.cpp
+        webqueryamatex.cpp webqueryarxiv.cpp
+        webqueryciteseerx.cpp webquerybibsonomy.cpp
+        webquerycsb.cpp webquerycitebase.cpp
+        webquerydblp.cpp webqueryz3950.cpp
+        webquerygooglescholar.cpp webquerypubmed.cpp
+        webqueryspireshep.cpp webqueryzmath.cpp
+        xsltransform.cpp webquerysciencedirect.cpp
+        findduplicates.cpp settingsz3950.cpp
+        messagehandler.cpp iso6937converter.cpp
+        iso5426converter.cpp webquerymathscinet.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+     tdeparts-shared
+     tdeutils-shared
+     katepartinterfaces-shared
+     tdetexteditor
+     ${LIBXML2_LIBRARIES}
+     ${LIBXSLT_LIBRARIES}
+     ${LIBXSLT_EXSLT_LIBRARIES}
+     ${LIBYAZ_LIBRARIES}
+       
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+    FILES z3950-servers.cfg kbibtex_shell.rc
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
+
+install(
+    FILES kbibtex_part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES ${PROJECT_NAME}.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+    FILES kbibtex_part.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kbibtexpart
+)
diff --git a/src/comment.cpp b/src/comment.cpp
index 3d2e5c1..7461eb1 100644
--- a/src/comment.cpp
+++ b/src/comment.cpp
@@ -17,11 +17,11 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqregexp.h>
-#include <ntqstringlist.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 
-#include <comment.h>
-#include <xsltransform.h>
+#include "comment.h"
+#include "xsltransform.h"
 
 namespace BibTeX
 {
diff --git a/src/comment.h b/src/comment.h
index 10927e8..762caea 100644
--- a/src/comment.h
+++ b/src/comment.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXCOMMENT_H
 #define BIBTEXCOMMENT_H
 
-#include <element.h>
+#include "element.h"
 
 namespace BibTeX
 {
diff --git a/src/commentwidget.cpp b/src/commentwidget.cpp
index 3925ae4..3300ab4 100644
--- a/src/commentwidget.cpp
+++ b/src/commentwidget.cpp
@@ -17,17 +17,17 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlabel.h>
-#include <ntqmultilineedit.h>
-#include <ntqlayout.h>
-#include <ntqcheckbox.h>
+#include <tqlabel.h>
+#include <tqmultilineedit.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
 #include <kdialogbase.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 
-#include <comment.h>
-#include <element.h>
+#include "comment.h"
+#include "element.h"
 
 #include "commentwidget.h"
 
diff --git a/src/commentwidget.h b/src/commentwidget.h
index 8b9c0b9..75df8fc 100644
--- a/src/commentwidget.h
+++ b/src/commentwidget.h
@@ -20,10 +20,10 @@
 #ifndef COMMENTWIDGET_H
 #define COMMENTWIDGET_H
 
-#include <ntqwidget.h>
-#include <ntqdialog.h>
+#include <tqwidget.h>
+#include <tqdialog.h>
 
-#include <comment.h>
+#include "comment.h"
 
 class TQMultiLineEdit;
 class TQCheckBox;
diff --git a/src/documentlistview.cpp b/src/documentlistview.cpp
index ca68162..8efabb0 100644
--- a/src/documentlistview.cpp
+++ b/src/documentlistview.cpp
@@ -21,17 +21,17 @@
 #include <config.h>
 #endif
 
-#include <ntqevent.h>
-#include <ntqdragobject.h>
-#include <ntqfile.h>
-#include <ntqvaluelist.h>
-#include <ntqcursor.h>
-#include <ntqbuffer.h>
-#include <ntqlistview.h>
-#include <ntqclipboard.h>
-#include <ntqheader.h>
-#include <ntqtextstream.h>
-#include <ntqtimer.h>
+#include <tqevent.h>
+#include <tqdragobject.h>
+#include <tqfile.h>
+#include <tqvaluelist.h>
+#include <tqcursor.h>
+#include <tqbuffer.h>
+#include <tqlistview.h>
+#include <tqclipboard.h>
+#include <tqheader.h>
+#include <tqtextstream.h>
+#include <tqtimer.h>
 
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
@@ -46,24 +46,24 @@
 #include <kprogress.h>
 #include <kiconloader.h>
 
-#include <kbibtex_part.h>
-#include <documentlistviewitem.h>
-#include <file.h>
-#include <fileimporterbibutils.h>
-#include <fileimporterris.h>
-#include <fileimporterbibtex.h>
-#include <fileexporterbibtex.h>
-#include <element.h>
-#include <entry.h>
-#include <macro.h>
-#include <comment.h>
-#include <preamblewidget.h>
-#include <preamble.h>
-#include <entrywidget.h>
-#include <commentwidget.h>
-#include <macrowidget.h>
-#include <settings.h>
-#include <encoderlatex.h>
+#include "kbibtex_part.h"
+#include "documentlistviewitem.h"
+#include "file.h"
+#include "fileimporterbibutils.h"
+#include "fileimporterris.h"
+#include "fileimporterbibtex.h"
+#include "fileexporterbibtex.h"
+#include "element.h"
+#include "entry.h"
+#include "macro.h"
+#include "comment.h"
+#include "preamblewidget.h"
+#include "preamble.h"
+#include "entrywidget.h"
+#include "commentwidget.h"
+#include "macrowidget.h"
+#include "settings.h"
+#include "encoderlatex.h"
 
 #include "documentlistview.h"
 
diff --git a/src/documentlistview.h b/src/documentlistview.h
index 07fe06d..37adc02 100644
--- a/src/documentlistview.h
+++ b/src/documentlistview.h
@@ -23,9 +23,9 @@
 #include <tdelistview.h>
 #include <kxmlguifactory.h>
 
-#include <fileimporter.h>
-#include <settings.h>
-#include <file.h>
+#include "fileimporter.h"
+#include "settings.h"
+#include "file.h"
 
 class TQString;
 class KURL;
diff --git a/src/documentlistviewitem.cpp b/src/documentlistviewitem.cpp
index 2f7eeb1..eadaaeb 100644
--- a/src/documentlistviewitem.cpp
+++ b/src/documentlistviewitem.cpp
@@ -17,16 +17,16 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlistview.h>
-#include <ntqpainter.h>
-#include <ntqpen.h>
+#include <tqlistview.h>
+#include <tqpainter.h>
+#include <tqpen.h>
 
 #include <tdelocale.h>
 
 #include "documentlistviewitem.h"
 #include "entry.h"
 #include "comment.h"
-#include <preamble.h>
+#include "preamble.h"
 #include "macro.h"
 
 namespace KBibTeX
diff --git a/src/documentlistviewitem.h b/src/documentlistviewitem.h
index ce96a20..c7a13c4 100644
--- a/src/documentlistviewitem.h
+++ b/src/documentlistviewitem.h
@@ -22,7 +22,7 @@
 
 #include <tdelistview.h>
 
-#include <element.h>
+#include "element.h"
 #include "documentlistview.h"
 
 namespace KBibTeX
diff --git a/src/documentsourceview.cpp b/src/documentsourceview.cpp
index 683a735..9d2b06b 100644
--- a/src/documentsourceview.cpp
+++ b/src/documentsourceview.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqbuffer.h>
-#include <ntqlayout.h>
-#include <ntqfile.h>
+#include <tqbuffer.h>
+#include <tqlayout.h>
+#include <tqfile.h>
 
 #include <klibloader.h>
 #include <kxmlguifactory.h>
@@ -38,9 +38,9 @@
 #include <tdetexteditor/editorchooser.h>
 #include <tdetexteditor/undointerface.h>
 
-#include <fileexporterbibtex.h>
-#include <fileimporterbibtex.h>
-#include <settings.h>
+#include "fileexporterbibtex.h"
+#include "fileimporterbibtex.h"
+#include "settings.h"
 #include "documentsourceview.h"
 
 namespace KBibTeX
diff --git a/src/documentsourceview.h b/src/documentsourceview.h
index fb157de..7752092 100644
--- a/src/documentsourceview.h
+++ b/src/documentsourceview.h
@@ -20,9 +20,9 @@
 #ifndef KBIBTEXDOCUMENTSOURCEVIEW_H
 #define KBIBTEXDOCUMENTSOURCEVIEW_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
-#include <file.h>
+#include "file.h"
 
 #include <tdetexteditor/editinterface.h>
 #include <kate/view.h>
diff --git a/src/documentwidget.cpp b/src/documentwidget.cpp
index 1c0a485..e31e868 100644
--- a/src/documentwidget.cpp
+++ b/src/documentwidget.cpp
@@ -19,19 +19,19 @@
 ***************************************************************************/
 #include <cmath>
 
-#include <ntqlayout.h>
-#include <ntqfile.h>
-#include <ntqdragobject.h>
-#include <ntqregexp.h>
-#include <ntqsplitter.h>
-#include <ntqurl.h>
-#include <ntqtextedit.h>
-#include <ntqprogressdialog.h>
-#include <ntqbuffer.h>
-#include <ntqtooltip.h>
-#include <ntqapplication.h>
-#include <ntqpushbutton.h>
-#include <ntqfileinfo.h>
+#include <tqlayout.h>
+#include <tqfile.h>
+#include <tqdragobject.h>
+#include <tqregexp.h>
+#include <tqsplitter.h>
+#include <tqurl.h>
+#include <tqtextedit.h>
+#include <tqprogressdialog.h>
+#include <tqbuffer.h>
+#include <tqtooltip.h>
+#include <tqapplication.h>
+#include <tqpushbutton.h>
+#include <tqfileinfo.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
@@ -53,39 +53,39 @@
 #include <config.h>
 #endif
 
-#include <searchbar.h>
-#include <sidebar.h>
-#include <documentlistview.h>
-#include <documentlistviewitem.h>
-#include <documentsourceview.h>
-#include <macrowidget.h>
-#include <preamblewidget.h>
-#include <commentwidget.h>
-#include <entrywidget.h>
-#include <fileimporterbibtex.h>
-#include <fileimporterbibutils.h>
-#include <fileimporterris.h>
-#include <fileexporterbibtex.h>
-#include <fileexporterbibutils.h>
-#include <fileexporterris.h>
-#include <fileexporterxml.h>
-#include <fileexporterrtf.h>
-#include <fileexporterdocbook5.h>
-#include <fileexporterpdf.h>
-#include <fileexporterps.h>
-#include <fileexporterxslt.h>
-#include <fileimporterexternal.h>
-#include <fileexporterexternal.h>
-#include <xsltransform.h>
-#include <entry.h>
-#include <entryfield.h>
-#include <comment.h>
-#include <macro.h>
-#include <preamble.h>
-#include <settings.h>
-#include <webquery.h>
-#include <mergeelements.h>
-#include <idsuggestions.h>
+#include "searchbar.h"
+#include "sidebar.h"
+#include "documentlistview.h"
+#include "documentlistviewitem.h"
+#include "documentsourceview.h"
+#include "macrowidget.h"
+#include "preamblewidget.h"
+#include "commentwidget.h"
+#include "entrywidget.h"
+#include "fileimporterbibtex.h"
+#include "fileimporterbibutils.h"
+#include "fileimporterris.h"
+#include "fileexporterbibtex.h"
+#include "fileexporterbibutils.h"
+#include "fileexporterris.h"
+#include "fileexporterxml.h"
+#include "fileexporterrtf.h"
+#include "fileexporterdocbook5.h"
+#include "fileexporterpdf.h"
+#include "fileexporterps.h"
+#include "fileexporterxslt.h"
+#include "fileimporterexternal.h"
+#include "fileexporterexternal.h"
+#include "xsltransform.h"
+#include "entry.h"
+#include "entryfield.h"
+#include "comment.h"
+#include "macro.h"
+#include "preamble.h"
+#include "settings.h"
+#include "webquery.h"
+#include "mergeelements.h"
+#include "idsuggestions.h"
 
 #include "documentwidget.h"
 
diff --git a/src/documentwidget.h b/src/documentwidget.h
index 31b05ae..9256b96 100644
--- a/src/documentwidget.h
+++ b/src/documentwidget.h
@@ -20,13 +20,13 @@
 #ifndef KBIBTEXDOCUMENTWIDGET_H
 #define KBIBTEXDOCUMENTWIDGET_H
 
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 
 #include <kdirwatch.h>
 
-#include <fileimporter.h>
-#include <file.h>
-#include <settings.h>
+#include "fileimporter.h"
+#include "file.h"
+#include "settings.h"
 
 class TQIODevice;
 class TQProgressDialog;
diff --git a/src/element.cpp b/src/element.cpp
index e3e1a2e..9e813a0 100644
--- a/src/element.cpp
+++ b/src/element.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqstring.h>
+#include <tqstring.h>
 
-#include <xsltransform.h>
+#include "xsltransform.h"
 #include "element.h"
 
 namespace BibTeX
diff --git a/src/element.h b/src/element.h
index c470f0d..d079695 100644
--- a/src/element.h
+++ b/src/element.h
@@ -20,8 +20,8 @@
 #ifndef BIBTEXELEMENT_H
 #define BIBTEXELEMENT_H
 
-#include <file.h>
-#include <entryfield.h>
+#include "file.h"
+#include "entryfield.h"
 
 class TQString;
 
diff --git a/src/encoder.h b/src/encoder.h
index 06567c0..582fb05 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXENCODER_H
 #define BIBTEXENCODER_H
 
-#include <entryfield.h>
+#include "entryfield.h"
 
 class TQString;
 
diff --git a/src/encoderlatex.cpp b/src/encoderlatex.cpp
index 4dc0326..9624371 100644
--- a/src/encoderlatex.cpp
+++ b/src/encoderlatex.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqstring.h>
-#include <ntqapplication.h>
-#include <ntqregexp.h>
+#include <tqstring.h>
+#include <tqapplication.h>
+#include <tqregexp.h>
 
 #include "encoderlatex.h"
 
diff --git a/src/encoderlatex.h b/src/encoderlatex.h
index a9e4b12..4ae44af 100644
--- a/src/encoderlatex.h
+++ b/src/encoderlatex.h
@@ -20,11 +20,11 @@
 #ifndef ENCODERLATEX_H
 #define ENCODERLATEX_H
 
-#include <ntqvaluelist.h>
-#include <ntqregexp.h>
+#include <tqvaluelist.h>
+#include <tqregexp.h>
 
-#include <encoder.h>
-#include <entry.h>
+#include "encoder.h"
+#include "entry.h"
 
 class TQString;
 
diff --git a/src/encoderxml.cpp b/src/encoderxml.cpp
index 5c8d1ea..bc85fe9 100644
--- a/src/encoderxml.cpp
+++ b/src/encoderxml.cpp
@@ -17,7 +17,7 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
 #include "encoderxml.h"
 
diff --git a/src/encoderxml.h b/src/encoderxml.h
index 142c6f0..2e0ba22 100644
--- a/src/encoderxml.h
+++ b/src/encoderxml.h
@@ -20,10 +20,10 @@
 #ifndef BIBTEXENCODERXML_H
 #define BIBTEXENCODERXML_H
 
-#include <ntqptrlist.h>
-#include <ntqregexp.h>
+#include <tqptrlist.h>
+#include <tqregexp.h>
 
-#include <encoder.h>
+#include "encoder.h"
 
 class TQString;
 class TQRegExp;
diff --git a/src/entry.cpp b/src/entry.cpp
index 00be859..a20d234 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -17,14 +17,14 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqstring.h>
-#include <ntqstringlist.h>
-#include <ntqregexp.h>
-
-#include <entry.h>
-#include <file.h>
-#include <xsltransform.h>
-#include <entryfield.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+
+#include "entry.h"
+#include "file.h"
+#include "xsltransform.h"
+#include "entryfield.h"
 
 #define max(a,b) ((a)>(b)?(a):(b))
 
diff --git a/src/entry.h b/src/entry.h
index 4a6d970..15386b9 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -20,11 +20,11 @@
 #ifndef BIBTEXBIBTEXENTRY_H
 #define BIBTEXBIBTEXENTRY_H
 
-#include <ntqvaluelist.h>
-#include <ntqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
 
-#include <element.h>
-#include <entryfield.h>
+#include "element.h"
+#include "entryfield.h"
 
 class TQString;
 class TQStringList;
diff --git a/src/entryfield.h b/src/entryfield.h
index 684045e..d12461c 100644
--- a/src/entryfield.h
+++ b/src/entryfield.h
@@ -20,9 +20,9 @@
 #ifndef BIBTEXBIBTEXENTRYFIELD_H
 #define BIBTEXBIBTEXENTRYFIELD_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
-#include <value.h>
+#include "value.h"
 
 namespace BibTeX
 {
diff --git a/src/entrywidget.cpp b/src/entrywidget.cpp
index 4d68f3e..c1af4b3 100644
--- a/src/entrywidget.cpp
+++ b/src/entrywidget.cpp
@@ -17,19 +17,19 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqcheckbox.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-#include <ntqlistview.h>
-#include <ntqlabel.h>
-#include <ntqregexp.h>
-#include <ntqpushbutton.h>
-#include <ntqpopupmenu.h>
-#include <ntqtabwidget.h>
-#include <ntqcombobox.h>
-#include <ntqtimer.h>
-#include <ntqlineedit.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqlistview.h>
+#include <tqlabel.h>
+#include <tqregexp.h>
+#include <tqpushbutton.h>
+#include <tqpopupmenu.h>
+#include <tqtabwidget.h>
+#include <tqcombobox.h>
+#include <tqtimer.h>
+#include <tqlineedit.h>
 
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -39,23 +39,23 @@
 #include <tdeconfig.h>
 #include <twin.h>
 
-#include <entry.h>
-#include <entryfield.h>
-#include <file.h>
-#include <settings.h>
-#include <entrywidgettab.h>
-#include <entrywidgettitle.h>
-#include <entrywidgetauthor.h>
-#include <entrywidgetkeyword.h>
-#include <entrywidgetpublication.h>
-#include <entrywidgetmisc.h>
-#include <entrywidgetexternal.h>
-#include <entrywidgetuserdefined.h>
-#include <entrywidgetother.h>
-#include <entrywidgetwarningsitem.h>
-#include <fieldlistview.h>
-#include <idsuggestions.h>
-#include <webqueryarxiv.h>
+#include "entry.h"
+#include "entryfield.h"
+#include "file.h"
+#include "settings.h"
+#include "entrywidgettab.h"
+#include "entrywidgettitle.h"
+#include "entrywidgetauthor.h"
+#include "entrywidgetkeyword.h"
+#include "entrywidgetpublication.h"
+#include "entrywidgetmisc.h"
+#include "entrywidgetexternal.h"
+#include "entrywidgetuserdefined.h"
+#include "entrywidgetother.h"
+#include "entrywidgetwarningsitem.h"
+#include "fieldlistview.h"
+#include "idsuggestions.h"
+#include "webqueryarxiv.h"
 #include "entrywidget.h"
 
 namespace KBibTeX
diff --git a/src/entrywidget.h b/src/entrywidget.h
index d1bdb02..29da6e7 100644
--- a/src/entrywidget.h
+++ b/src/entrywidget.h
@@ -20,16 +20,16 @@
 #ifndef KBIBTEXENTRYWIDGET_H
 #define KBIBTEXENTRYWIDGET_H
 
-#include <ntqwidget.h>
-#include <ntqdialog.h>
-#include <ntqvaluelist.h>
-#include <ntqmap.h>
+#include <tqwidget.h>
+#include <tqdialog.h>
+#include <tqvaluelist.h>
+#include <tqmap.h>
 
 #include <kdialogbase.h>
 
-#include <entry.h>
-#include <entrywidgetsource.h>
-#include <webquery.h>
+#include "entry.h"
+#include "entrywidgetsource.h"
+#include "webquery.h"
 
 class TQComboBox;
 class TQLineEdit;
diff --git a/src/entrywidgetauthor.cpp b/src/entrywidgetauthor.cpp
index e31bafb..1b17a74 100644
--- a/src/entrywidgetauthor.cpp
+++ b/src/entrywidgetauthor.cpp
@@ -17,14 +17,14 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 
 #include <kdialog.h>
 #include <tdelocale.h>
 
-#include <fieldlistview.h>
-#include <entrywidgetwarningsitem.h>
+#include "fieldlistview.h"
+#include "entrywidgetwarningsitem.h"
 #include "entrywidgetauthor.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetauthor.h b/src/entrywidgetauthor.h
index 60f89f8..c05d31f 100644
--- a/src/entrywidgetauthor.h
+++ b/src/entrywidgetauthor.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETAUTHOR_H
 #define KBIBTEXENTRYWIDGETAUTHOR_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 class TQWidget;
 class TQScrollView;
diff --git a/src/entrywidgetexternal.cpp b/src/entrywidgetexternal.cpp
index 8945ad0..3f5230a 100644
--- a/src/entrywidgetexternal.cpp
+++ b/src/entrywidgetexternal.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
 
 #include <kpushbutton.h>
 #include <kdialog.h>
@@ -30,8 +30,8 @@
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 
-#include <fieldlineedit.h>
-#include <settings.h>
+#include "fieldlineedit.h"
+#include "settings.h"
 #include "entrywidgetexternal.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetexternal.h b/src/entrywidgetexternal.h
index 525b9b7..da764c6 100644
--- a/src/entrywidgetexternal.h
+++ b/src/entrywidgetexternal.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETEXTERNAL_H
 #define KBIBTEXENTRYWIDGETEXTERNAL_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 class KPushButton;
 class KURL;
diff --git a/src/entrywidgetkeyword.cpp b/src/entrywidgetkeyword.cpp
index 91e9539..8a40c71 100644
--- a/src/entrywidgetkeyword.cpp
+++ b/src/entrywidgetkeyword.cpp
@@ -17,12 +17,12 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqregexp.h>
-#include <ntqpushbutton.h>
-#include <ntqtooltip.h>
-#include <ntqtimer.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqregexp.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
+#include <tqtimer.h>
+#include <tqlabel.h>
 
 #include <kdialog.h>
 #include <tdelocale.h>
@@ -33,7 +33,7 @@
 #include <kguiitem.h>
 #include <kdebug.h>
 
-#include <settings.h>
+#include "settings.h"
 #include "entrywidgetkeyword.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetkeyword.h b/src/entrywidgetkeyword.h
index 3de2838..91e3f77 100644
--- a/src/entrywidgetkeyword.h
+++ b/src/entrywidgetkeyword.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETKEYWORD_H
 #define KBIBTEXENTRYWIDGETKEYWORD_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 class TQPushButton;
 class TDEListView;
diff --git a/src/entrywidgetmisc.cpp b/src/entrywidgetmisc.cpp
index fe1b757..fce1563 100644
--- a/src/entrywidgetmisc.cpp
+++ b/src/entrywidgetmisc.cpp
@@ -17,15 +17,15 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 
 #include <kdialog.h>
 #include <tdelocale.h>
 
-#include <fieldlineedit.h>
-#include <value.h>
-#include <entryfield.h>
+#include "fieldlineedit.h"
+#include "value.h"
+#include "entryfield.h"
 #include "entrywidgetmisc.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetmisc.h b/src/entrywidgetmisc.h
index 5cef564..f06bc82 100644
--- a/src/entrywidgetmisc.h
+++ b/src/entrywidgetmisc.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETMISC_H
 #define KBIBTEXENTRYWIDGETMISC_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 namespace KBibTeX
 {
diff --git a/src/entrywidgetother.cpp b/src/entrywidgetother.cpp
index 85b2038..6fdc23b 100644
--- a/src/entrywidgetother.cpp
+++ b/src/entrywidgetother.cpp
@@ -17,11 +17,11 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqstringlist.h>
-#include <ntqlayout.h>
-#include <ntqtooltip.h>
-#include <ntqlabel.h>
-#include <ntqwhatsthis.h>
+#include <tqstringlist.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqlabel.h>
+#include <tqwhatsthis.h>
 
 #include <kdialog.h>
 #include <tdeapplication.h>
@@ -32,8 +32,8 @@
 #include <kpushbutton.h>
 #include <klineedit.h>
 
-#include <fieldlineedit.h>
-#include <settings.h>
+#include "fieldlineedit.h"
+#include "settings.h"
 #include "entrywidgetother.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetother.h b/src/entrywidgetother.h
index 39f42b9..7829ae8 100644
--- a/src/entrywidgetother.h
+++ b/src/entrywidgetother.h
@@ -22,7 +22,7 @@
 
 #include <kurl.h>
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 class TQPushButton;
 class TDEListView;
diff --git a/src/entrywidgetpublication.cpp b/src/entrywidgetpublication.cpp
index efeb8eb..d68dcde 100644
--- a/src/entrywidgetpublication.cpp
+++ b/src/entrywidgetpublication.cpp
@@ -17,21 +17,21 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqregexp.h>
-#include <ntqpushbutton.h>
-#include <ntqpopupmenu.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqregexp.h>
+#include <tqpushbutton.h>
+#include <tqpopupmenu.h>
+#include <tqtooltip.h>
 
 #include <kurl.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <tdelocale.h>
 
-#include <settings.h>
-#include <fieldlineedit.h>
-#include <entrywidgetwarningsitem.h>
+#include "settings.h"
+#include "fieldlineedit.h"
+#include "entrywidgetwarningsitem.h"
 #include "entrywidgetpublication.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetpublication.h b/src/entrywidgetpublication.h
index dedf0cb..9d5b2b7 100644
--- a/src/entrywidgetpublication.h
+++ b/src/entrywidgetpublication.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETPUBLICATION_H
 #define KBIBTEXENTRYWIDGETPUBLICATION_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 class TQPushButton;
 
diff --git a/src/entrywidgetsource.cpp b/src/entrywidgetsource.cpp
index 8c811fc..6f543e7 100644
--- a/src/entrywidgetsource.cpp
+++ b/src/entrywidgetsource.cpp
@@ -17,19 +17,19 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqtextedit.h>
-#include <ntqbuffer.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
+#include <tqbuffer.h>
 
 #include <kdialog.h>
 #include <kpushbutton.h>
 #include <tdelocale.h>
 #include <tdeglobalsettings.h>
 
-#include <fileexporterbibtex.h>
-#include <fileimporterbibtex.h>
-#include <entry.h>
-#include <settings.h>
+#include "fileexporterbibtex.h"
+#include "fileimporterbibtex.h"
+#include "entry.h"
+#include "settings.h"
 #include "entrywidgetsource.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetsource.h b/src/entrywidgetsource.h
index 48a35bb..aff579f 100644
--- a/src/entrywidgetsource.h
+++ b/src/entrywidgetsource.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETSOURCE_H
 #define KBIBTEXENTRYWIDGETSOURCE_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 class TQTextEdit;
 
diff --git a/src/entrywidgettab.cpp b/src/entrywidgettab.cpp
index 1838380..97014a5 100644
--- a/src/entrywidgettab.cpp
+++ b/src/entrywidgettab.cpp
@@ -19,9 +19,9 @@
 ***************************************************************************/
 #include <tdelocale.h>
 
-#include <entry.h>
-#include <entrywidgetwarningsitem.h>
-#include <fieldlineedit.h>
+#include "entry.h"
+#include "entrywidgetwarningsitem.h"
+#include "fieldlineedit.h"
 #include "entrywidgettab.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgettab.h b/src/entrywidgettab.h
index 1eace4f..e8c24f6 100644
--- a/src/entrywidgettab.h
+++ b/src/entrywidgettab.h
@@ -20,10 +20,10 @@
 #ifndef KBIBTEXENTRYWIDGETTAB_H
 #define KBIBTEXENTRYWIDGETTAB_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
-#include <entry.h>
-#include <file.h>
+#include "entry.h"
+#include "file.h"
 
 class TQListView;
 
diff --git a/src/entrywidgettitle.cpp b/src/entrywidgettitle.cpp
index 85bc82f..da7d669 100644
--- a/src/entrywidgettitle.cpp
+++ b/src/entrywidgettitle.cpp
@@ -17,14 +17,14 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 #include <kdialog.h>
 #include <tdelocale.h>
 
-#include <fieldlineedit.h>
-#include <value.h>
-#include <entryfield.h>
+#include "fieldlineedit.h"
+#include "value.h"
+#include "entryfield.h"
 #include "entrywidgettitle.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgettitle.h b/src/entrywidgettitle.h
index a26e2b1..c233556 100644
--- a/src/entrywidgettitle.h
+++ b/src/entrywidgettitle.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETTITLE_H
 #define KBIBTEXENTRYWIDGETTITLE_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 namespace KBibTeX
 {
diff --git a/src/entrywidgetuserdefined.cpp b/src/entrywidgetuserdefined.cpp
index 87d020f..e02d067 100644
--- a/src/entrywidgetuserdefined.cpp
+++ b/src/entrywidgetuserdefined.cpp
@@ -17,15 +17,15 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include <settings.h>
+#include "settings.h"
 #include "entrywidgetuserdefined.h"
 
 namespace KBibTeX
diff --git a/src/entrywidgetuserdefined.h b/src/entrywidgetuserdefined.h
index e7855d6..6affcf8 100644
--- a/src/entrywidgetuserdefined.h
+++ b/src/entrywidgetuserdefined.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETUSERDEFINED_H
 #define KBIBTEXENTRYWIDGETUSERDEFINED_H
 
-#include <entrywidgettab.h>
+#include "entrywidgettab.h"
 
 namespace KBibTeX
 {
diff --git a/src/entrywidgetwarningsitem.h b/src/entrywidgetwarningsitem.h
index f65beec..cbb9d5c 100644
--- a/src/entrywidgetwarningsitem.h
+++ b/src/entrywidgetwarningsitem.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXENTRYWIDGETWARNINGSITEM_H
 #define KBIBTEXENTRYWIDGETWARNINGSITEM_H
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 class TQString;
 
diff --git a/src/fieldlineedit.cpp b/src/fieldlineedit.cpp
index 02d39f2..910ea12 100644
--- a/src/fieldlineedit.cpp
+++ b/src/fieldlineedit.cpp
@@ -17,22 +17,22 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqpushbutton.h>
-#include <ntqlayout.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-#include <ntqtextedit.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqtextedit.h>
 
 #include <kdialog.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 
-#include <element.h>
-#include <entry.h>
-#include <settings.h>
-#include <value.h>
-#include <valuewidget.h>
+#include "element.h"
+#include "entry.h"
+#include "settings.h"
+#include "value.h"
+#include "valuewidget.h"
 #include "fieldlineedit.h"
 
 namespace KBibTeX
diff --git a/src/fieldlineedit.h b/src/fieldlineedit.h
index 0d6dd6f..f8cd7ff 100644
--- a/src/fieldlineedit.h
+++ b/src/fieldlineedit.h
@@ -20,10 +20,10 @@
 #ifndef KBIBTEXFIELDLINEEDIT_H
 #define KBIBTEXFIELDLINEEDIT_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
-#include <entryfield.h>
-#include <value.h>
+#include "entryfield.h"
+#include "value.h"
 
 class KLineEdit;
 class TQTextEdit;
diff --git a/src/fieldlistview.cpp b/src/fieldlistview.cpp
index 25b75e8..8b0931b 100644
--- a/src/fieldlistview.cpp
+++ b/src/fieldlistview.cpp
@@ -17,15 +17,15 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqstring.h>
-#include <ntqregexp.h>
-#include <ntqlayout.h>
-#include <ntqheader.h>
-#include <ntqtimer.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
+#include <tqstring.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
+#include <tqheader.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
 
 #include <tdelistview.h>
 #include <klineedit.h>
@@ -34,9 +34,9 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include <value.h>
-#include <valuewidget.h>
-#include <settings.h>
+#include "value.h"
+#include "valuewidget.h"
+#include "settings.h"
 #include "fieldlistview.h"
 
 namespace KBibTeX
diff --git a/src/fieldlistview.h b/src/fieldlistview.h
index 7ec1fd4..e6e2e58 100644
--- a/src/fieldlistview.h
+++ b/src/fieldlistview.h
@@ -20,10 +20,10 @@
 #ifndef KBIBTEXFIELDLISTVIEW_H
 #define KBIBTEXFIELDLISTVIEW_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
-#include <value.h>
-#include <entryfield.h>
+#include "value.h"
+#include "entryfield.h"
 
 class TQString;
 class TDEListView;
diff --git a/src/file.cpp b/src/file.cpp
index c02ae79..a85510c 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -17,19 +17,19 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqtextstream.h>
-#include <ntqiodevice.h>
-#include <ntqstringlist.h>
-#include <ntqregexp.h>
-
-#include <settings.h>
-#include <file.h>
-#include <entry.h>
-#include <element.h>
-#include <macro.h>
-#include <comment.h>
-#include <fileexporter.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqiodevice.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+
+#include "settings.h"
+#include "file.h"
+#include "entry.h"
+#include "element.h"
+#include "macro.h"
+#include "comment.h"
+#include "fileexporter.h"
 
 namespace BibTeX
 {
diff --git a/src/file.h b/src/file.h
index 37c942b..766b3ac 100644
--- a/src/file.h
+++ b/src/file.h
@@ -20,10 +20,10 @@
 #ifndef BIBTEXFILE_H
 #define BIBTEXFILE_H
 
-#include <ntqobject.h>
-#include <ntqvaluelist.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
 
-#include <entryfield.h>
+#include "entryfield.h"
 
 class TQDir;
 class TQString;
diff --git a/src/fileexporter.h b/src/fileexporter.h
index 834310f..3457878 100644
--- a/src/fileexporter.h
+++ b/src/fileexporter.h
@@ -20,10 +20,10 @@
 #ifndef BIBTEXFILEEXPORTER_H
 #define BIBTEXFILEEXPORTER_H
 
-#include <ntqobject.h>
-#include <ntqmutex.h>
+#include <tqobject.h>
+#include <tqmutex.h>
 
-#include <file.h>
+#include "file.h"
 
 class TQIODevice;
 
diff --git a/src/fileexporterbibtex.cpp b/src/fileexporterbibtex.cpp
index 03ed618..598f3bf 100644
--- a/src/fileexporterbibtex.cpp
+++ b/src/fileexporterbibtex.cpp
@@ -17,14 +17,14 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <file.h>
-#include <element.h>
-#include <entry.h>
-#include <macro.h>
-#include <preamble.h>
-#include <value.h>
-#include <comment.h>
-#include <encoderlatex.h>
+#include "file.h"
+#include "element.h"
+#include "entry.h"
+#include "macro.h"
+#include "preamble.h"
+#include "value.h"
+#include "comment.h"
+#include "encoderlatex.h"
 
 #include "fileexporterbibtex.h"
 
diff --git a/src/fileexporterbibtex.h b/src/fileexporterbibtex.h
index b9d806e..6f838b8 100644
--- a/src/fileexporterbibtex.h
+++ b/src/fileexporterbibtex.h
@@ -22,9 +22,9 @@
 
 #include <iconv.h>
 
-#include <element.h>
-#include <entryfield.h>
-#include <fileexporter.h>
+#include "element.h"
+#include "entryfield.h"
+#include "fileexporter.h"
 
 class TQChar;
 
diff --git a/src/fileexporterbibutils.cpp b/src/fileexporterbibutils.cpp
index c9bb51a..68af9c7 100644
--- a/src/fileexporterbibutils.cpp
+++ b/src/fileexporterbibutils.cpp
@@ -17,15 +17,15 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqdir.h>
-#include <ntqstringlist.h>
-#include <ntqapplication.h>
-#include <ntqbuffer.h>
-#include <ntqprocess.h>
-#include <ntqwaitcondition.h>
-
-#include <fileexporterbibtex.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqstringlist.h>
+#include <tqapplication.h>
+#include <tqbuffer.h>
+#include <tqprocess.h>
+#include <tqwaitcondition.h>
+
+#include "fileexporterbibtex.h"
 #include "fileexporterbibutils.h"
 
 namespace BibTeX
diff --git a/src/fileexporterbibutils.h b/src/fileexporterbibutils.h
index fafefd6..a691747 100644
--- a/src/fileexporterbibutils.h
+++ b/src/fileexporterbibutils.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERBIBUTILS_H
 #define BIBTEXFILEEXPORTERBIBUTILS_H
 
-#include <fileexporter.h>
+#include "fileexporter.h"
 
 class TQProcess;
 class TQBuffer;
diff --git a/src/fileexporterdocbook5.cpp b/src/fileexporterdocbook5.cpp
index b776391..25b568e 100644
--- a/src/fileexporterdocbook5.cpp
+++ b/src/fileexporterdocbook5.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
 
-#include <file.h>
-#include <fileexporterbibtex.h>
+#include "file.h"
+#include "fileexporterbibtex.h"
 #include "fileexporterdocbook5.h"
 
 namespace BibTeX
diff --git a/src/fileexporterdocbook5.h b/src/fileexporterdocbook5.h
index 88742b5..34d0625 100644
--- a/src/fileexporterdocbook5.h
+++ b/src/fileexporterdocbook5.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERDOCBOOK5_H
 #define BIBTEXFILEEXPORTERDOCBOOK5_H
 
-#include <fileexportertoolchain.h>
+#include "fileexportertoolchain.h"
 
 namespace BibTeX
 {
diff --git a/src/fileexporterexternal.cpp b/src/fileexporterexternal.cpp
index 38e8e68..fc02819 100644
--- a/src/fileexporterexternal.cpp
+++ b/src/fileexporterexternal.cpp
@@ -17,13 +17,13 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqprocess.h>
-#include <ntqwaitcondition.h>
-#include <ntqapplication.h>
-#include <ntqbuffer.h>
+#include <tqprocess.h>
+#include <tqwaitcondition.h>
+#include <tqapplication.h>
+#include <tqbuffer.h>
 
-#include <fileexporterbibtex.h>
-#include <settings.h>
+#include "fileexporterbibtex.h"
+#include "settings.h"
 #include "fileexporterexternal.h"
 
 namespace BibTeX
diff --git a/src/fileexporterexternal.h b/src/fileexporterexternal.h
index 50a28fc..1942671 100644
--- a/src/fileexporterexternal.h
+++ b/src/fileexporterexternal.h
@@ -20,8 +20,8 @@
 #ifndef BIBTEXFILEEXPORTEREXTERNAL_H
 #define BIBTEXFILEEXPORTEREXTERNAL_H
 
-#include <fileexporter.h>
-#include <settings.h>
+#include "fileexporter.h"
+#include "settings.h"
 
 class TQWaitCondition;
 class TQProcess;
diff --git a/src/fileexporterpdf.cpp b/src/fileexporterpdf.cpp
index 9fff4b3..8f78fe9 100644
--- a/src/fileexporterpdf.cpp
+++ b/src/fileexporterpdf.cpp
@@ -17,14 +17,14 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqstringlist.h>
-#include <ntqurl.h>
-
-#include <settings.h>
-#include <element.h>
-#include <entry.h>
-#include <fileexporterbibtex.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqurl.h>
+
+#include "settings.h"
+#include "element.h"
+#include "entry.h"
+#include "fileexporterbibtex.h"
 #include "fileexporterpdf.h"
 
 namespace BibTeX
diff --git a/src/fileexporterpdf.h b/src/fileexporterpdf.h
index 0d67350..54068f3 100644
--- a/src/fileexporterpdf.h
+++ b/src/fileexporterpdf.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERPDF_H
 #define BIBTEXFILEEXPORTERPDF_H
 
-#include <fileexportertoolchain.h>
+#include "fileexportertoolchain.h"
 
 namespace BibTeX
 {
diff --git a/src/fileexporterps.cpp b/src/fileexporterps.cpp
index 1da2601..b808288 100644
--- a/src/fileexporterps.cpp
+++ b/src/fileexporterps.cpp
@@ -17,12 +17,12 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
 
-#include <settings.h>
-#include <element.h>
-#include <fileexporterbibtex.h>
+#include "settings.h"
+#include "element.h"
+#include "fileexporterbibtex.h"
 #include "fileexporterps.h"
 
 namespace BibTeX
diff --git a/src/fileexporterps.h b/src/fileexporterps.h
index 0393e7e..511bf45 100644
--- a/src/fileexporterps.h
+++ b/src/fileexporterps.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERPS_H
 #define BIBTEXFILEEXPORTERPS_H
 
-#include <fileexportertoolchain.h>
+#include "fileexportertoolchain.h"
 
 class TQStringList;
 
diff --git a/src/fileexporterris.cpp b/src/fileexporterris.cpp
index 88ff33c..21f92e6 100644
--- a/src/fileexporterris.cpp
+++ b/src/fileexporterris.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
-#include <entry.h>
+#include "entry.h"
 
 #include "fileexporterris.h"
 
diff --git a/src/fileexporterris.h b/src/fileexporterris.h
index 0063c21..a1c7977 100644
--- a/src/fileexporterris.h
+++ b/src/fileexporterris.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERRIS_H
 #define BIBTEXFILEEXPORTERRIS_H
 
-#include <fileexporter.h>
+#include "fileexporter.h"
 
 namespace BibTeX
 {
diff --git a/src/fileexporterrtf.cpp b/src/fileexporterrtf.cpp
index 77b541a..a1d0423 100644
--- a/src/fileexporterrtf.cpp
+++ b/src/fileexporterrtf.cpp
@@ -17,12 +17,12 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
 
-#include <settings.h>
-#include <element.h>
-#include <fileexporterbibtex.h>
+#include "settings.h"
+#include "element.h"
+#include "fileexporterbibtex.h"
 #include "fileexporterrtf.h"
 
 namespace BibTeX
diff --git a/src/fileexporterrtf.h b/src/fileexporterrtf.h
index 69bf098..9f07559 100644
--- a/src/fileexporterrtf.h
+++ b/src/fileexporterrtf.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERRTF_H
 #define BIBTEXFILEEXPORTERRTF_H
 
-#include <fileexportertoolchain.h>
+#include "fileexportertoolchain.h"
 
 namespace BibTeX
 {
diff --git a/src/fileexportertoolchain.cpp b/src/fileexportertoolchain.cpp
index 0883e60..6e96208 100644
--- a/src/fileexportertoolchain.cpp
+++ b/src/fileexportertoolchain.cpp
@@ -18,10 +18,10 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#include <ntqprocess.h>
-#include <ntqwaitcondition.h>
-#include <ntqapplication.h>
-#include <ntqstringlist.h>
+#include <tqprocess.h>
+#include <tqwaitcondition.h>
+#include <tqapplication.h>
+#include <tqstringlist.h>
 
 #include "fileexportertoolchain.h"
 
diff --git a/src/fileexportertoolchain.h b/src/fileexportertoolchain.h
index 7ea4cfb..16be8eb 100644
--- a/src/fileexportertoolchain.h
+++ b/src/fileexportertoolchain.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERTOOLCHAIN_H
 #define BIBTEXFILEEXPORTERTOOLCHAIN_H
 
-#include <fileexporter.h>
+#include "fileexporter.h"
 
 class TQString;
 class TQWaitCondition;
diff --git a/src/fileexporterxml.cpp b/src/fileexporterxml.cpp
index ff2814e..bbacd11 100644
--- a/src/fileexporterxml.cpp
+++ b/src/fileexporterxml.cpp
@@ -17,15 +17,15 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqregexp.h>
-#include <ntqstringlist.h>
-
-#include <file.h>
-#include <element.h>
-#include <entry.h>
-#include <encoderxml.h>
-#include <macro.h>
-#include <comment.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
+
+#include "file.h"
+#include "element.h"
+#include "entry.h"
+#include "encoderxml.h"
+#include "macro.h"
+#include "comment.h"
 #include "fileexporterxml.h"
 
 namespace BibTeX
diff --git a/src/fileexporterxml.h b/src/fileexporterxml.h
index 88f64f3..8a2e4bc 100644
--- a/src/fileexporterxml.h
+++ b/src/fileexporterxml.h
@@ -20,9 +20,9 @@
 #ifndef BIBTEXFILEEXPORTERXML_H
 #define BIBTEXFILEEXPORTERXML_H
 
-#include <element.h>
-#include <fileexporter.h>
-#include <value.h>
+#include "element.h"
+#include "fileexporter.h"
+#include "value.h"
 
 namespace BibTeX
 {
diff --git a/src/fileexporterxslt.cpp b/src/fileexporterxslt.cpp
index 14991e6..0474de3 100644
--- a/src/fileexporterxslt.cpp
+++ b/src/fileexporterxslt.cpp
@@ -17,10 +17,10 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqbuffer.h>
+#include <tqbuffer.h>
 
-#include <fileexporterxml.h>
-#include <xsltransform.h>
+#include "fileexporterxml.h"
+#include "xsltransform.h"
 
 #include "fileexporterxslt.h"
 
diff --git a/src/fileexporterxslt.h b/src/fileexporterxslt.h
index a41c8f9..23d2a64 100644
--- a/src/fileexporterxslt.h
+++ b/src/fileexporterxslt.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXFILEEXPORTERXSLT_H
 #define BIBTEXFILEEXPORTERXSLT_H
 
-#include <fileexporter.h>
+#include "fileexporter.h"
 
 namespace BibTeX
 {
diff --git a/src/fileimporter.cpp b/src/fileimporter.cpp
index 2633d35..8ca416c 100644
--- a/src/fileimporter.cpp
+++ b/src/fileimporter.cpp
@@ -17,7 +17,7 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqbuffer.h>
+#include <tqbuffer.h>
 
 #include "fileimporter.h"
 
diff --git a/src/fileimporter.h b/src/fileimporter.h
index d99ade7..e18425e 100644
--- a/src/fileimporter.h
+++ b/src/fileimporter.h
@@ -20,8 +20,8 @@
 #ifndef BIBTEXFILEIMPORTER_H
 #define BIBTEXFILEIMPORTER_H
 
-#include <ntqobject.h>
-#include <ntqmutex.h>
+#include <tqobject.h>
+#include <tqmutex.h>
 
 class TQIODevice;
 
diff --git a/src/fileimporterbibtex.cpp b/src/fileimporterbibtex.cpp
index f1d3c2e..3fc98fa 100644
--- a/src/fileimporterbibtex.cpp
+++ b/src/fileimporterbibtex.cpp
@@ -17,18 +17,18 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqiodevice.h>
-#include <ntqregexp.h>
-#include <ntqapplication.h>
-
-#include <file.h>
-#include <comment.h>
-#include <macro.h>
-#include <preamble.h>
-#include <entry.h>
-#include <element.h>
-#include <encoderlatex.h>
-#include <value.h>
+#include <tqiodevice.h>
+#include <tqregexp.h>
+#include <tqapplication.h>
+
+#include "file.h"
+#include "comment.h"
+#include "macro.h"
+#include "preamble.h"
+#include "entry.h"
+#include "element.h"
+#include "encoderlatex.h"
+#include "value.h"
 
 #include "fileimporterbibtex.h"
 
diff --git a/src/fileimporterbibtex.h b/src/fileimporterbibtex.h
index a1dd89f..a110734 100644
--- a/src/fileimporterbibtex.h
+++ b/src/fileimporterbibtex.h
@@ -22,8 +22,8 @@
 
 #include <iconv.h>
 
-#include <fileimporter.h>
-#include <entryfield.h>
+#include "fileimporter.h"
+#include "entryfield.h"
 
 namespace BibTeX
 {
diff --git a/src/fileimporterbibutils.cpp b/src/fileimporterbibutils.cpp
index 52195b3..169aa73 100644
--- a/src/fileimporterbibutils.cpp
+++ b/src/fileimporterbibutils.cpp
@@ -19,16 +19,16 @@
  ***************************************************************************/
 #include <stdio.h>
 
-#include <ntqfile.h>
-#include <ntqdir.h>
-#include <ntqprocess.h>
-#include <ntqstringlist.h>
-#include <ntqbuffer.h>
-#include <ntqwaitcondition.h>
-#include <ntqapplication.h>
-
-#include <file.h>
-#include <encoderlatex.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqprocess.h>
+#include <tqstringlist.h>
+#include <tqbuffer.h>
+#include <tqwaitcondition.h>
+#include <tqapplication.h>
+
+#include "file.h"
+#include "encoderlatex.h"
 #include "fileimporterbibutils.h"
 
 namespace BibTeX
diff --git a/src/fileimporterbibutils.h b/src/fileimporterbibutils.h
index 11d06e7..2fc46d1 100644
--- a/src/fileimporterbibutils.h
+++ b/src/fileimporterbibutils.h
@@ -20,9 +20,9 @@
 #ifndef BIBTEXFILEIMPORTBIBUTILS_H
 #define BIBTEXFILEIMPORTBIBUTILS_H
 
-#include <file.h>
-#include <fileimporter.h>
-#include <fileimporterbibtex.h>
+#include "file.h"
+#include "fileimporter.h"
+#include "fileimporterbibtex.h"
 
 class TQBuffer;
 
diff --git a/src/fileimporterexternal.cpp b/src/fileimporterexternal.cpp
index 814f81d..d962d0a 100644
--- a/src/fileimporterexternal.cpp
+++ b/src/fileimporterexternal.cpp
@@ -17,12 +17,12 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqprocess.h>
-#include <ntqwaitcondition.h>
-#include <ntqapplication.h>
-#include <ntqbuffer.h>
+#include <tqprocess.h>
+#include <tqwaitcondition.h>
+#include <tqapplication.h>
+#include <tqbuffer.h>
 
-#include <fileimporterbibtex.h>
+#include "fileimporterbibtex.h"
 #include "fileimporterexternal.h"
 
 namespace BibTeX
diff --git a/src/fileimporterexternal.h b/src/fileimporterexternal.h
index e9de4a5..d91f5b6 100644
--- a/src/fileimporterexternal.h
+++ b/src/fileimporterexternal.h
@@ -20,9 +20,9 @@
 #ifndef BIBTEXFILEIMPORTEREXTERNAL_H
 #define BIBTEXFILEIMPORTEREXTERNAL_H
 
-#include <fileimporter.h>
-#include <file.h>
-#include <settings.h>
+#include "fileimporter.h"
+#include "file.h"
+#include "settings.h"
 
 class TQWaitCondition;
 class TQProcess;
diff --git a/src/fileimporterris.cpp b/src/fileimporterris.cpp
index 2970095..2a9055e 100644
--- a/src/fileimporterris.cpp
+++ b/src/fileimporterris.cpp
@@ -17,11 +17,11 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqapplication.h>
-#include <ntqtextstream.h>
-#include <ntqregexp.h>
+#include <tqapplication.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
 
-#include <entry.h>
+#include "entry.h"
 
 #include "fileimporterris.h"
 
diff --git a/src/fileimporterris.h b/src/fileimporterris.h
index ba204f1..7a78685 100644
--- a/src/fileimporterris.h
+++ b/src/fileimporterris.h
@@ -20,8 +20,8 @@
 #ifndef BIBTEXFILEIMPORTERRIS_H
 #define BIBTEXFILEIMPORTERRIS_H
 
-#include <fileimporter.h>
-#include <entry.h>
+#include "fileimporter.h"
+#include "entry.h"
 
 class TQTextStream;
 
diff --git a/src/findduplicates.cpp b/src/findduplicates.cpp
index 89a7bc1..00e7240 100644
--- a/src/findduplicates.cpp
+++ b/src/findduplicates.cpp
@@ -19,21 +19,21 @@
  ***************************************************************************/
 #include <math.h>
 
-#include <ntqstring.h>
-#include <ntqstringlist.h>
-#include <ntqregexp.h>
-#include <ntqapplication.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+#include <tqapplication.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kprogress.h>
 
-#include <element.h>
-#include <entry.h>
-#include <file.h>
-#include <preamble.h>
-#include <macro.h>
+#include "element.h"
+#include "entry.h"
+#include "file.h"
+#include "preamble.h"
+#include "macro.h"
 #include "findduplicates.h"
 
 #define max(a,b) ((a)>(b)?(a):(b))
diff --git a/src/findduplicates.h b/src/findduplicates.h
index c11dcf3..27228d3 100644
--- a/src/findduplicates.h
+++ b/src/findduplicates.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXFINDDUPLICATES_H
 #define KBIBTEXFINDDUPLICATES_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 
 class KProgressDialog;
 class TQWidget;
diff --git a/src/idsuggestions.cpp b/src/idsuggestions.cpp
index b0d35a4..8e38c9f 100644
--- a/src/idsuggestions.cpp
+++ b/src/idsuggestions.cpp
@@ -17,14 +17,14 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
 #include <tdelocale.h>
 
-#include <encoderlatex.h>
-#include <file.h>
-#include <settings.h>
-#include <entry.h>
+#include "encoderlatex.h"
+#include "file.h"
+#include "settings.h"
+#include "entry.h"
 #include "idsuggestions.h"
 
 namespace KBibTeX
diff --git a/src/idsuggestions.h b/src/idsuggestions.h
index d4d110f..6cc5cf6 100644
--- a/src/idsuggestions.h
+++ b/src/idsuggestions.h
@@ -20,10 +20,10 @@
 #ifndef KBIBTEXIDSUGGESTIONS_H
 #define KBIBTEXIDSUGGESTIONS_H
 
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
-#include <file.h>
-#include <entry.h>
+#include "file.h"
+#include "entry.h"
 
 namespace KBibTeX
 {
diff --git a/src/idsuggestionswidget.cpp b/src/idsuggestionswidget.cpp
index e42dc54..ee7f123 100644
--- a/src/idsuggestionswidget.cpp
+++ b/src/idsuggestionswidget.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqspinbox.h>
-#include <ntqlabel.h>
-#include <ntqcheckbox.h>
-#include <ntqobjectlist.h>
-#include <ntqscrollview.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqobjectlist.h>
+#include <tqscrollview.h>
 
 #include <tdeglobalsettings.h>
 #include <klineedit.h>
@@ -33,9 +33,9 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include <idsuggestions.h>
-#include <fileimporter.h>
-#include <fileimporterbibtex.h>
+#include "idsuggestions.h"
+#include "fileimporter.h"
+#include "fileimporterbibtex.h"
 #include "idsuggestionswidget.h"
 
 #define min(a,b)  ((a)>(b)?(b):(a))
diff --git a/src/idsuggestionswidget.h b/src/idsuggestionswidget.h
index dc2a675..0f8b5cb 100644
--- a/src/idsuggestionswidget.h
+++ b/src/idsuggestionswidget.h
@@ -20,8 +20,8 @@
 #ifndef KBIBTEXIDSUGGESTIONSWIDGET_H
 #define KBIBTEXIDSUGGESTIONSWIDGET_H
 
-#include <ntqwidget.h>
-#include <ntqdialog.h>
+#include <tqwidget.h>
+#include <tqdialog.h>
 
 class TQCheckBox;
 class TQScrollView;
diff --git a/src/iso5426converter.cpp b/src/iso5426converter.cpp
index 9dda16f..cb0eca4 100644
--- a/src/iso5426converter.cpp
+++ b/src/iso5426converter.cpp
@@ -33,7 +33,7 @@
 #include "iso5426converter.h"
 #include <kdebug.h>
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 using KBibTeX::Iso5426Converter;
 
diff --git a/src/iso5426converter.h b/src/iso5426converter.h
index 442863e..86475f1 100644
--- a/src/iso5426converter.h
+++ b/src/iso5426converter.h
@@ -27,7 +27,7 @@ class TQCString;
 class TQString;
 class TQChar;
 
-#include <ntqglobal.h>
+#include <tqglobal.h>
 
 namespace KBibTeX {
 
diff --git a/src/iso6937converter.cpp b/src/iso6937converter.cpp
index d55b310..432be37 100644
--- a/src/iso6937converter.cpp
+++ b/src/iso6937converter.cpp
@@ -33,7 +33,7 @@
 #include "iso6937converter.h"
 #include <kdebug.h>
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 using KBibTeX::Iso6937Converter;
 
diff --git a/src/kbibtex_part.cpp b/src/kbibtex_part.cpp
index e41ecb5..e655c58 100644
--- a/src/kbibtex_part.cpp
+++ b/src/kbibtex_part.cpp
@@ -20,18 +20,18 @@
 #include <string>
 #include <fcntl.h>
 
-#include <ntqstring.h>
-#include <ntqsplitter.h>
-#include <ntqtimer.h>
-#include <ntqvaluelist.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqbuffer.h>
-#include <ntqtoolbutton.h>
-#include <ntqtabwidget.h>
-#include <ntqlabel.h>
-#include <ntqtextedit.h>
-#include <ntqclipboard.h>
+#include <tqstring.h>
+#include <tqsplitter.h>
+#include <tqtimer.h>
+#include <tqvaluelist.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqbuffer.h>
+#include <tqtoolbutton.h>
+#include <tqtabwidget.h>
+#include <tqlabel.h>
+#include <tqtextedit.h>
+#include <tqclipboard.h>
 #include <kinstance.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
@@ -59,15 +59,15 @@
 #endif
 
 #include <string.h>
-#include <entry.h>
-#include <documentlistviewitem.h>
-#include <documentlistview.h>
-#include <fileexporter.h>
-#include <fileexporterbibtex.h>
-#include <fileexporterxml.h>
-#include <fileexporterxslt.h>
-#include <settings.h>
-#include <encoderlatex.h>
+#include "entry.h"
+#include "documentlistviewitem.h"
+#include "documentlistview.h"
+#include "fileexporter.h"
+#include "fileexporterbibtex.h"
+#include "fileexporterxml.h"
+#include "fileexporterxslt.h"
+#include "settings.h"
+#include "encoderlatex.h"
 #include "kbibtex_part.h"
 
 const TQString inPipeFilename = TQDir::homeDirPath() + "/.kbibtex.in";
diff --git a/src/kbibtex_part.h b/src/kbibtex_part.h
index eab599d..561101c 100644
--- a/src/kbibtex_part.h
+++ b/src/kbibtex_part.h
@@ -24,10 +24,10 @@
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
 
-#include <element.h>
-#include <xsltransform.h>
-#include <documentwidget.h>
-#include <settingsdlg.h>
+#include "element.h"
+#include "xsltransform.h"
+#include "documentwidget.h"
+#include "settingsdlg.h"
 
 class TQWidget;
 class TQTextEdit;
diff --git a/src/kbibtexshell.cpp b/src/kbibtexshell.cpp
index ec35da9..3c297fb 100644
--- a/src/kbibtexshell.cpp
+++ b/src/kbibtexshell.cpp
@@ -17,7 +17,7 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqprocess.h>
+#include <tqprocess.h>
 
 #include <kkeydialog.h>
 #include <kencodingfiledialog.h>
@@ -34,7 +34,7 @@
 #include <kstatusbar.h>
 #include <tdelocale.h>
 
-#include <kbibtex_part.h>
+#include "kbibtex_part.h"
 #include "kbibtexshell.h"
 
 KBibTeXShell::KBibTeXShell( TQWidget* parentWidget, const char* name )
diff --git a/src/latin1literal.h b/src/latin1literal.h
index 1abcf6d..48aeaca 100644
--- a/src/latin1literal.h
+++ b/src/latin1literal.h
@@ -27,7 +27,7 @@
 #ifndef LATIN1LITERAL_H
 #define LATIN1LITERAL_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 namespace KBibTeX {
 
diff --git a/src/macro.cpp b/src/macro.cpp
index a25d4d8..8d0dc1a 100644
--- a/src/macro.cpp
+++ b/src/macro.cpp
@@ -17,8 +17,8 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqregexp.h>
-#include <ntqstringlist.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 
 #include "macro.h"
 
diff --git a/src/macro.h b/src/macro.h
index 13168eb..50a5400 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -20,9 +20,9 @@
 #ifndef BIBTEXMACRO_H
 #define BIBTEXMACRO_H
 
-#include <element.h>
-#include <entryfield.h>
-#include <value.h>
+#include "element.h"
+#include "entryfield.h"
+#include "value.h"
 
 class TQString;
 
diff --git a/src/macrowidget.cpp b/src/macrowidget.cpp
index 167d8d5..daeb771 100644
--- a/src/macrowidget.cpp
+++ b/src/macrowidget.cpp
@@ -17,18 +17,18 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlabel.h>
-#include <ntqlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <kdialogbase.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 
-#include <element.h>
-#include <fileexporterbibtex.h>
-#include <fileimporterbibtex.h>
-#include <fieldlineedit.h>
+#include "element.h"
+#include "fileexporterbibtex.h"
+#include "fileimporterbibtex.h"
+#include "fieldlineedit.h"
 
 #include "macrowidget.h"
 
diff --git a/src/macrowidget.h b/src/macrowidget.h
index 00fb9ff..d31478e 100644
--- a/src/macrowidget.h
+++ b/src/macrowidget.h
@@ -20,10 +20,10 @@
 #ifndef MACROWIDGET_H
 #define MACROWIDGET_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
-#include <macro.h>
-#include <fieldlineedit.h>
+#include "macro.h"
+#include "fieldlineedit.h"
 
 class KLineEdit;
 
diff --git a/src/main.cpp b/src/main.cpp
index 67a8c32..6d9617a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,8 +20,8 @@
 
 // #define UNIQUEAPP 1
 
-#include <ntqframe.h>
-#include <ntqpixmap.h>
+#include <tqframe.h>
+#include <tqpixmap.h>
 #ifdef UNIQUEAPP
 #include <kuniqueapplication.h>
 #else // UNIQUEAPP
diff --git a/src/mergeelements.cpp b/src/mergeelements.cpp
index b765d01..3a7f3d3 100644
--- a/src/mergeelements.cpp
+++ b/src/mergeelements.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include <cmath>
 
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqprogressbar.h>
-#include <ntqtimer.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqprogressbar.h>
+#include <tqtimer.h>
 
 #include <tdelocale.h>
 #include <kpushbutton.h>
@@ -33,14 +33,14 @@
 #include <tdeconfig.h>
 #include <twin.h>
 
-#include <macro.h>
-#include <comment.h>
-#include <preamble.h>
-#include <macrowidget.h>
-#include <entrywidget.h>
-#include <preamblewidget.h>
-#include <settings.h>
-#include <fileexporterbibtex.h>
+#include "macro.h"
+#include "comment.h"
+#include "preamble.h"
+#include "macrowidget.h"
+#include "entrywidget.h"
+#include "preamblewidget.h"
+#include "settings.h"
+#include "fileexporterbibtex.h"
 #include "mergeelements.h"
 
 namespace KBibTeX
diff --git a/src/mergeelements.h b/src/mergeelements.h
index cf433d3..e58dc7b 100644
--- a/src/mergeelements.h
+++ b/src/mergeelements.h
@@ -22,9 +22,9 @@
 
 #include <kdialogbase.h>
 
-#include <findduplicates.h>
-#include <file.h>
-#include <entry.h>
+#include "findduplicates.h"
+#include "file.h"
+#include "entry.h"
 
 class KPushButton;
 class KTextEdit;
diff --git a/src/preamble.cpp b/src/preamble.cpp
index 3df04f8..e21659c 100644
--- a/src/preamble.cpp
+++ b/src/preamble.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqregexp.h>
-#include <ntqstringlist.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 
 #include "preamble.h"
 
diff --git a/src/preamble.h b/src/preamble.h
index 506096c..29d0288 100644
--- a/src/preamble.h
+++ b/src/preamble.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXPREAMBLE_H
 #define BIBTEXPREAMBLE_H
 
-#include <element.h>
+#include "element.h"
 
 namespace BibTeX
 {
diff --git a/src/preamblewidget.cpp b/src/preamblewidget.cpp
index 9389317..abd6e70 100644
--- a/src/preamblewidget.cpp
+++ b/src/preamblewidget.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqlabel.h>
-#include <ntqlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
 
 #include <kdialogbase.h>
 #include <tdelocale.h>
diff --git a/src/preamblewidget.h b/src/preamblewidget.h
index 779f6b0..6d5e985 100644
--- a/src/preamblewidget.h
+++ b/src/preamblewidget.h
@@ -20,11 +20,11 @@
 #ifndef KBIBTEXPREAMBLEWIDGET_H
 #define KBIBTEXPREAMBLEWIDGET_H
 
-#include <ntqwidget.h>
-#include <ntqdialog.h>
+#include <tqwidget.h>
+#include <tqdialog.h>
 
-#include <preamble.h>
-#include <fieldlineedit.h>
+#include "preamble.h"
+#include "fieldlineedit.h"
 
 namespace KBibTeX
 {
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index 9e958b2..2cf06b9 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -17,12 +17,12 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlineedit.h>
-#include <ntqlayout.h>
-#include <ntqlistbox.h>
-#include <ntqtimer.h>
-#include <ntqtooltip.h>
-#include <ntqlabel.h>
+#include <tqlineedit.h>
+#include <tqlayout.h>
+#include <tqlistbox.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqlabel.h>
 
 #include <kcombobox.h>
 #include <kpushbutton.h>
@@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 
-#include <settings.h>
+#include "settings.h"
 #include "searchbar.h"
 
 namespace KBibTeX
diff --git a/src/searchbar.h b/src/searchbar.h
index 39ff4b6..c570114 100644
--- a/src/searchbar.h
+++ b/src/searchbar.h
@@ -20,12 +20,12 @@
 #ifndef KBIBTEXSEARCHBAR_H
 #define KBIBTEXSEARCHBAR_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 #include <kxmlguifactory.h>
 
-#include <documentlistview.h>
-#include <entryfield.h>
+#include "documentlistview.h"
+#include "entryfield.h"
 
 class TQTimer;
 class KPushButton;
diff --git a/src/settings.cpp b/src/settings.cpp
index c47d594..92dd34b 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -17,28 +17,28 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqstring.h>
-#include <ntqprocess.h>
-#include <ntqstringlist.h>
-#include <ntqfont.h>
-#include <ntqregexp.h>
-#include <ntqwaitcondition.h>
-#include <ntqprocess.h>
-#include <ntqapplication.h>
+#include <tqstring.h>
+#include <tqprocess.h>
+#include <tqstringlist.h>
+#include <tqfont.h>
+#include <tqregexp.h>
+#include <tqwaitcondition.h>
+#include <tqprocess.h>
+#include <tqapplication.h>
 
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
-#include <kbibtex_part.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 
-#include <entryfield.h>
-#include <element.h>
-#include <entry.h>
-#include <macro.h>
+#include "entryfield.h"
+#include "element.h"
+#include "entry.h"
+#include "macro.h"
 #include "settings.h"
+#include "kbibtex_part.h"
 
 namespace KBibTeX
 {
diff --git a/src/settings.h b/src/settings.h
index dae3ce2..baa225e 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -24,16 +24,16 @@
 #include <config.h>
 #endif
 
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 #include <kcompletion.h>
 
-#include <file.h>
-#include <fieldlineedit.h>
-#include <fileexporterbibtex.h>
-#include <fileexporterexternal.h>
-#include <entryfield.h>
-#include <entry.h>
+#include "file.h"
+#include "fieldlineedit.h"
+#include "fileexporterbibtex.h"
+#include "fileexporterexternal.h"
+#include "entryfield.h"
+#include "entry.h"
 
 class TDEConfig;
 class TDEStandardDirs;
diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 37d8b3e..4df650a 100644
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -18,19 +18,19 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#include <ntqlayout.h>
+#include <tqlayout.h>
 
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include <settingsfileio.h>
-#include <settingsediting.h>
-#include <settingssearchurl.h>
-#include <settingsidsuggestions.h>
-#include <settingskeyword.h>
-#include <settingsuserdefinedinput.h>
+#include "settingsfileio.h"
+#include "settingsediting.h"
+#include "settingssearchurl.h"
+#include "settingsidsuggestions.h"
+#include "settingskeyword.h"
+#include "settingsuserdefinedinput.h"
 #ifdef HAVE_YAZ
-#include <settingsz3950.h>
+#include "settingsz3950.h"
 #endif // HAVE_YAZ
 #include "settingsdlg.h"
 
diff --git a/src/settingsediting.cpp b/src/settingsediting.cpp
index 78619f6..4431789 100644
--- a/src/settingsediting.cpp
+++ b/src/settingsediting.cpp
@@ -17,17 +17,17 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqdir.h>
-#include <ntqheader.h>
-#include <ntqcombobox.h>
-#include <ntqslider.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-#include <ntqgroupbox.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqdir.h>
+#include <tqheader.h>
+#include <tqcombobox.h>
+#include <tqslider.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqgroupbox.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
 
 #include <kpushbutton.h>
 #include <kdirselectdialog.h>
@@ -40,7 +40,7 @@
 #include <tdefontdialog.h>
 #include <kurlcompletion.h>
 
-#include <documentlistview.h>
+#include "documentlistview.h"
 #include "settingsediting.h"
 
 namespace KBibTeX
diff --git a/src/settingsediting.h b/src/settingsediting.h
index 1edb0f7..f6915f1 100644
--- a/src/settingsediting.h
+++ b/src/settingsediting.h
@@ -20,7 +20,7 @@
 #ifndef SETTINGSEDITING_H
 #define SETTINGSEDITING_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class TQCheckBox;
 class TQPushButton;
diff --git a/src/settingsfileio.cpp b/src/settingsfileio.cpp
index 223937e..c148435 100644
--- a/src/settingsfileio.cpp
+++ b/src/settingsfileio.cpp
@@ -18,17 +18,17 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#include <ntqhbuttongroup.h>
-#include <ntqbuttongroup.h>
-#include <ntqpushbutton.h>
-#include <ntqlabel.h>
-#include <ntqcheckbox.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-#include <ntqcombobox.h>
-#include <ntqlayout.h>
-#include <ntqradiobutton.h>
-#include <ntqspinbox.h>
+#include <tqhbuttongroup.h>
+#include <tqbuttongroup.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
 
 #include <tdelocale.h>
 #include <kurl.h>
@@ -40,8 +40,8 @@
 #include <kiconloader.h>
 #include <kpushbutton.h>
 
-#include <settings.h>
-#include <file.h>
+#include "settings.h"
+#include "file.h"
 #include "settingsfileio.h"
 
 namespace KBibTeX
diff --git a/src/settingsfileio.h b/src/settingsfileio.h
index bb00a4f..5572ae4 100644
--- a/src/settingsfileio.h
+++ b/src/settingsfileio.h
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class TQComboBox;
 class TQCheckBox;
diff --git a/src/settingsidsuggestions.cpp b/src/settingsidsuggestions.cpp
index 18a3045..c1c68cc 100644
--- a/src/settingsidsuggestions.cpp
+++ b/src/settingsidsuggestions.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqcheckbox.h>
-#include <ntqtimer.h>
-#include <ntqvalidator.h>
-#include <ntqheader.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqtimer.h>
+#include <tqvalidator.h>
+#include <tqheader.h>
+#include <tqlabel.h>
 
 #include <kinputdialog.h>
 #include <tdelistview.h>
@@ -32,11 +32,11 @@
 #include <kdialog.h>
 #include <klineedit.h>
 
-#include <idsuggestions.h>
-#include <idsuggestionswidget.h>
-#include <settings.h>
-#include <fileimporter.h>
-#include <fileimporterbibtex.h>
+#include "idsuggestions.h"
+#include "idsuggestionswidget.h"
+#include "settings.h"
+#include "fileimporter.h"
+#include "fileimporterbibtex.h"
 #include "settingsidsuggestions.h"
 
 namespace KBibTeX
diff --git a/src/settingsidsuggestions.h b/src/settingsidsuggestions.h
index 355efba..fc04655 100644
--- a/src/settingsidsuggestions.h
+++ b/src/settingsidsuggestions.h
@@ -20,11 +20,11 @@
 #ifndef KBIBTEXSETTINGSIDSUGGESTIONS_H
 #define KBIBTEXSETTINGSIDSUGGESTIONS_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 #include <tdelistview.h>
 
-#include <entry.h>
+#include "entry.h"
 
 class TQRegExpValidator;
 class TQCheckBox;
diff --git a/src/settingskeyword.cpp b/src/settingskeyword.cpp
index e55b68a..de309dd 100644
--- a/src/settingskeyword.cpp
+++ b/src/settingskeyword.cpp
@@ -17,11 +17,11 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqheader.h>
-#include <ntqtimer.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqheader.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
 
 #include <tdelistview.h>
 #include <kdialog.h>
@@ -29,11 +29,11 @@
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 
-#include <file.h>
-#include <entryfield.h>
-#include <value.h>
-#include <entry.h>
-#include <settings.h>
+#include "file.h"
+#include "entryfield.h"
+#include "value.h"
+#include "entry.h"
+#include "settings.h"
 #include "settingskeyword.h"
 
 namespace KBibTeX
diff --git a/src/settingskeyword.h b/src/settingskeyword.h
index ae78471..ea26c71 100644
--- a/src/settingskeyword.h
+++ b/src/settingskeyword.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXSETTINGSKEYWORD_H
 #define KBIBTEXSETTINGSKEYWORD_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class TDEListView;
 class TQPushButton;
diff --git a/src/settingssearchurl.cpp b/src/settingssearchurl.cpp
index 07e87b4..03c8983 100644
--- a/src/settingssearchurl.cpp
+++ b/src/settingssearchurl.cpp
@@ -17,12 +17,12 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqlabel.h>
-#include <ntqtooltip.h>
-#include <ntqheader.h>
-#include <ntqcombobox.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
+#include <tqheader.h>
+#include <tqcombobox.h>
 
 #include <kiconloader.h>
 #include <tdelistview.h>
@@ -31,7 +31,7 @@
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
 
-#include <settings.h>
+#include "settings.h"
 #include "settingssearchurl.h"
 
 namespace KBibTeX
diff --git a/src/settingssearchurl.h b/src/settingssearchurl.h
index f415ee9..e3bdddf 100644
--- a/src/settingssearchurl.h
+++ b/src/settingssearchurl.h
@@ -20,7 +20,7 @@
 #ifndef SETTINGSSEARCHURL_H
 #define SETTINGSSEARCHURL_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class TQLineEdit;
 class KPushButton;
diff --git a/src/settingsuserdefinedinput.cpp b/src/settingsuserdefinedinput.cpp
index df25361..91cf92c 100644
--- a/src/settingsuserdefinedinput.cpp
+++ b/src/settingsuserdefinedinput.cpp
@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqheader.h>
-#include <ntqlabel.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqheader.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
 
 #include <kdialog.h>
 #include <kdialogbase.h>
@@ -33,8 +33,8 @@
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 
-#include <settings.h>
-#include <fieldlineedit.h>
+#include "settings.h"
+#include "fieldlineedit.h"
 #include "settingsuserdefinedinput.h"
 
 namespace KBibTeX
diff --git a/src/settingsuserdefinedinput.h b/src/settingsuserdefinedinput.h
index 5bc2e5e..10e7239 100644
--- a/src/settingsuserdefinedinput.h
+++ b/src/settingsuserdefinedinput.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXSETTINGSUSERDEFINEDINPUT_H
 #define KBIBTEXSETTINGSUSERDEFINEDINPUT_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class TDEListView;
 class KPushButton;
diff --git a/src/settingsz3950.cpp b/src/settingsz3950.cpp
index 03b75b4..e1f6baa 100644
--- a/src/settingsz3950.cpp
+++ b/src/settingsz3950.cpp
@@ -23,12 +23,12 @@
 
 #ifdef HAVE_YAZ
 
-#include <ntqlayout.h>
-#include <ntqtimer.h>
-#include <ntqheader.h>
-#include <ntqlabel.h>
-#include <ntqspinbox.h>
-#include <ntqregexp.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqheader.h>
+#include <tqlabel.h>
+#include <tqspinbox.h>
+#include <tqregexp.h>
 
 #include <tdelistview.h>
 #include <kpushbutton.h>
diff --git a/src/settingsz3950.h b/src/settingsz3950.h
index 841135a..5bfa2cc 100644
--- a/src/settingsz3950.h
+++ b/src/settingsz3950.h
@@ -26,9 +26,9 @@
 #ifndef KBIBTEXSETTINGSZ3950_H
 #define KBIBTEXSETTINGSZ3950_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
-#include <settings.h>
+#include "settings.h"
 
 class TQSpinBox;
 class KPushButton;
diff --git a/src/sidebar.cpp b/src/sidebar.cpp
index fb7212c..cf45678 100644
--- a/src/sidebar.cpp
+++ b/src/sidebar.cpp
@@ -17,13 +17,13 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqcombobox.h>
-#include <ntqheader.h>
-#include <ntqapplication.h>
-#include <ntqtooltip.h>
-#include <ntqstring.h>
-#include <ntqtoolbutton.h>
+#include <tqlayout.h>
+#include <tqcombobox.h>
+#include <tqheader.h>
+#include <tqapplication.h>
+#include <tqtooltip.h>
+#include <tqstring.h>
+#include <tqtoolbutton.h>
 
 #include <kdebug.h>
 #include <tdepopupmenu.h>
@@ -32,8 +32,8 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include <settings.h>
-#include <entry.h>
+#include "settings.h"
+#include "entry.h"
 #include "sidebar.h"
 
 namespace KBibTeX
diff --git a/src/sidebar.h b/src/sidebar.h
index 5acdef6..c945aef 100644
--- a/src/sidebar.h
+++ b/src/sidebar.h
@@ -20,11 +20,11 @@
 #ifndef KBIBTEXSIDEBAR_H
 #define KBIBTEXSIDEBAR_H
 
-#include <ntqwidget.h>
-#include <ntqlistview.h>
+#include <tqwidget.h>
+#include <tqlistview.h>
 
-#include <entryfield.h>
-#include <file.h>
+#include "entryfield.h"
+#include "file.h"
 
 class TQComboBox;
 class TQToolButton;
diff --git a/src/value.cpp b/src/value.cpp
index b95e374..8499f4a 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqregexp.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 #include "value.h"
 
diff --git a/src/value.h b/src/value.h
index 8b1f711..a46ff0d 100644
--- a/src/value.h
+++ b/src/value.h
@@ -20,7 +20,7 @@
 #ifndef BIBTEXVALUE_H
 #define BIBTEXVALUE_H
 
-#include <ntqvaluelist.h>
+#include <tqvaluelist.h>
 
 class TQStringList;
 
diff --git a/src/valuewidget.cpp b/src/valuewidget.cpp
index 9e56488..d997cdf 100644
--- a/src/valuewidget.cpp
+++ b/src/valuewidget.cpp
@@ -17,18 +17,18 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqlistview.h>
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqheader.h>
-#include <ntqpushbutton.h>
+#include <tqlistview.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqheader.h>
+#include <tqpushbutton.h>
 
 #include <kdialogbase.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include <value.h>
-#include <settings.h>
+#include "value.h"
+#include "settings.h"
 #include "valuewidget.h"
 
 namespace KBibTeX
diff --git a/src/valuewidget.h b/src/valuewidget.h
index 5a31fc4..d3661fe 100644
--- a/src/valuewidget.h
+++ b/src/valuewidget.h
@@ -20,11 +20,11 @@
 #ifndef KBIBTEXVALUEWIDGET_H
 #define KBIBTEXVALUEWIDGET_H
 
-#include <ntqwidget.h>
-#include <ntqdialog.h>
+#include <tqwidget.h>
+#include <tqdialog.h>
 
-#include <value.h>
-#include <entryfield.h>
+#include "value.h"
+#include "entryfield.h"
 
 class TQListView;
 class TQPushButton;
diff --git a/src/webquery.cpp b/src/webquery.cpp
index 32256e2..3bb4dc9 100644
--- a/src/webquery.cpp
+++ b/src/webquery.cpp
@@ -17,19 +17,19 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqtimer.h>
-#include <ntqheader.h>
-#include <ntqwidget.h>
-#include <ntqlayout.h>
-#include <ntqtooltip.h>
-#include <ntqframe.h>
-#include <ntqwidgetstack.h>
-#include <ntqlabel.h>
-#include <ntqcheckbox.h>
-#include <ntqspinbox.h>
-#include <ntqapplication.h>
-#include <ntqeventloop.h>
-#include <ntqbuffer.h>
+#include <tqtimer.h>
+#include <tqheader.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqframe.h>
+#include <tqwidgetstack.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
+#include <tqbuffer.h>
 
 #include <tdelocale.h>
 #include <kcombobox.h>
@@ -45,25 +45,25 @@
 #include <tdeconfig.h>
 #include <twin.h>
 
-#include <settings.h>
-#include <idsuggestions.h>
-#include <entrywidget.h>
-#include <webqueryarxiv.h>
-#include <webquerybibsonomy.h>
-#include <webquerycsb.h>
-#include <webquerycitebase.h>
-#include <webqueryciteseerx.h>
-#include <webquerydblp.h>
-#include <webquerygooglescholar.h>
-#include <webqueryieeexplore.h>
-#include <webquerymathscinet.h>
-#include <webquerypubmed.h>
-#include <webquerysciencedirect.h>
-#include <webqueryspireshep.h>
+#include "settings.h"
+#include "idsuggestions.h"
+#include "entrywidget.h"
+#include "webqueryarxiv.h"
+#include "webquerybibsonomy.h"
+#include "webquerycsb.h"
+#include "webquerycitebase.h"
+#include "webqueryciteseerx.h"
+#include "webquerydblp.h"
+#include "webquerygooglescholar.h"
+#include "webqueryieeexplore.h"
+#include "webquerymathscinet.h"
+#include "webquerypubmed.h"
+#include "webquerysciencedirect.h"
+#include "webqueryspireshep.h"
 #ifdef HAVE_YAZ
-#include <webqueryz3950.h>
+#include "webqueryz3950.h"
 #endif // HAVE_YAZ
-#include <webqueryzmath.h>
+#include "webqueryzmath.h"
 #include "webquery.h"
 
 #define min(a,b) ((a)>(b)?(b):(a))
diff --git a/src/webquery.h b/src/webquery.h
index 0289ee0..372d05c 100644
--- a/src/webquery.h
+++ b/src/webquery.h
@@ -20,8 +20,8 @@
 #ifndef KBIBTEXWEBQUERY_H
 #define KBIBTEXWEBQUERY_H
 
-#include <ntqobject.h>
-#include <ntqstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
 
 #include <kdialogbase.h>
 #include <tdelistview.h>
diff --git a/src/webqueryamatex.cpp b/src/webqueryamatex.cpp
index 8d31bc3..18a9539 100644
--- a/src/webqueryamatex.cpp
+++ b/src/webqueryamatex.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqapplication.h>
-#include <ntqregexp.h>
-#include <ntqbuffer.h>
-#include <ntqspinbox.h>
+#include <tqfile.h>
+#include <tqapplication.h>
+#include <tqregexp.h>
+#include <tqbuffer.h>
+#include <tqspinbox.h>
 
 #include <klineedit.h>
 #include <tdelocale.h>
@@ -29,7 +29,7 @@
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 
-#include <fileimporterbibtex.h>
+#include "fileimporterbibtex.h"
 #include "webqueryamatex.h"
 
 namespace KBibTeX
diff --git a/src/webqueryamatex.h b/src/webqueryamatex.h
index 1f450de..8d37c29 100644
--- a/src/webqueryamatex.h
+++ b/src/webqueryamatex.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXWEBQUERYAMATEX_H
 #define KBIBTEXWEBQUERYAMATEX_H
 
-#include <webquery.h>
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/webqueryarxiv.cpp b/src/webqueryarxiv.cpp
index 1405a34..89a35e0 100644
--- a/src/webqueryarxiv.cpp
+++ b/src/webqueryarxiv.cpp
@@ -17,18 +17,18 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqbuffer.h>
-#include <ntqspinbox.h>
+#include <tqfile.h>
+#include <tqbuffer.h>
+#include <tqspinbox.h>
 
 #include <tdelocale.h>
 #include <klineedit.h>
 #include <tdemessagebox.h>
 #include <kurl.h>
 
-#include <fileimporterbibtex.h>
-#include <encoderxml.h>
-#include <settings.h>
+#include "fileimporterbibtex.h"
+#include "encoderxml.h"
+#include "settings.h"
 #include "webqueryarxiv.h"
 
 namespace KBibTeX
diff --git a/src/webqueryarxiv.h b/src/webqueryarxiv.h
index 2fa80e1..13d2a87 100644
--- a/src/webqueryarxiv.h
+++ b/src/webqueryarxiv.h
@@ -20,14 +20,14 @@
 #ifndef KBIBTEXWEBQUERYARXIV_H
 #define KBIBTEXWEBQUERYARXIV_H
 
-#include <ntqstring.h>
-#include <ntqstringlist.h>
-#include <ntqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
 
 #include <tdeio/job.h>
 
-#include <fileimporterbibtex.h>
-#include <webquery.h>
+#include "fileimporterbibtex.h"
+#include "webquery.h"
 
 class TQBuffer;
 
diff --git a/src/webquerybibsonomy.cpp b/src/webquerybibsonomy.cpp
index 0aa954f..45600d0 100644
--- a/src/webquerybibsonomy.cpp
+++ b/src/webquerybibsonomy.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqapplication.h>
-#include <ntqfile.h>
-#include <ntqregexp.h>
-#include <ntqstring.h>
-#include <ntqspinbox.h>
+#include <tqapplication.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqspinbox.h>
 
 #include <tdelocale.h>
 #include <klineedit.h>
@@ -29,8 +29,8 @@
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 
-#include <settings.h>
-#include <fileimporterbibtex.h>
+#include "settings.h"
+#include "fileimporterbibtex.h"
 #include "webquerybibsonomy.h"
 
 namespace KBibTeX
diff --git a/src/webquerybibsonomy.h b/src/webquerybibsonomy.h
index 5d286c9..cbea036 100644
--- a/src/webquerybibsonomy.h
+++ b/src/webquerybibsonomy.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXWEBQUERYBIBSONOMY_H
 #define KBIBTEXWEBQUERYBIBSONOMY_H
 
-#include <webquery.h>
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/webquerycitebase.cpp b/src/webquerycitebase.cpp
index f8795f2..5757b31 100644
--- a/src/webquerycitebase.cpp
+++ b/src/webquerycitebase.cpp
@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqapplication.h>
-#include <ntqfile.h>
-#include <ntqstring.h>
-#include <ntqspinbox.h>
+#include <tqapplication.h>
+#include <tqfile.h>
+#include <tqstring.h>
+#include <tqspinbox.h>
 
 #include <klineedit.h>
 #include <tdelocale.h>
@@ -28,8 +28,8 @@
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 
-#include <settings.h>
-#include <fileimporterbibtex.h>
+#include "settings.h"
+#include "fileimporterbibtex.h"
 #include "webquerycitebase.h"
 
 namespace KBibTeX
diff --git a/src/webquerycitebase.h b/src/webquerycitebase.h
index 5461063..e8dec2f 100644
--- a/src/webquerycitebase.h
+++ b/src/webquerycitebase.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXWEBQUERYCITEBASE_H
 #define KBIBTEXWEBQUERYCITEBASE_H
 
-#include <webquery.h>
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/webqueryciteseerx.cpp b/src/webqueryciteseerx.cpp
index c00502a..88d5af6 100644
--- a/src/webqueryciteseerx.cpp
+++ b/src/webqueryciteseerx.cpp
@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqregexp.h>
-#include <ntqbuffer.h>
-#include <ntqspinbox.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqbuffer.h>
+#include <tqspinbox.h>
 
 #include <tdelocale.h>
 #include <klineedit.h>
@@ -28,9 +28,9 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <fileimporterbibtex.h>
-#include <encoderxml.h>
-#include <settings.h>
+#include "fileimporterbibtex.h"
+#include "encoderxml.h"
+#include "settings.h"
 #include "webqueryciteseerx.h"
 
 using BibTeX::Value;
diff --git a/src/webqueryciteseerx.h b/src/webqueryciteseerx.h
index 8582058..fad8d60 100644
--- a/src/webqueryciteseerx.h
+++ b/src/webqueryciteseerx.h
@@ -20,13 +20,13 @@
 #ifndef KBIBTEXWEBQUERYCITESEERX_H
 #define KBIBTEXWEBQUERYCITESEERX_H
 
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 #include <tdeio/job.h>
 
-#include <fileimporterbibtex.h>
-#include <webquery.h>
+#include "fileimporterbibtex.h"
+#include "webquery.h"
 
 #include <deque>
 
diff --git a/src/webquerycsb.cpp b/src/webquerycsb.cpp
index 8768001..9e31e62 100644
--- a/src/webquerycsb.cpp
+++ b/src/webquerycsb.cpp
@@ -17,16 +17,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqregexp.h>
-#include <ntqbuffer.h>
-#include <ntqcstring.h>
-#include <ntqiodevice.h>
-#include <ntqspinbox.h>
-#include <ntqcheckbox.h>
-#include <ntqfile.h>
-#include <ntqdatetime.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqregexp.h>
+#include <tqbuffer.h>
+#include <tqcstring.h>
+#include <tqiodevice.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
+#include <tqfile.h>
+#include <tqdatetime.h>
 
 #include <tdelocale.h>
 #include <tdemessagebox.h>
@@ -36,7 +36,7 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 
-#include <settings.h>
+#include "settings.h"
 #include "webquerycsb.h"
 
 namespace KBibTeX
diff --git a/src/webquerycsb.h b/src/webquerycsb.h
index a12b337..326c82e 100644
--- a/src/webquerycsb.h
+++ b/src/webquerycsb.h
@@ -22,8 +22,8 @@
 
 #include <tdeio/job.h>
 
-#include <fileimporterbibtex.h>
-#include <webquery.h>
+#include "fileimporterbibtex.h"
+#include "webquery.h"
 
 class TQSpinBox;
 class TQCheckBox;
diff --git a/src/webquerydblp.cpp b/src/webquerydblp.cpp
index 88fe881..ec7001f 100644
--- a/src/webquerydblp.cpp
+++ b/src/webquerydblp.cpp
@@ -17,13 +17,13 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqapplication.h>
-#include <ntqspinbox.h>
-#include <ntqregexp.h>
-#include <ntqcheckbox.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
+#include <tqfile.h>
+#include <tqapplication.h>
+#include <tqspinbox.h>
+#include <tqregexp.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
 
 #include <tdelocale.h>
 #include <klineedit.h>
@@ -34,8 +34,8 @@
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 
-#include <settings.h>
-#include <fileimporterbibtex.h>
+#include "settings.h"
+#include "fileimporterbibtex.h"
 #include "webquerydblp.h"
 
 namespace KBibTeX
diff --git a/src/webquerydblp.h b/src/webquerydblp.h
index 4e39268..b395e42 100644
--- a/src/webquerydblp.h
+++ b/src/webquerydblp.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXWEBQUERYDBLP_H
 #define KBIBTEXWEBQUERYDBLP_H
 
-#include <webquery.h>
+#include "webquery.h"
 
 class TQCheckBox;
 
diff --git a/src/webquerygooglescholar.cpp b/src/webquerygooglescholar.cpp
index 5822440..be55192 100644
--- a/src/webquerygooglescholar.cpp
+++ b/src/webquerygooglescholar.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqapplication.h>
-#include <ntqregexp.h>
-#include <ntqtimer.h>
-#include <ntqmap.h>
-#include <ntqspinbox.h>
+#include <tqfile.h>
+#include <tqapplication.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
+#include <tqmap.h>
+#include <tqspinbox.h>
 #include <tdeconfig.h>
 
 #include <klineedit.h>
@@ -33,7 +33,7 @@
 
 #include <dcopref.h>
 
-#include <settings.h>
+#include "settings.h"
 #include "webquerygooglescholar.h"
 
 namespace KBibTeX
diff --git a/src/webquerygooglescholar.h b/src/webquerygooglescholar.h
index db0c844..c6bb6c3 100644
--- a/src/webquerygooglescholar.h
+++ b/src/webquerygooglescholar.h
@@ -20,13 +20,13 @@
 #ifndef KBIBTEXWEBQUERYGOOGLESCHOLAR_H
 #define KBIBTEXWEBQUERYGOOGLESCHOLAR_H
 
-#include <ntqstringlist.h>
-#include <ntqbuffer.h>
+#include <tqstringlist.h>
+#include <tqbuffer.h>
 
 #include <kurl.h>
 
-#include <fileimporterbibtex.h>
-#include <webquery.h>
+#include "fileimporterbibtex.h"
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/webqueryieeexplore.cpp b/src/webqueryieeexplore.cpp
index cc28192..a4fad0d 100644
--- a/src/webqueryieeexplore.cpp
+++ b/src/webqueryieeexplore.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqspinbox.h>
-#include <ntqfile.h>
+#include <tqspinbox.h>
+#include <tqfile.h>
 
 #include <tdeio/jobclasses.h>
 #include <tdeio/job.h>
@@ -28,10 +28,10 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 
-#include <settings.h>
-#include <entryfield.h>
-#include <file.h>
-#include <fileimporterbibtex.h>
+#include "settings.h"
+#include "entryfield.h"
+#include "file.h"
+#include "fileimporterbibtex.h"
 #include "webqueryieeexplore.h"
 
 #define min(a,b) ((a)>(b)?(b):(a))
diff --git a/src/webqueryieeexplore.h b/src/webqueryieeexplore.h
index b8fefb7..4c63e9c 100644
--- a/src/webqueryieeexplore.h
+++ b/src/webqueryieeexplore.h
@@ -20,10 +20,10 @@
 #ifndef KBIBTEXWEBQUERYIEEEXPLORE_H
 #define KBIBTEXWEBQUERYIEEEXPLORE_H
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
-#include <webquery.h>
-#include <fileimporter.h>
+#include "webquery.h"
+#include "fileimporter.h"
 
 namespace KBibTeX
 {
diff --git a/src/webquerymathscinet.cpp b/src/webquerymathscinet.cpp
index ccc81e6..1d4a89c 100644
--- a/src/webquerymathscinet.cpp
+++ b/src/webquerymathscinet.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "webquerymathscinet.h"
 
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqregexp.h>
-#include <ntqspinbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqregexp.h>
+#include <tqspinbox.h>
 
 #include <kpushbutton.h>
 #include <tdelocale.h>
@@ -32,7 +32,7 @@
 #include <tdeio/netaccess.h>
 #include <tdemessagebox.h>
 
-#include <settings.h>
+#include "settings.h"
 
 namespace KBibTeX
 {
diff --git a/src/webquerymathscinet.h b/src/webquerymathscinet.h
index ead0cf4..1ff3508 100644
--- a/src/webquerymathscinet.h
+++ b/src/webquerymathscinet.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXWEBQUERYMATHSCINET_H
 #define KBIBTEXWEBQUERYMATHSCINET_H
 
-#include <webquery.h>
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/webquerypubmed.cpp b/src/webquerypubmed.cpp
index 8aea30c..902a0a1 100644
--- a/src/webquerypubmed.cpp
+++ b/src/webquerypubmed.cpp
@@ -17,14 +17,14 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <ntqwidget.h>
-#include <ntqdom.h>
-#include <ntqapplication.h>
-#include <ntqstringlist.h>
-#include <ntqbuffer.h>
-#include <ntqcstring.h>
-#include <ntqregexp.h>
-#include <ntqspinbox.h>
+#include <tqwidget.h>
+#include <tqdom.h>
+#include <tqapplication.h>
+#include <tqstringlist.h>
+#include <tqbuffer.h>
+#include <tqcstring.h>
+#include <tqregexp.h>
+#include <tqspinbox.h>
 
 #include <klineedit.h>
 #include <kdialog.h>
@@ -33,9 +33,9 @@
 #include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
-#include <entryfield.h>
-#include <value.h>
-#include <settings.h>
+#include "entryfield.h"
+#include "value.h"
+#include "settings.h"
 #include "webquerypubmed.h"
 
 namespace KBibTeX
diff --git a/src/webquerypubmed.h b/src/webquerypubmed.h
index a100da7..610e831 100644
--- a/src/webquerypubmed.h
+++ b/src/webquerypubmed.h
@@ -20,11 +20,11 @@
 #ifndef KBIBTEXWEBQUERYPUBMED_H
 #define KBIBTEXWEBQUERYPUBMED_H
 
-#include <ntqwidget.h>
-#include <ntqxml.h>
-#include <ntqvaluelist.h>
+#include <tqwidget.h>
+#include <tqxml.h>
+#include <tqvaluelist.h>
 
-#include <webquery.h>
+#include "webquery.h"
 
 class TQStringList;
 class TQDomElement;
diff --git a/src/webquerysciencedirect.cpp b/src/webquerysciencedirect.cpp
index 0e041a0..783955d 100644
--- a/src/webquerysciencedirect.cpp
+++ b/src/webquerysciencedirect.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqspinbox.h>
-#include <ntqbuffer.h>
-#include <ntqfile.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqspinbox.h>
+#include <tqbuffer.h>
+#include <tqfile.h>
 
 #include <kpushbutton.h>
 #include <tdelocale.h>
@@ -31,8 +31,8 @@
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 
-#include <settings.h>
-#include <fileimporterris.h>
+#include "settings.h"
+#include "fileimporterris.h"
 #include "webquerysciencedirect.h"
 
 namespace KBibTeX
diff --git a/src/webquerysciencedirect.h b/src/webquerysciencedirect.h
index b742f5a..915a193 100644
--- a/src/webquerysciencedirect.h
+++ b/src/webquerysciencedirect.h
@@ -20,8 +20,8 @@
 #ifndef KBIBTEXWEBQUERYSCIENCEDIRECT_H
 #define KBIBTEXWEBQUERYSCIENCEDIRECT_H
 
-#include <fileimporterbibtex.h>
-#include <webquery.h>
+#include "fileimporterbibtex.h"
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/webqueryspireshep.cpp b/src/webqueryspireshep.cpp
index e409841..000df22 100644
--- a/src/webqueryspireshep.cpp
+++ b/src/webqueryspireshep.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqapplication.h>
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqcheckbox.h>
+#include <tqfile.h>
+#include <tqapplication.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
 
 #include <kiconloader.h>
 #include <kcombobox.h>
@@ -32,8 +32,8 @@
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 
-#include <settings.h>
-#include <fileimporterbibtex.h>
+#include "settings.h"
+#include "fileimporterbibtex.h"
 #include "webqueryspireshep.h"
 
 namespace KBibTeX
diff --git a/src/webqueryspireshep.h b/src/webqueryspireshep.h
index 190ac3f..bf0eed6 100644
--- a/src/webqueryspireshep.h
+++ b/src/webqueryspireshep.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXWEBQUERYSPIRESHEP_H
 #define KBIBTEXWEBQUERYSPIRESHEP_H
 
-#include <webquery.h>
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/webqueryz3950.cpp b/src/webqueryz3950.cpp
index d59f285..a405ee3 100644
--- a/src/webqueryz3950.cpp
+++ b/src/webqueryz3950.cpp
@@ -32,11 +32,11 @@
 #include <config.h>
 #endif
 
-#include <ntqfile.h>
-#include <ntqapplication.h>
-#include <ntqspinbox.h>
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqfile.h>
+#include <tqapplication.h>
+#include <tqspinbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 
 #include <tdelocale.h>
 #include <kstandarddirs.h>
@@ -50,8 +50,8 @@
 #include <kdebug.h>
 #include <kurl.h>
 
-#include <fileimporterbibutils.h>
-#include <settings.h>
+#include "fileimporterbibutils.h"
+#include "settings.h"
 #include "webqueryz3950.h"
 
 namespace KBibTeX
diff --git a/src/webqueryz3950.h b/src/webqueryz3950.h
index 5f926f7..5fb9089 100644
--- a/src/webqueryz3950.h
+++ b/src/webqueryz3950.h
@@ -34,16 +34,16 @@
 #ifndef KBIBTEXWEBQUERYZ3950_H
 #define KBIBTEXWEBQUERYZ3950_H
 
-#include <ntqevent.h>
-#include <ntqdeepcopy.h>
-#include <ntqthread.h>
+#include <tqevent.h>
+#include <tqdeepcopy.h>
+#include <tqthread.h>
 
 #include <ksharedptr.h>
 
-#include <fileimporter.h>
-#include <webquery.h>
-#include <xsltransform.h>
-#include <z3950connection.h>
+#include "fileimporter.h"
+#include "webquery.h"
+#include "xsltransform.h"
+#include "z3950connection.h"
 
 class KComboBox;
 
diff --git a/src/webqueryzmath.cpp b/src/webqueryzmath.cpp
index e111b65..fba9453 100644
--- a/src/webqueryzmath.cpp
+++ b/src/webqueryzmath.cpp
@@ -17,9 +17,9 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <ntqfile.h>
-#include <ntqapplication.h>
-#include <ntqspinbox.h>
+#include <tqfile.h>
+#include <tqapplication.h>
+#include <tqspinbox.h>
 
 #include <tdelocale.h>
 #include <klineedit.h>
@@ -28,8 +28,8 @@
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 
-#include <settings.h>
-#include <fileimporterbibtex.h>
+#include "settings.h"
+#include "fileimporterbibtex.h"
 #include "webqueryzmath.h"
 
 namespace KBibTeX
diff --git a/src/webqueryzmath.h b/src/webqueryzmath.h
index 101ce7f..df01cf0 100644
--- a/src/webqueryzmath.h
+++ b/src/webqueryzmath.h
@@ -20,7 +20,7 @@
 #ifndef KBIBTEXWEBQUERYZMATH_H
 #define KBIBTEXWEBQUERYZMATH_H
 
-#include <webquery.h>
+#include "webquery.h"
 
 namespace KBibTeX
 {
diff --git a/src/xsltransform.cpp b/src/xsltransform.cpp
index bae027b..ab54882 100644
--- a/src/xsltransform.cpp
+++ b/src/xsltransform.cpp
@@ -23,8 +23,8 @@
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
-#include <ntqfile.h>
-#include <ntqstring.h>
+#include <tqfile.h>
+#include <tqstring.h>
 
 #include "xsltransform.h"
 
diff --git a/src/z3950connection.cpp b/src/z3950connection.cpp
index 83dcf6b..e821c29 100644
--- a/src/z3950connection.cpp
+++ b/src/z3950connection.cpp
@@ -28,7 +28,7 @@
 #include "iso5426converter.h"
 #include "iso6937converter.h"
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 #include <config.h>
 
@@ -43,7 +43,7 @@ extern "C"
 
 #include <tdelocale.h>
 
-#include <ntqfile.h>
+#include <tqfile.h>
 
 namespace
 {
diff --git a/src/z3950connection.h b/src/z3950connection.h
index aedb645..c5a5d0b 100644
--- a/src/z3950connection.h
+++ b/src/z3950connection.h
@@ -23,9 +23,9 @@
 #ifndef KBIBTEX_Z3950CONNECTION_H
 #define KBIBTEX_Z3950CONNECTION_H
 
-#include <ntqthread.h>
-#include <ntqevent.h>
-#include <ntqdeepcopy.h>
+#include <tqthread.h>
+#include <tqevent.h>
+#include <tqdeepcopy.h>
 
 #include <ksharedptr.h>
 
diff --git a/xslt/CMakeLists.txt b/xslt/CMakeLists.txt
new file mode 100644
index 0000000..24812f2
--- /dev/null
+++ b/xslt/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _xsls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xsl )
+
+install(
+    FILES ${_xsls}
+    DESTINATION ${DATA_INSTALL_DIR}/kbibtexpart/xslt
+)