Conversion to the cmake building system.

Added several man pages taken from the Debian packaging.
Cleanup headers in ui files.
Add png icons for mono theme.

Signed-off-by: gregory guy <[email protected]>

cmake:
- Use tde_add_check_executable instead of a combination
of separate calls to tde_add_executable and add_test.
- Simplify the detection of time.h and sys/time.h headers.
- Refactor phrasebook files install, kmouth.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 6b3181cf92f1fc74da1e8a82f690a1526cb4e900)

111 files changed, 2802 insertions, 246 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..ef8985f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,117 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8.12 )
+
+
+#### general package setup
+
+project( tdeaccessibility )
+set( VERSION R14.1.0 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckIncludeFiles      )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+enable_testing( )
+
+
+##### 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} )
+option( WITH_ARTS           "Enable aRts support"                               ON                  )
+option( WITH_AKODE          "Enable akode support"                              ${WITH_ALL_OPTIONS} )
+option( WITH_ALSA           "Enable alsa support"                               ${WITH_ALL_OPTIONS} )
+option( WITH_GSTREAMER      "Enable Gstreamer support"                          OFF                 )
+
+########################################################################
+#                                                                      #
+#                   aRts support is needed to build:                   #
+#                   - kttsd artsplayer                                 #
+#                   - ksayit                                           #
+#                   - ksayit freeverb plugin                           #
+#                                                                      #
+########################################################################
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON )
+
+option( BUILD_KBSTATEAPPLET   "Build kbstateapplet"          ${BUILD_ALL} )
+option( BUILD_KMAG            "Build kmag"                   ${BUILD_ALL} )
+option( BUILD_KMOUSETOOL      "Build kmousetool"             ${BUILD_ALL} )
+option( BUILD_KMOUTH          "Build kmouth"                 ${BUILD_ALL} )
+option( BUILD_KSAYIT          "Build ksayit"                 ${BUILD_ALL} )
+option( BUILD_KSAYIT_FREEVERB "Build ksayit freeverb plugin" ${BUILD_ALL} )
+option( BUILD_KTTSD           "Build kttsd"                  ${BUILD_ALL} )
+option( BUILD_KTTSD_COMMAND   "Build kttsd command plugin"   ${BUILD_ALL} )
+option( BUILD_KTTSD_EPOS      "Build kttsd epos plugin"      ${BUILD_ALL} )
+option( BUILD_KTTSD_FESTIVAL  "Build kttsd festival plugin"  ${BUILD_ALL} )
+option( BUILD_KTTSD_FLITE     "Build kttsd flite plugin"     ${BUILD_ALL} )
+option( BUILD_KTTSD_FREETTS   "Build kttsd freetts plugin"   ${BUILD_ALL} )
+option( BUILD_KTTSD_HADIFIX   "Build kttsd hadifix plugin"   ${BUILD_ALL} )
+option( BUILD_KTTSD_KATE      "Build kttsd kate plugin"      ${BUILD_ALL} )
+option( BUILD_ICONTHEMES      "Build icons"                  ${BUILD_ALL} )
+option( BUILD_DOC             "Build documentation"          ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H )
+
+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
+
+tde_conditional_add_subdirectory( BUILD_KBSTATEAPPLET kbstateapplet )
+tde_conditional_add_subdirectory( BUILD_KMAG          kmag          )
+tde_conditional_add_subdirectory( BUILD_KMOUSETOOL    kmousetool    )
+tde_conditional_add_subdirectory( BUILD_KMOUTH        kmouth        )
+tde_conditional_add_subdirectory( BUILD_KSAYIT        ksayit        )
+tde_conditional_add_subdirectory( BUILD_KTTSD         kttsd         )
+tde_conditional_add_subdirectory( BUILD_ICONTHEMES    IconThemes    )
+tde_conditional_add_subdirectory( BUILD_DOC           doc           )
+
+if( BUILD_KSAYIT OR BUILD_KTTSD )
+    add_subdirectory( kspeechsink )
+endif()
+
+
+##### 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..c999afa
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,115 @@
+###########################################
+#                                         #
+#  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 X11
+
+find_package( X11 )
+
+
+##### check for aRts
+
+if( WITH_ARTS )
+    pkg_search_module( ARTS arts )
+    find_library( ARTSKDE artskde )
+
+    if( ARTS_FOUND AND ARTSKDE )
+        set( ARTS_LIBRARIES artskde-shared artsflow_idl soundserver_idl )
+        set( ARTS_PLAYER_LIBRARIES "${ARTS_LIBRARIES}" kmedia2_idl )
+     else()
+        tde_message_fatal( "aRts support has been requested but was not found on your system." )
+    endif()
+
+    if( BUILD_KSAYIT )
+        find_path( ARTS_INCLUDE_DIRS "arts/artsflow.h" )
+
+        if( ARTS_INCLUDE_DIRS )
+            set( KAYSAYIT_ARTS_INCLUDE "${ARTS_INCLUDE_DIRS}" )
+            set( KAYSAYIT_ARTS_LIBRARIES "${ARTS_LIBRARIES}" artsflow )
+         else()
+            tde_message_fatal( "aRts headers are required for ksayit build but were not found on your system." )
+        endif()
+    endif()
+
+    if( BUILD_KSAYIT_FREEVERB )
+        find_path( ARTS_MODULES_DIR "arts/artsmodules.h" )
+
+        if( ARTS_MODULES_DIR )
+            set( ARTS_FREEVERB_PLUGIN_LIBRARIES "${ARTS_LIBRARIES}" artsflow artsmoduleseffects artsmodules )
+         else()
+            tde_message_fatal( freeverb support has been requested, but the <arts/artsmodules.h> header from tdemultimedia was not found )
+        endif()
+    endif()
+endif( WITH_ARTS )
+
+
+##### check for akode
+
+if( WITH_AKODE )
+    pkg_search_module( AKODE akode )
+
+    if( NOT AKODE_FOUND )
+        tde_message_fatal( "akode support has been requested but was not found on your system" )
+    endif()
+endif( WITH_AKODE )
+
+
+##### check for alsa
+
+if( WITH_ALSA )
+    pkg_search_module( ALSA alsa )
+
+    if( ALSA_FOUND )
+        check_include_file(  "sys/time.h"        HAVE_SYS_TIME_H    )
+        check_include_files( "sys/time.h;time.h" TIME_WITH_SYS_TIME )
+     else()
+       tde_message_fatal( "alsa support has been requested but was not found on your system." )
+    endif()
+endif( WITH_ALSA )
+
+
+##### check for gstreamer
+
+if( WITH_GSTREAMER )
+    pkg_search_module( GSTREAMER gstreamer-1.0>=1.0.0 gstreamer-0.10>=0.10.0 )
+    pkg_search_module( GLIB2 glib-2.0 )
+
+    if( NOT GSTREAMER_FOUND )
+        tde_message_fatal( "Gstreamer support has been requested but gstreamer was not found on your system." )
+    endif()
+
+    message( STATUS "gstreamer version: ${GSTREAMER_VERSION}" )
+endif( WITH_GSTREAMER )
+
+
+##### look for <kspeech.h> header
+
+find_path( KTTS_KSPEECH_DIR NAMES kspeech.h
+HINTS
+      ${TQT_INCLUDE_DIRS}
+      ${TDE_INCLUDE_DIR}
+      ${TDE_INCLUDE_DIR}/tde
+)
diff --git a/IconThemes/CMakeLists.txt b/IconThemes/CMakeLists.txt
new file mode 100644
index 0000000..d61fe55
--- /dev/null
+++ b/IconThemes/CMakeLists.txt
@@ -0,0 +1,26 @@
+##### index theme
+
+install(
+    FILES mono/index.theme
+    DESTINATION ${ICON_INSTALL_DIR}/mono
+)
+
+
+##### svgz icons
+
+set( _icon_type actions apps categories devices mimetypes places )
+
+foreach( icon_type ${_icon_type} )
+     file( GLOB _files ${CMAKE_CURRENT_SOURCE_DIR}/mono/scalable/${icon_type}/*.svgz )
+     install( FILES ${_files} DESTINATION ${ICON_INSTALL_DIR}/mono/scalable/${icon_type} )
+endforeach( icon_type )
+
+
+##### png icons
+
+set( _icon_size 16x16 22x22 32x32 48x48 64x64 96x96 128x128 192x192 256x256 )
+
+foreach( icon_size ${_icon_size} )
+     file( GLOB _files ${CMAKE_CURRENT_SOURCE_DIR}/mono/png/${icon_size}/actions/*.png )
+     install( FILES ${_files} DESTINATION ${ICON_INSTALL_DIR}/mono/png/${icon_size}/actions )
+endforeach( icon_size )
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..bfbd018
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,14 @@
+#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 both <sys/time.h> and <time.h> headers */
+#cmakedefine TIME_WITH_SYS_TIME 1
+
+/* Defined if you have either <sys/time.h> or <time.h> headers */
+#cmakedefine HAVE_SYS_TIME_H 1
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000..86e1d34
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory( man )
+
+tde_conditional_add_subdirectory( BUILD_KMAG       kmag       )
+tde_conditional_add_subdirectory( BUILD_KMOUSETOOL kmousetool )
+tde_conditional_add_subdirectory( BUILD_KMOUTH     kmouth     )
+tde_conditional_add_subdirectory( BUILD_KSAYIT     ksayit     )
+tde_conditional_add_subdirectory( BUILD_KTTSD      kttsd      )
diff --git a/doc/kmag/CMakeLists.txt b/doc/kmag/CMakeLists.txt
new file mode 100644
index 0000000..bbf4d61
--- /dev/null
+++ b/doc/kmag/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+tde_create_handbook( DESTINATION kmag )
diff --git a/doc/kmousetool/CMakeLists.txt b/doc/kmousetool/CMakeLists.txt
new file mode 100644
index 0000000..20a4302
--- /dev/null
+++ b/doc/kmousetool/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+tde_create_handbook( DESTINATION kmousetool )
diff --git a/doc/kmouth/CMakeLists.txt b/doc/kmouth/CMakeLists.txt
new file mode 100644
index 0000000..a0770d4
--- /dev/null
+++ b/doc/kmouth/CMakeLists.txt
@@ -0,0 +1,8 @@
+FILE( GLOB EPS_FILES *.eps)
+
+INSTALL(
+    FILES ${EPS_FILES}
+    DESTINATION ${HTML_INSTALL_DIR}/en/kmouth
+)
+
+tde_create_handbook( DESTINATION kmouth )
diff --git a/doc/ksayit/CMakeLists.txt b/doc/ksayit/CMakeLists.txt
index 2100cef..f3bd726 100644
--- a/doc/ksayit/CMakeLists.txt
+++ b/doc/ksayit/CMakeLists.txt
@@ -1,9 +1,2 @@
-#################################################
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
 
 tde_create_handbook( DESTINATION ksayit )
diff --git a/doc/kttsd/CMakeLists.txt b/doc/kttsd/CMakeLists.txt
new file mode 100644
index 0000000..f729b93
--- /dev/null
+++ b/doc/kttsd/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+tde_create_handbook( DESTINATION kttsd )
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 0000000..9e73a7f
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,5 @@
+tde_conditional_add_subdirectory( BUILD_KMAG       kmag       )
+tde_conditional_add_subdirectory( BUILD_KMOUSETOOL kmousetool )
+tde_conditional_add_subdirectory( BUILD_KMOUTH     kmouth     )
+tde_conditional_add_subdirectory( BUILD_KTTSD      kttsd      )
+tde_conditional_add_subdirectory( BUILD_KSAYIT     ksayit     )
diff --git a/doc/man/kmag/CMakeLists.txt b/doc/man/kmag/CMakeLists.txt
new file mode 100644
index 0000000..1c1513b
--- /dev/null
+++ b/doc/man/kmag/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES kmag.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kmag/kmag.1 b/doc/man/kmag/kmag.1
new file mode 100644
index 0000000..f21a158
--- /dev/null
+++ b/doc/man/kmag/kmag.1
@@ -0,0 +1,141 @@
+.TH kmag 1
+
+.SH NAME
+kmag \- A screen magnifier for TDE.
+
+.SH SYNOPSIS
+.B kmag [file]
+.I [ Generic Options] [Qt-options] [TDE-options]
+
+.SH DESCRIPTION
+Kmag is a TDE screen magnifier for the visually impaired.
+You can use it to magnify a part of the screen just as you would use a
+lens to magnify a newspaper fine-print or a photograph.
+This application is useful for a variety of people: from researchers to 
+artists to web-designers to people with low vision.
+
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde
+Show TDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+
+.SH TDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.
+
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmag
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmag').
+
+.PP
+There is also further information available at the 
+.URL https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility " 
+tdeaccessibility project home page."
+
+kmag(1)
+
+.SH AUTHORS
+.nf
+OlafSchmidt <[email protected]>
+.br
+SarangLakare <[email protected]>
+.br
+MichaelForster <[email protected]>
diff --git a/doc/man/kmousetool/CMakeLists.txt b/doc/man/kmousetool/CMakeLists.txt
new file mode 100644
index 0000000..f68b664
--- /dev/null
+++ b/doc/man/kmousetool/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES kmousetool.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kmousetool/kmousetool.1 b/doc/man/kmousetool/kmousetool.1
new file mode 100644
index 0000000..8f3bfd3
--- /dev/null
+++ b/doc/man/kmousetool/kmousetool.1
@@ -0,0 +1,146 @@
+.TH kmousetool 1
+
+.SH NAME
+kmousetool \- A TDE tool to help click the mouse.
+
+.SH SYNOPSIS
+.B kmousetool
+.I [ Generic Options] [Qt-options] [TDE-options]
+
+.SH DESCRIPTION
+KMouseTool clicks the mouse whenever the mouse cursor pauses briefly.
+It was designed to help those with repetitive strain injuries, for
+whom pressing buttons hurts. It includes features and options that
+provide artificial intelligence on common mouse gestures to perform
+actions.
+
+.PP
+KMouseTool can also be configured to wait for a specified time for a
+drag to begin, before unclicking the mouse. This way, you can use it for
+drag and drop operations as well.
+
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde
+Show TDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+
+.SH TDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.
+
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmousetool
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmousetool').
+
+.PP
+There is also further information available at 
+.URL https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility " 
+tdeaccessibility project home page."
+
+kmouthtool(1)
+
+.SH AUTHORS
+.nf
+GunnarSchmi <gunnar@schmi>
+.br
+OlafSchmidt <[email protected]>
+.br
+JeffRoush <[email protected]>
diff --git a/doc/man/kmouth/CMakeLists.txt b/doc/man/kmouth/CMakeLists.txt
new file mode 100644
index 0000000..5bed04f
--- /dev/null
+++ b/doc/man/kmouth/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES kmouth.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kmouth/kmouth.1 b/doc/man/kmouth/kmouth.1
new file mode 100644
index 0000000..c321db4
--- /dev/null
+++ b/doc/man/kmouth/kmouth.1
@@ -0,0 +1,142 @@
+.TH kmouth 1
+
+.SH NAME
+kmouth \- A type-and-say TDE front end for speech synthesizers.
+
+.SH SYNOPSIS
+.B kmouth
+.I [ Generic Options] [Qt-options] [TDE-options]
+
+.SH DESCRIPTION
+Kmouth is an application that enables persons that cannot speak to
+let their computers speak, e.g. mute people or people who have lost
+their voice. It includes a history of spoken sentences from
+which the user can select sentences to be re-spoken. It has a text input
+field and speaks the sentences that you enter. It also has support for
+user defined phrasebooks.
+
+.PP
+Note that does not include speech synthesizer. Instead it
+requires a speech synthesizer installed in the system.
+
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde
+Show TDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+
+.SH TDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.
+
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmouth
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmouth').
+
+.PP
+There is also further information available at the 
+.URL https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility "
+tdeaccessibility project web site".
+
+kmouth(1)
+
+.SH AUTHORS
+.br
+GunnarSchmi <[email protected]>
diff --git a/doc/man/ksayit/CMakeLists.txt b/doc/man/ksayit/CMakeLists.txt
new file mode 100644
index 0000000..942349d
--- /dev/null
+++ b/doc/man/ksayit/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES ksayit.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/ksayit/ksayit.1 b/doc/man/ksayit/ksayit.1
new file mode 100644
index 0000000..92c1a3d
--- /dev/null
+++ b/doc/man/ksayit/ksayit.1
@@ -0,0 +1,145 @@
+.TH ksayit 1
+
+.SH NAME
+ksayit \- A Text-to-speech front-end to kttsd.
+
+.SH SYNOPSIS
+.B ksayit [file]
+.I [ Generic Options] [Qt-options] [TDE-options]
+
+.SH DESCRIPTION
+KSayIt is a small utilitiy for TDE that simply speaks a given textfile 
+in a very high quality, i.e. sound and pronounciation of the spoken 
+text should be as natural as possible. KSayIt uses natively 
+Text-To-Speech systems like MBrola, any TTS system that can be 
+controlled via a command line or any TTS system that is supported by 
+the TTS system (i.e. Festival). KSayIt offers three user interfaces: 
+A simple text editor window in which you can enter or paste text that 
+should be spoken after pressing a play button, as well as an icon 
+in the systemtray that starts to speak by a single mouseclick the 
+actual content of the clipboard. As a TDE application it offers also a 
+DCOP interface for the say and shut-up action. Finally KSayIt provides 
+an effectstack to postprocess the sound of the voice (currently only a 
+Freeverb effect is included)
+
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde
+Show TDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+
+.SH TDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.
+
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ksayit
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ksayit').
+
+.PP
+There is also further information available at the 
+.URL https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility " 
+tdeaccessibility project home page."
+
+ksayit(1)
+
+.SH AUTHORS
+.nf
+Robert Vogl <[email protected]>
diff --git a/doc/man/kttsd/CMakeLists.txt b/doc/man/kttsd/CMakeLists.txt
new file mode 100644
index 0000000..ae891e0
--- /dev/null
+++ b/doc/man/kttsd/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES kttsd.1 kttsmgr.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kttsd/kttsd.1 b/doc/man/kttsd/kttsd.1
new file mode 100644
index 0000000..b9092c0
--- /dev/null
+++ b/doc/man/kttsd/kttsd.1
@@ -0,0 +1,138 @@
+.TH KTTSD 1
+
+.SH NAME
+kttsd \- Text-to-speech synthesis deamon
+
+.SH SYNOPSIS
+.B kttsd
+.I [ Generic Options] [Qt-options] [KDE-options]
+ 
+.SH DESCRIPTION
+Kttsd is part of the TDE Text-to-Speech system. kttsd is the non-GUI
+deamon that provides TTS services to applications via the DCOP
+interface. kttsd is configured via kttsmgr.
+ 
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde
+Show TDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+
+.SH TDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.
+
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kttsd/
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kttsd').
+
+kttsmgr(1)
+
+.SH AUTHORS
+.nf
+Jos� Pablo Ezequiel Fern�ndez <[email protected]>
+.br
+Gary Cramblitt <[email protected]>
+.br
+Gunnar Schmi Dt <[email protected]>
+.br
+Olaf Schmidt <[email protected]>
+.br
+Paul Giannaros <[email protected]>
diff --git a/doc/man/kttsd/kttsmgr.1 b/doc/man/kttsd/kttsmgr.1
new file mode 100644
index 0000000..bb6db02
--- /dev/null
+++ b/doc/man/kttsd/kttsmgr.1
@@ -0,0 +1,132 @@
+.TH KTTSMGR 1
+
+.SH NAME
+kttsmgr
+- Text-to-Speech Manager
+
+.SH SYNOPSIS
+.B kttsmgr
+.I [ Generic Options] [Qt-options] [KDE-options]
+
+.SH DESCRIPTION
+Kttsmgr is an application for starting and configuring the
+Text-to-Speech system.
+
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde
+Show TDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+
+.SH TDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget. 
+
+kttsd(1)
+
+.SH AUTHORS
+.nf
+Jos� Pablo Ezequiel Fern�ndez <[email protected]>
+.br
+Gary Cramblitt <[email protected]>
+.br
+Gunnar Schmi Dt <[email protected]>
+.br
+Olaf Schmidt <[email protected]>
+.br
+Paul Giannaros <[email protected]>
diff --git a/kbstateapplet/CMakeLists.txt b/kbstateapplet/CMakeLists.txt
new file mode 100644
index 0000000..75cde10
--- /dev/null
+++ b/kbstateapplet/CMakeLists.txt
@@ -0,0 +1,38 @@
+add_subdirectory( images )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${X11_INCLUDE_DIR}
+  ${X11_Xkb_INCLUDE_PATH}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kbstate_panelapplet (kpart)
+
+tde_add_kpart( kbstate_panelapplet MODULE AUTOMOC
+
+  SOURCES
+        kbstate.cpp
+  LINK
+     tdeui-shared
+     tdecore-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kbstateapplet.desktop
+    DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
+)
diff --git a/kbstateapplet/images/CMakeLists.txt b/kbstateapplet/images/CMakeLists.txt
new file mode 100644
index 0000000..4564c0c
--- /dev/null
+++ b/kbstateapplet/images/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kbstateapplet/icons )
diff --git a/kmag/CMakeLists.txt b/kmag/CMakeLists.txt
new file mode 100644
index 0000000..70fccec
--- /dev/null
+++ b/kmag/CMakeLists.txt
@@ -0,0 +1,49 @@
+add_subdirectory( images )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${X11_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kmag (executable)
+
+tde_add_executable( kmag AUTOMOC
+
+  SOURCES
+        kmagzoomview.cpp
+        kmagselrect.cpp
+        kmag.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeprint-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( kmag )
+
+
+##### other data
+
+install(
+    FILES kmagui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kmag
+)
+
+tde_create_translated_desktop( kmag.desktop )
diff --git a/kmag/Makefile.am b/kmag/Makefile.am
index 83a66f4..3f6b994 100644
--- a/kmag/Makefile.am
+++ b/kmag/Makefile.am
@@ -15,9 +15,6 @@ KDE_ICON = kmag
 
 xdg_apps_DATA = kmag.desktop
 
-kmagiconsdir = $(kde_datadir)/kmag/icons
-kmagicons_ICON = followmouse hidemouse window
-
 # set the include path for X, qt and KDE
 INCLUDES= $(all_includes)
 
@@ -37,3 +34,4 @@ messages: rc.cpp
 	 $(XGETTEXT) $$LIST -o $(podir)/kmag.pot; \
 	fi
 
+SUBDIRS = images
diff --git a/kmag/images/CMakeLists.txt b/kmag/images/CMakeLists.txt
new file mode 100644
index 0000000..b2c3d3f
--- /dev/null
+++ b/kmag/images/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kmag/icons )
diff --git a/kmag/images/Makefile.am b/kmag/images/Makefile.am
new file mode 100644
index 0000000..336246b
--- /dev/null
+++ b/kmag/images/Makefile.am
@@ -0,0 +1,3 @@
+
+kmagiconsdir = $(kde_datadir)/kmag/icons
+kmagicons_ICON = followmouse hidemouse window
diff --git a/kmag/hi16-action-followmouse.png b/kmag/images/hi16-action-followmouse.png
index 1b690e8..1b690e8 100644
--- a/kmag/hi16-action-followmouse.png
+++ b/kmag/images/hi16-action-followmouse.png
diff --git a/kmag/hi16-action-hidemouse.png b/kmag/images/hi16-action-hidemouse.png
index b792f7d..b792f7d 100644
--- a/kmag/hi16-action-hidemouse.png
+++ b/kmag/images/hi16-action-hidemouse.png
diff --git a/kmag/hi16-action-window.png b/kmag/images/hi16-action-window.png
index 1563cca..1563cca 100644
--- a/kmag/hi16-action-window.png
+++ b/kmag/images/hi16-action-window.png
diff --git a/kmag/kmag.h b/kmag/kmag.h
index 10a85a1..c60b86c 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -21,9 +21,8 @@
 #ifndef KMAG_H
 #define KMAG_H
 
-
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "kmagzoomview.h"
diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h
index 1208d18..b82dc47 100644
--- a/kmag/kmagzoomview.h
+++ b/kmag/kmagzoomview.h
@@ -21,7 +21,7 @@
 #define KMagZoomView_h_
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 // include files for TQt
diff --git a/kmousetool/CMakeLists.txt b/kmousetool/CMakeLists.txt
new file mode 100644
index 0000000..00e90e5
--- /dev/null
+++ b/kmousetool/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory( kmousetool )
diff --git a/kmousetool/kmousetool/CMakeLists.txt b/kmousetool/kmousetool/CMakeLists.txt
new file mode 100644
index 0000000..7b7df2d
--- /dev/null
+++ b/kmousetool/kmousetool/CMakeLists.txt
@@ -0,0 +1,47 @@
+add_subdirectory( pics )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${X11_INCLUDE_DIR}
+  ${X11_XTest_INCLUDE_PATH}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kmousetool (executable)
+
+tde_add_executable( kmousetool AUTOMOC
+
+  SOURCES
+        kmousetoolui.ui
+        mtstroke.cpp
+        kmousetool.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     ${X11_LIBRARIES}
+     ${X11_XTest_LIB}
+     ${X11_Xext_LIB}
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop( kmousetool.desktop )
+
+install(
+    FILES mousetool_tap.wav
+    DESTINATION ${DATA_INSTALL_DIR}/kmousetool/sounds
+)
diff --git a/kmousetool/kmousetool/kmousetool.h b/kmousetool/kmousetool/kmousetool.h
index 818dadc..210aefb 100644
--- a/kmousetool/kmousetool/kmousetool.h
+++ b/kmousetool/kmousetool/kmousetool.h
@@ -22,12 +22,12 @@
 #ifndef KMOUSETOOL_H
 #define KMOUSETOOL_H
 
-#include <tqdir.h>
-
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
+#include <tqdir.h>
+
 #include "version.h"
 
 #include <tdeapplication.h>
diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui
index 906160a..1d74de1 100644
--- a/kmousetool/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetool/kmousetoolui.ui
@@ -407,16 +407,8 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kmousetool/kmousetool/pics/CMakeLists.txt b/kmousetool/kmousetool/pics/CMakeLists.txt
new file mode 100644
index 0000000..d0623c7
--- /dev/null
+++ b/kmousetool/kmousetool/pics/CMakeLists.txt
@@ -0,0 +1,7 @@
+##### icons
+
+tde_install_icons(
+    DESTINATION ${DATA_INSTALL_DIR}/kmousetool/icons
+)
+
+tde_install_icons( kmousetool )
diff --git a/kmouth/CMakeLists.txt b/kmouth/CMakeLists.txt
new file mode 100644
index 0000000..9fec611
--- /dev/null
+++ b/kmouth/CMakeLists.txt
@@ -0,0 +1,63 @@
+add_subdirectory( icons          )
+add_subdirectory( phrasebook     )
+add_subdirectory( wordcompletion )
+add_subdirectory( books          )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/kmouth/phrasebook
+  ${CMAKE_BINARY_DIR}/kmouth/wordcompletion
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kmouth (executable)
+
+tde_add_executable( kmouth AUTOMOC
+
+  SOURCES
+        preferencesui.ui
+        texttospeechconfigurationui.ui
+        texttospeechconfigurationwidget.cpp
+        optionsdialog.cpp
+        configwizard.cpp
+        phraseedit.cpp
+        phraselist.cpp
+        speech.cpp
+        texttospeechsystem.cpp
+        phraselistitem.cpp
+        kmouth.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeprint-shared
+     phrasebook-static
+     wordcompletion-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kmouthui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kmouth
+)
+
+install(
+    FILES kmouthrc
+    DESTINATION ${CONFIG_INSTALL_DIR}
+)
+
+tde_create_translated_desktop( kmouth.desktop )
diff --git a/kmouth/books/CMakeLists.txt b/kmouth/books/CMakeLists.txt
new file mode 100644
index 0000000..282dcb3
--- /dev/null
+++ b/kmouth/books/CMakeLists.txt
@@ -0,0 +1,18 @@
+##### phrasebooks
+
+foreach( _lang de en nl sv )
+    install(
+        FILES
+            ${_lang}-courteousness.phrasebook
+            ${_lang}-greetings.phrasebook
+            ${_lang}-howareyou.phrasebook
+            ${_lang}-personal.phrasebook
+
+        DESTINATION ${DATA_INSTALL_DIR}/kmouth/books/${_lang}
+    )
+
+    tde_create_translated_desktop(
+        SOURCE ${_lang}.desktop
+        DESTINATION ${DATA_INSTALL_DIR}/kmouth/books/${_lang}
+    )
+endforeach()
diff --git a/kmouth/icons/CMakeLists.txt b/kmouth/icons/CMakeLists.txt
new file mode 100644
index 0000000..52c60aa
--- /dev/null
+++ b/kmouth/icons/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_subdirectory( history    )
+add_subdirectory( phrase     )
+add_subdirectory( phrasebook )
+add_subdirectory( app        )
+
+
+tde_install_icons(
+    DESTINATION ${DATA_INSTALL_DIR}/kmouth/icons
+)
diff --git a/kmouth/icons/app/CMakeLists.txt b/kmouth/icons/app/CMakeLists.txt
new file mode 100644
index 0000000..643654c
--- /dev/null
+++ b/kmouth/icons/app/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons()
diff --git a/kmouth/icons/history/CMakeLists.txt b/kmouth/icons/history/CMakeLists.txt
new file mode 100644
index 0000000..9133d6b
--- /dev/null
+++ b/kmouth/icons/history/CMakeLists.txt
@@ -0,0 +1,3 @@
+tde_install_icons(
+    DESTINATION ${DATA_INSTALL_DIR}/kmouth/icons
+)
diff --git a/kmouth/icons/phrase/CMakeLists.txt b/kmouth/icons/phrase/CMakeLists.txt
new file mode 100644
index 0000000..9133d6b
--- /dev/null
+++ b/kmouth/icons/phrase/CMakeLists.txt
@@ -0,0 +1,3 @@
+tde_install_icons(
+    DESTINATION ${DATA_INSTALL_DIR}/kmouth/icons
+)
diff --git a/kmouth/icons/phrasebook/CMakeLists.txt b/kmouth/icons/phrasebook/CMakeLists.txt
new file mode 100644
index 0000000..9133d6b
--- /dev/null
+++ b/kmouth/icons/phrasebook/CMakeLists.txt
@@ -0,0 +1,3 @@
+tde_install_icons(
+    DESTINATION ${DATA_INSTALL_DIR}/kmouth/icons
+)
diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h
index 79f1aa0..628128c 100644
--- a/kmouth/kmouth.h
+++ b/kmouth/kmouth.h
@@ -19,9 +19,8 @@
 #ifndef KMOUTH_H
 #define KMOUTH_H
 
-
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 // include files for TQt
diff --git a/kmouth/phrasebook/CMakeLists.txt b/kmouth/phrasebook/CMakeLists.txt
new file mode 100644
index 0000000..ed96605
--- /dev/null
+++ b/kmouth/phrasebook/CMakeLists.txt
@@ -0,0 +1,31 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### phrasebook (static)
+
+tde_add_library( phrasebook STATIC_PIC AUTOMOC
+
+  SOURCES
+        buttonboxui.ui
+        phrasetree.cpp
+        phrasebookparser.cpp
+        phrasebookdialog.cpp
+        phrasebook.cpp
+)
+
+
+install(
+    FILES phrasebookdialogui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kmouth
+)
diff --git a/kmouth/phrasebook/buttonboxui.ui b/kmouth/phrasebook/buttonboxui.ui
index 59f1d40..73eccf5 100644
--- a/kmouth/phrasebook/buttonboxui.ui
+++ b/kmouth/phrasebook/buttonboxui.ui
@@ -104,4 +104,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kmouth/preferencesui.ui b/kmouth/preferencesui.ui
index 6d998cd..16cb7ce 100644
--- a/kmouth/preferencesui.ui
+++ b/kmouth/preferencesui.ui
@@ -159,4 +159,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includehints>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includehints>
 </UI>
diff --git a/kmouth/texttospeechconfigurationui.ui b/kmouth/texttospeechconfigurationui.ui
index 59bcf7a..afbcfd6 100644
--- a/kmouth/texttospeechconfigurationui.ui
+++ b/kmouth/texttospeechconfigurationui.ui
@@ -161,10 +161,10 @@
     <signal>configurationChanged()</signal>
 </Q_SIGNALS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kmouth/wordcompletion/CMakeLists.txt b/kmouth/wordcompletion/CMakeLists.txt
new file mode 100644
index 0000000..295a8d0
--- /dev/null
+++ b/kmouth/wordcompletion/CMakeLists.txt
@@ -0,0 +1,30 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### wordcompletion (static)
+
+tde_add_library( wordcompletion STATIC_PIC AUTOMOC
+
+  SOURCES
+        wordcompletionui.ui
+        creationsourceui.ui
+        creationsourcedetailsui.ui
+        kdedocsourceui.ui
+        wordlist.cpp
+        wordcompletion.cpp
+        wordcompletionwidget.cpp
+        dictionarycreationwizard.cpp
+        klanguagebutton.cpp
+        klanguagebuttonhelper.cpp
+)
diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui b/kmouth/wordcompletion/creationsourcedetailsui.ui
index 52aa8a7..1efd8bd 100644
--- a/kmouth/wordcompletion/creationsourcedetailsui.ui
+++ b/kmouth/wordcompletion/creationsourcedetailsui.ui
@@ -159,6 +159,9 @@
     <include location="local" impldecl="in implementation">klanguagebutton.h</include>
     <include location="local" impldecl="in implementation">klanguagebuttonhelper.h</include>
     <include location="local" impldecl="in implementation">creationsourcedetailsui.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
 <forwards>
     <forward>class KLanguageButton</forward>
@@ -173,12 +176,4 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kinputdialog.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kinputdialog.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kmouth/wordcompletion/kdedocsourceui.ui b/kmouth/wordcompletion/kdedocsourceui.ui
index c310fa1..91a410a 100644
--- a/kmouth/wordcompletion/kdedocsourceui.ui
+++ b/kmouth/wordcompletion/kdedocsourceui.ui
@@ -82,6 +82,9 @@
     <include location="local" impldecl="in implementation">klanguagebutton.h</include>
     <include location="local" impldecl="in implementation">klanguagebuttonhelper.h</include>
     <include location="local" impldecl="in implementation">kdedocsourceui.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
     <forward>class KLanguageButton</forward>
@@ -93,9 +96,4 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index bc9cde5..c195cf0 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -266,6 +266,10 @@
     <include location="local" impldecl="in implementation">klanguagebutton.h</include>
     <include location="local" impldecl="in implementation">klanguagebuttonhelper.h</include>
     <include location="local" impldecl="in implementation">wordcompletionui.ui.h</include>
+    <include location="local" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <forwards>
     <forward>class KLanguageButton</forward>
@@ -280,14 +284,4 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kinputdialog.h</includehint>
-</includehints>
 </UI>
diff --git a/ksayit/CMakeLists.txt b/ksayit/CMakeLists.txt
new file mode 100644
index 0000000..3104aec
--- /dev/null
+++ b/ksayit/CMakeLists.txt
@@ -0,0 +1,3 @@
+tde_conditional_add_subdirectory( BUILD_KSAYIT_FREEVERB Freeverb_plugin )
+add_subdirectory( KTTSD_Lib )
+add_subdirectory( src )
diff --git a/ksayit/Freeverb_plugin/CMakeLists.txt b/ksayit/Freeverb_plugin/CMakeLists.txt
new file mode 100644
index 0000000..c705217
--- /dev/null
+++ b/ksayit/Freeverb_plugin/CMakeLists.txt
@@ -0,0 +1,44 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/ksayit/src
+  ${ARTS_MODULES_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### libFreeverb_plugin (module)
+
+tde_add_library( libFreeverb_plugin MODULE AUTOMOC
+
+  SOURCES
+        freeverb_setup.ui
+        freeverbsetupimpl.cpp
+        ksayitfreeverblib.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     ${ARTS_FREEVERB_PLUGIN_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE ksayit_libFreeverb_service.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+tde_create_translated_desktop(
+    SOURCE ksayit_libFreeverb.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index 7cd1a02..5474e16 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -662,7 +662,7 @@
     <slot>slotOKwasClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/ksayit/KTTSD_Lib/CMakeLists.txt b/ksayit/KTTSD_Lib/CMakeLists.txt
new file mode 100644
index 0000000..6f3f318
--- /dev/null
+++ b/ksayit/KTTSD_Lib/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### KTTSD_Lib (shared)
+
+tde_add_library( KTTSD_Lib SHARED AUTOMOC
+
+  SOURCES
+        KTTSDlibSetup.ui
+        kttsdlib.cpp
+        kttsdlibsetupimpl.cpp
+        kttsdlibtalker2.cpp
+  LINK
+     tdeui-shared
+     tdecore-shared
+     DUMMY_kspeech_lib-static
+
+  VERSION 0.0.1
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/ksayit/src/CMakeLists.txt b/ksayit/src/CMakeLists.txt
new file mode 100644
index 0000000..bcb44fb
--- /dev/null
+++ b/ksayit/src/CMakeLists.txt
@@ -0,0 +1,70 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/ksayit/KTTSD_Lib
+  ${KAYSAYIT_ARTS_INCLUDE}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ksayit (executable)
+
+tde_add_executable( ksayit AUTOMOC
+
+  SOURCES
+        DocTreeView.ui
+        fx_setup.ui
+        KSayItView.ui
+        doctreeviewimpl.cpp
+        effectstack.cpp
+        fxpluginhandler.cpp
+        fxsetupimpl.cpp
+        ksayit.skel
+        ksayitsystemtray.cpp
+        ksayitviewimpl.cpp
+        main.cpp
+        voicesetupdlg.cpp
+        ksayit.cpp
+        parasaxparser.cpp
+        saxhandler.cpp
+        ksayitbookmarkhandler.cpp
+        contextmenuhandler.cpp
+        docbookclasses.cpp
+        docbookgenerator.cpp
+        docbookparser.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     KTTSD_Lib-shared
+     ${KAYSAYIT_ARTS_LIBRARIES}
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+##### icons
+
+tde_install_icons()
+
+
+##### other data
+
+install(
+    FILES ksayitui.rc ContextMenus.xml
+    DESTINATION ${DATA_INSTALL_DIR}/ksayit
+)
+
+tde_create_translated_desktop( ksayit.desktop )
+
+install(
+    FILES ksayit_fxplugin.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index 166b9b6..d66454e 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -121,6 +121,7 @@
 </forwards>
 <includes>
     <include location="local" impldecl="in implementation">DocTreeView.ui.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>signalContentChanged(const TQString &amp;)</signal>
@@ -155,7 +156,4 @@
     <slot>slotRightButtonPressed( TQListViewItem * i, const TQPoint &amp;, int )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
 </UI>
diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui
index 90d8332..a01f0af 100644
--- a/ksayit/src/KSayItView.ui
+++ b/ksayit/src/KSayItView.ui
@@ -63,7 +63,7 @@
     <slot>slotTextChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/kspeechsink/CMakeLists.txt b/kspeechsink/CMakeLists.txt
new file mode 100644
index 0000000..0b3560a
--- /dev/null
+++ b/kspeechsink/CMakeLists.txt
@@ -0,0 +1,71 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+add_compile_options( -fPIC )
+
+
+##### ksayit_kspeech
+
+set( KSPEECH_KIDL kspeech.kidl )
+set( KSPEECH_STUB kspeech_stub )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeech.h > ${KSPEECH_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeech.h
+)
+add_custom_target( ksayit-kspeech-kidl DEPENDS ${KSPEECH_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_STUB}.h ${KSPEECH_STUB}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-skel ${KSPEECH_KIDL}
+    DEPENDS ${KSPEECH_KIDL}
+)
+add_custom_target( ksayit-kspeech-stub DEPENDS ${KSPEECH_STUB}.cpp )
+
+
+###### ksayit_kspeechsink
+
+set( KSPEECHSINK_KIDL kspeechsink.kidl )
+set( KSPEECHSINK_SKEL kspeechsink_skel )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeechsink.h > ${KSPEECHSINK_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeechsink.h
+)
+add_custom_target( ksayit-kspeechsink-kidl DEPENDS ${KSPEECHSINK_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_SKEL}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KSPEECHSINK_KIDL}
+    DEPENDS ${KSPEECHSINK_KIDL}
+)
+add_custom_target( ksayit-kspeechsink-skel DEPENDS ${KSPEECHSINK_SKEL}.cpp )
+
+
+##### DUMMY_Lib (static)
+
+tde_add_library( DUMMY_kspeech_lib STATIC
+
+  SOURCES
+        ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECH_STUB}.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECHSINK_SKEL}.cpp
+  LINK
+     tdecore-shared
+
+  DEPENDENCIES
+     ksayit-kspeech-stub
+     ksayit-kspeechsink-skel
+)
diff --git a/kttsd/CMakeLists.txt b/kttsd/CMakeLists.txt
new file mode 100644
index 0000000..e6ee899
--- /dev/null
+++ b/kttsd/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory( app-plugins )
+add_subdirectory( libkttsd    )
+add_subdirectory( players     )
+add_subdirectory( plugins     )
+add_subdirectory( filters     )
+add_subdirectory( kttsmgr     )
+add_subdirectory( kttsd       )
+add_subdirectory( kttsjobmgr  )
+add_subdirectory( kcmkttsmgr  )
+add_subdirectory( icons       )
diff --git a/kttsd/app-plugins/CMakeLists.txt b/kttsd/app-plugins/CMakeLists.txt
new file mode 100644
index 0000000..fcf6746
--- /dev/null
+++ b/kttsd/app-plugins/CMakeLists.txt
@@ -0,0 +1 @@
+tde_conditional_add_subdirectory( BUILD_KTTSD_KATE kate )
diff --git a/kttsd/app-plugins/kate/CMakeLists.txt b/kttsd/app-plugins/kate/CMakeLists.txt
new file mode 100644
index 0000000..ac7f001
--- /dev/null
+++ b/kttsd/app-plugins/kate/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdetexteditor_kttsd (kpart)
+
+tde_add_kpart( tdetexteditor_kttsd AUTOMOC
+
+  SOURCES
+        katekttsd.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdetexteditor-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES tdetexteditor_kttsdui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_kttsd
+)
+
+tde_create_translated_desktop(
+    SOURCE tdetexteditor_kttsd.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/filters/CMakeLists.txt b/kttsd/filters/CMakeLists.txt
new file mode 100644
index 0000000..719a243
--- /dev/null
+++ b/kttsd/filters/CMakeLists.txt
@@ -0,0 +1,41 @@
+add_subdirectory( stringreplacer )
+add_subdirectory( xmltransformer )
+add_subdirectory( sbd            )
+add_subdirectory( talkerchooser  )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### testfilter (test)
+
+tde_add_check_executable( testfilter AUTOMOC
+
+  SOURCES
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kttsd-shared
+  TEST
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_filterplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/kttsd/filters/sbd/CMakeLists.txt b/kttsd/filters/sbd/CMakeLists.txt
new file mode 100644
index 0000000..d81162c
--- /dev/null
+++ b/kttsd/filters/sbd/CMakeLists.txt
@@ -0,0 +1,43 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_sbdplugin (kpart)
+
+tde_add_kpart( libkttsd_sbdplugin AUTOMOC
+
+  SOURCES
+        sbdconfwidget.ui
+        sbdproc.cpp
+        sbdconf.cpp
+        sbdplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_sbdplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES standard_sbdrc polish_festival_sbdrc
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/sbd
+)
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index 3c8bcff..8eada8a 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -348,16 +348,8 @@
     <tabstop>appIdLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/stringreplacer/CMakeLists.txt b/kttsd/filters/stringreplacer/CMakeLists.txt
new file mode 100644
index 0000000..1b9d5f9
--- /dev/null
+++ b/kttsd/filters/stringreplacer/CMakeLists.txt
@@ -0,0 +1,47 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_stringreplacerplugin (kpart)
+
+tde_add_kpart( libkttsd_stringreplacerplugin AUTOMOC
+
+  SOURCES
+        stringreplacerconfwidget.ui
+        editreplacementwidget.ui
+        stringreplacerconf.cpp
+        stringreplacerproc.cpp
+        stringreplacerplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_stringreplacerplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+
+file( GLOB _xmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xml )
+
+install(
+    FILES ${_xmls}
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/stringreplacer
+)
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index 8c61932..2424f75 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -255,9 +255,8 @@
     <tabstop>substLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index f1e58d7..50b8c35 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -458,17 +458,9 @@
     <tabstop>appIdLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/talkerchooser/CMakeLists.txt b/kttsd/filters/talkerchooser/CMakeLists.txt
new file mode 100644
index 0000000..701efec
--- /dev/null
+++ b/kttsd/filters/talkerchooser/CMakeLists.txt
@@ -0,0 +1,44 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_talkerchooserplugin (kpart)
+
+tde_add_kpart( libkttsd_talkerchooserplugin AUTOMOC
+
+  SOURCES
+        talkerchooserconfwidget.ui
+        talkerchooserconf.cpp
+        talkerchooserproc.cpp
+        talkerchooserplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_talkerchooserplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES female_notifications_rc
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/talkerchooser
+)
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index a66c2bc..f163922 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -305,15 +305,8 @@
     <tabstop>appIdLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/xmltransformer/CMakeLists.txt b/kttsd/filters/xmltransformer/CMakeLists.txt
new file mode 100644
index 0000000..50eedce
--- /dev/null
+++ b/kttsd/filters/xmltransformer/CMakeLists.txt
@@ -0,0 +1,43 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_xmltransformerplugin (kpart)
+
+tde_add_kpart( libkttsd_xmltransformerplugin AUTOMOC
+
+  SOURCES
+        xmltransformerconfwidget.ui
+        xmltransformerconf.cpp
+        xmltransformerproc.cpp
+        xmltransformerplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_xmltransformerplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES xhtml2ssml.xsl xhtml2ssml_simple.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/xmltransformer
+)
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index 89d5c7c..ecb6d3b 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -234,16 +234,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/kttsd/icons/CMakeLists.txt b/kttsd/icons/CMakeLists.txt
new file mode 100644
index 0000000..643654c
--- /dev/null
+++ b/kttsd/icons/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons()
diff --git a/kttsd/kcmkttsmgr/CMakeLists.txt b/kttsd/kcmkttsmgr/CMakeLists.txt
new file mode 100644
index 0000000..bb2be6d
--- /dev/null
+++ b/kttsd/kcmkttsmgr/CMakeLists.txt
@@ -0,0 +1,46 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kcm_kttsd (kpart)
+
+tde_add_kpart( kcm_kttsd MODULE AUTOMOC
+
+  SOURCES
+        kcmkttsmgrwidget.ui
+        addtalkerwidget.ui
+        selecteventwidget.ui
+        kcmkttsmgr.cpp
+        addtalker.cpp
+        selectevent.cpp
+  LINK
+     tdeio-shared
+     kttsd-shared
+     DUMMY_kspeech_lib-static
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kcmkttsd_testmessage.desktop
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd
+)
+
+tde_create_translated_desktop( kcmkttsd.desktop )
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index ae48c61..4597a90 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -253,8 +253,7 @@
     <tabstop>languageRadioButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index 0a4307c..13114de 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -1884,9 +1884,15 @@
     <tabstop>keepAudioPath</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="global" impldecl="in implementation">kdebug.h</include>
+    <include location="global" impldecl="in implementation">tdecmodule.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>configChanged()</signal>
@@ -1895,34 +1901,4 @@
     <slot access="private">slotConfigChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="6"/>
-<includehints>
-    <includehint>tdecmodule.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui
index 3d4281f..14df075 100644
--- a/kttsd/kcmkttsmgr/selecteventwidget.ui
+++ b/kttsd/kcmkttsmgr/selecteventwidget.ui
@@ -56,7 +56,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kttsd/kttsd/CMakeLists.txt b/kttsd/kttsd/CMakeLists.txt
new file mode 100644
index 0000000..78657f0
--- /dev/null
+++ b/kttsd/kttsd/CMakeLists.txt
@@ -0,0 +1,116 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### kttsd_kspeech
+
+set( KSPEECH_KIDL kspeech.kidl )
+set( KSPEECH_SKEL kspeech_skel )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeech.h > ${KSPEECH_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeech.h
+)
+add_custom_target( kttsd-kspeech-kidl DEPENDS ${KSPEECH_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_SKEL}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KSPEECH_KIDL}
+    DEPENDS kttsd-kspeech-kidl
+)
+add_custom_target( kttsd-kspeech-skel DEPENDS ${KSPEECH_SKEL}.cpp )
+
+
+###### kttsd_kspeechsink
+
+set( KSPEECHSINK_KIDL kspeechsink.kidl )
+set( KSPEECHSINK_STUB kspeechsink_stub )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeechsink.h > ${KSPEECHSINK_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeechsink.h
+)
+add_custom_target( kttsd-kspeechsink-kidl DEPENDS ${KSPEECHSINK_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_STUB}.h
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-skel ${KSPEECHSINK_KIDL}
+    DEPENDS kttsd-kspeechsink-kidl
+)
+add_custom_target( kttsd-kspeechsink-stub DEPENDS ${KSPEECHSINK_STUB}.h )
+
+
+##### kttsd
+
+set( KTTSD_KIDL kttsd.kidl )
+set( KTTSD_SKEL kttsd_skel )
+
+add_custom_command(
+    OUTPUT  ${KTTSD_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/kttsd/kttsd/kttsd.h > ${KTTSD_KIDL}
+    DEPENDS ${CMAKE_SOURCE_DIR}/kttsd/kttsd/kttsd.h
+)
+add_custom_target( kttsd-kidl DEPENDS ${KTTSD_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KTTSD_SKEL}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KTTSD_KIDL}
+    DEPENDS kttsd-kidl
+)
+add_custom_target( kttsd-skel DEPENDS ${KTTSD_SKEL}.cpp )
+
+
+##### kttsd (executable)
+
+tde_add_executable( kttsd AUTOMOC
+
+  SOURCES
+        ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECH_SKEL}.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${KTTSD_SKEL}.cpp
+        main.cpp
+        kttsd.cpp
+        speaker.cpp
+        speechdata.cpp
+        threadedplugin.cpp
+        ssmlconvert.cpp
+        filtermgr.cpp
+        talkermgr.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kttsd-shared
+     
+  DEPENDENCIES
+     kttsd-kspeech-skel
+     kttsd-kspeechsink-stub
+     kttsd-skel
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES SSMLtoPlainText.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/xslt
+)
+
+tde_create_translated_desktop(
+    SOURCE kttsd.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/kttsjobmgr/CMakeLists.txt b/kttsd/kttsjobmgr/CMakeLists.txt
new file mode 100644
index 0000000..cc67a4a
--- /dev/null
+++ b/kttsd/kttsjobmgr/CMakeLists.txt
@@ -0,0 +1,40 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsjobmgrpart (kpart)
+
+tde_add_kpart( libkttsjobmgrpart MODULE AUTOMOC
+
+  SOURCES
+        kttsjobmgr.cpp
+  LINK
+     tdeio-shared
+     tdeparts-shared
+     kttsd-shared
+     DUMMY_kspeech_lib-static
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsjobmgr.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/kttsmgr/CMakeLists.txt b/kttsd/kttsmgr/CMakeLists.txt
new file mode 100644
index 0000000..c5010ab
--- /dev/null
+++ b/kttsd/kttsmgr/CMakeLists.txt
@@ -0,0 +1,36 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kttsmgr (executable)
+
+tde_add_executable( kttsmgr AUTOMOC
+
+  SOURCES
+        kttsmgr.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeutils-shared
+     DUMMY_kspeech_lib-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop( kttsmgr.desktop )
diff --git a/kttsd/libkttsd/CMakeLists.txt b/kttsd/libkttsd/CMakeLists.txt
new file mode 100644
index 0000000..106e2fd
--- /dev/null
+++ b/kttsd/libkttsd/CMakeLists.txt
@@ -0,0 +1,47 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### kttsd (shared)
+
+tde_add_library( kttsd SHARED AUTOMOC
+
+  SOURCES
+        selecttalkerwidget.ui
+        pluginproc.cpp
+        pluginconf.cpp
+        testplayer.cpp
+        stretcher.cpp
+        talkercode.cpp
+        filterproc.cpp
+        filterconf.cpp
+        utils.cpp
+        selecttalkerdlg.cpp
+        notify.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+
+  VERSION 1.0.0
+     
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_synthplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index f2b8f00..b250f4a 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -560,13 +560,10 @@
     <tabstop>talkersListView</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index b9aaecd..3688667 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -174,7 +174,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
                     offers[0]->library().latin1(), this, offers[0]->library().latin1());
         else
             kdDebug() << "TestPlayer::createPlayerObject: Could not create factory." << endl;
-    }
+    } 
     if (player == 0)
         kdDebug() << "TestPlayer::createPlayerObject: Could not load " + plugInName +
             ".  Is TDEDIRS set correctly?" << endl;
@@ -207,3 +207,4 @@ TQString TestPlayer::makeSuggestedFilename()
     return PlugInConf::realFilePath(waveFile);
 }
 
+#include "player.moc"
diff --git a/kttsd/players/CMakeLists.txt b/kttsd/players/CMakeLists.txt
new file mode 100644
index 0000000..12cabb0
--- /dev/null
+++ b/kttsd/players/CMakeLists.txt
@@ -0,0 +1,12 @@
+tde_conditional_add_subdirectory( WITH_ARTS      artsplayer  )
+tde_conditional_add_subdirectory( WITH_AKODE     akodeplayer )
+tde_conditional_add_subdirectory( WITH_ALSA      alsaplayer  )
+tde_conditional_add_subdirectory( WITH_GSTREAMER gstplayer   )
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_audioplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/kttsd/players/akodeplayer/CMakeLists.txt b/kttsd/players/akodeplayer/CMakeLists.txt
new file mode 100644
index 0000000..f8a03f7
--- /dev/null
+++ b/kttsd/players/akodeplayer/CMakeLists.txt
@@ -0,0 +1,37 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_akodeplugin (kpart)
+
+tde_add_kpart( libkttsd_akodeplugin AUTOMOC
+
+  SOURCES
+        akodeplugin.cpp
+        akodeplayer.cpp
+  LINK
+     kttsd-shared
+     ${AKODE_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_akodeplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/akodeplayer/akodeplayer.cpp b/kttsd/players/akodeplayer/akodeplayer.cpp
index 13f6cf3..955bf1b 100644
--- a/kttsd/players/akodeplayer/akodeplayer.cpp
+++ b/kttsd/players/akodeplayer/akodeplayer.cpp
@@ -12,7 +12,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <kdebug.h>
 
diff --git a/kttsd/players/akodeplayer/akodeplayer.h b/kttsd/players/akodeplayer/akodeplayer.h
index c4c7c1c..d51d7fb 100644
--- a/kttsd/players/akodeplayer/akodeplayer.h
+++ b/kttsd/players/akodeplayer/akodeplayer.h
@@ -16,7 +16,10 @@
 #ifndef AKODEPLAYER_H
 #define AKODEPLAYER_H
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "kdeexportfix.h"
 
 #include <tqstring.h>
diff --git a/kttsd/players/alsaplayer/CMakeLists.txt b/kttsd/players/alsaplayer/CMakeLists.txt
new file mode 100644
index 0000000..155024f
--- /dev/null
+++ b/kttsd/players/alsaplayer/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${ALSA_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_alsaplugin (kpart)
+
+tde_add_kpart( libkttsd_alsaplugin AUTOMOC
+
+  SOURCES
+        alsaplugin.cpp
+        alsaplayer.cpp
+  LINK
+     kttsd-shared
+     ${ALSA_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_alsaplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp
index a840c0b..c67564d 100644
--- a/kttsd/players/alsaplayer/alsaplayer.cpp
+++ b/kttsd/players/alsaplayer/alsaplayer.cpp
@@ -24,18 +24,16 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ******************************************************************************/
 
+// AlsaPlayer includes.
+#include "alsaplayer.h"
+
 // #include <sys/wait.h>
 // System includes.
-#include <config.h>
-#if TIME_WITH_SYS_TIME
+#if defined(HAVE_SYS_TIME_H)
 # include <sys/time.h>
+#endif
+#if defined(TIME_WITH_SYS_TIME)
 # include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
 
 // TQt includes.
@@ -50,8 +48,6 @@
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 
-// AlsaPlayer includes.
-#include "alsaplayer.h"
 
 #if !defined(__GNUC__) || __GNUC__ >= 3
 #define ERR(...) do {\
diff --git a/kttsd/players/alsaplayer/alsaplayer.h b/kttsd/players/alsaplayer/alsaplayer.h
index deeff4b..73d2570 100644
--- a/kttsd/players/alsaplayer/alsaplayer.h
+++ b/kttsd/players/alsaplayer/alsaplayer.h
@@ -24,6 +24,10 @@
 #ifndef ALSAPLAYER_H
 #define ALSAPLAYER_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 // System includes.
 #include <alsa/asoundlib.h>
 #include <sys/poll.h>
@@ -36,7 +40,6 @@
 #include <tqmutex.h>
 
 // KDE includes.
-#include <config.h>
 #include <kdemacros.h>
 #include "kdeexportfix.h"
 #include <kurl.h>
diff --git a/kttsd/players/artsplayer/CMakeLists.txt b/kttsd/players/artsplayer/CMakeLists.txt
new file mode 100644
index 0000000..427f970
--- /dev/null
+++ b/kttsd/players/artsplayer/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${ARTS_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_artsplugin (kpart)
+
+tde_add_kpart( libkttsd_artsplugin AUTOMOC
+
+  SOURCES
+        artsplugin.cpp
+        artsplayer.cpp
+  LINK
+     kttsd-shared
+     ${ARTS_PLAYER_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_artsplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/artsplayer/artsplayer.h b/kttsd/players/artsplayer/artsplayer.h
index 99f3edc..edae1fc 100644
--- a/kttsd/players/artsplayer/artsplayer.h
+++ b/kttsd/players/artsplayer/artsplayer.h
@@ -19,7 +19,10 @@
 #ifndef ARTSPLAYER_H
 #define ARTSPLAYER_H
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <kdemacros.h>
 #include "kdeexportfix.h"
 
diff --git a/kttsd/players/gstplayer/CMakeLists.txt b/kttsd/players/gstplayer/CMakeLists.txt
new file mode 100644
index 0000000..1aa4e64
--- /dev/null
+++ b/kttsd/players/gstplayer/CMakeLists.txt
@@ -0,0 +1,39 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${GSTREAMER_INCLUDE_DIRS}
+  ${GLIB2_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_gstplugin (kpart)
+
+tde_add_kpart( libkttsd_gstplugin AUTOMOC
+
+  SOURCES
+        gstplugin.cpp
+        gstreamerplayer.cpp
+  LINK
+     kttsd-shared
+     ${GSTREAMER_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_gstplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/gstplayer/gstreamerplayer.h b/kttsd/players/gstplayer/gstreamerplayer.h
index 27cd329..fd8baf7 100644
--- a/kttsd/players/gstplayer/gstreamerplayer.h
+++ b/kttsd/players/gstplayer/gstreamerplayer.h
@@ -15,7 +15,9 @@
 #ifndef GSTREAMERPLAYER_H
 #define GSTREAMERPLAYER_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <glib.h>
 extern "C" {
diff --git a/kttsd/plugins/CMakeLists.txt b/kttsd/plugins/CMakeLists.txt
new file mode 100644
index 0000000..dc615ab
--- /dev/null
+++ b/kttsd/plugins/CMakeLists.txt
@@ -0,0 +1,6 @@
+tde_conditional_add_subdirectory( BUILD_KTTSD_COMMAND  command     )
+tde_conditional_add_subdirectory( BUILD_KTTSD_EPOS     epos        )
+tde_conditional_add_subdirectory( BUILD_KTTSD_FESTIVAL festivalint )
+tde_conditional_add_subdirectory( BUILD_KTTSD_FREETTS  freetts     )
+tde_conditional_add_subdirectory( BUILD_KTTSD_FLITE    flite       )
+tde_conditional_add_subdirectory( BUILD_KTTSD_HADIFIX  hadifix     )
diff --git a/kttsd/plugins/command/CMakeLists.txt b/kttsd/plugins/command/CMakeLists.txt
new file mode 100644
index 0000000..bb16d23
--- /dev/null
+++ b/kttsd/plugins/command/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_commandplugin (kpart)
+
+tde_add_kpart( libkttsd_commandplugin AUTOMOC
+
+  SOURCES
+        commandconfwidget.ui
+        commandconf.cpp
+        commandproc.cpp
+        commandplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_commandplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 75ce080..64d804c 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -218,10 +218,4 @@
     <signal>configurationChanged()</signal>
 </Q_SIGNALS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/epos/CMakeLists.txt b/kttsd/plugins/epos/CMakeLists.txt
new file mode 100644
index 0000000..7111386
--- /dev/null
+++ b/kttsd/plugins/epos/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_eposplugin (kpart)
+
+tde_add_kpart( libkttsd_eposplugin AUTOMOC
+
+  SOURCES
+        eposconfwidget.ui
+        eposconf.cpp
+        eposproc.cpp
+        eposplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_eposplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index c66a081..f93ed72 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -593,18 +593,10 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/festivalint/CMakeLists.txt b/kttsd/plugins/festivalint/CMakeLists.txt
new file mode 100644
index 0000000..3243c05
--- /dev/null
+++ b/kttsd/plugins/festivalint/CMakeLists.txt
@@ -0,0 +1,48 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_festivalintplugin (kpart)
+
+tde_add_kpart( libkttsd_festivalintplugin AUTOMOC
+
+  SOURCES
+        festivalintconfwidget.ui
+        festivalintconf.cpp
+        festivalintproc.cpp
+        festivalintplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_festivalintplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES SSMLtoSable.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/festivalint/xslt
+)
+
+install(
+    FILES voices sabletowave.scm
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/festivalint
+)
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index 76a570f..c740eaf 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -581,18 +581,10 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/flite/CMakeLists.txt b/kttsd/plugins/flite/CMakeLists.txt
new file mode 100644
index 0000000..4c67af0
--- /dev/null
+++ b/kttsd/plugins/flite/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_fliteplugin (kpart)
+
+tde_add_kpart( libkttsd_fliteplugin AUTOMOC
+
+  SOURCES
+        fliteconfwidget.ui
+        fliteconf.cpp
+        fliteproc.cpp
+        fliteplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_fliteplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index 8efcbb1..ef90e54 100644
--- a/kttsd/plugins/flite/fliteconfwidget.ui
+++ b/kttsd/plugins/flite/fliteconfwidget.ui
@@ -175,12 +175,8 @@
 </customwidgets>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/freetts/CMakeLists.txt b/kttsd/plugins/freetts/CMakeLists.txt
new file mode 100644
index 0000000..c98f2ec
--- /dev/null
+++ b/kttsd/plugins/freetts/CMakeLists.txt
@@ -0,0 +1,37 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_freettsplugin (kpart)
+
+tde_add_kpart( libkttsd_freettsplugin AUTOMOC
+
+  SOURCES
+        freettsconfigwidget.ui
+        freettsconf.cpp
+        freettsproc.cpp
+        freettsplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_freettsplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index e93f3ba..91d9988 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -189,12 +189,8 @@
 </customwidgets>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/hadifix/CMakeLists.txt b/kttsd/plugins/hadifix/CMakeLists.txt
new file mode 100644
index 0000000..3372b5e
--- /dev/null
+++ b/kttsd/plugins/hadifix/CMakeLists.txt
@@ -0,0 +1,45 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_hadifixplugin (kpart)
+
+tde_add_kpart( libkttsd_hadifixplugin AUTOMOC
+
+  SOURCES
+        hadifixconfigui.ui
+        voicefileui.ui
+        hadifixconf.cpp
+        hadifixproc.cpp
+        hadifixplugin.cpp
+  LINK
+     tdecore-shared
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_hadifixplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES SSMLtoTxt2pho.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/hadifix/xslt
+)
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index 367200c..4baf158 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -640,6 +640,11 @@
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">math.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <forwards>
     <forward>class TQStringList;</forward>
@@ -674,19 +679,4 @@
     <function specifier="non virtual" returnType="bool">isMaleVoice()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui
index c333670..19c63a4 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui
+++ b/kttsd/plugins/hadifix/voicefileui.ui
@@ -100,6 +100,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kurlrequesterdlg.h</include>
     <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="local" impldecl="in implementation">hadifixproc.h</include>
     <include location="local" impldecl="in implementation">voicefileui.ui.h</include>
 </includes>
@@ -110,10 +113,4 @@
     <slot>genderButton_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>