diff --git a/kioslave/ldap/CMakeLists.txt b/kioslave/ldap/CMakeLists.txt
index 988aa6383..7c4905759 100644
--- a/kioslave/ldap/CMakeLists.txt
+++ b/kioslave/ldap/CMakeLists.txt
@@ -1,53 +1,53 @@
 kde4_header()
 
 project(kioslave-ldap)
-include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
 
 set(kio_ldap_PART_SRCS kio_ldap.cpp )
 
 kde4_automoc(${kio_ldap_PART_SRCS})
 
 kde4_add_plugin(kio_ldap ${kio_ldap_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kio_ldap )
 
 target_link_libraries(kio_ldap  ${KDE4_KIO_LIBS} kabc ${LDAP_LIBRARIES} ${LBER_LIBRARIES} )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kio_ldap )
 
 
 ########### install files ###############
 
 install_files( ${SERVICES_INSTALL_DIR} FILES ldap.protocol ldaps.protocol )
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 ### Makefile.am of kdebase/kioslave/ldap
 #
 #INCLUDES   = $(all_includes) $(LDAP_INCS)
 #AM_CXXFLAGS = -DLDAP_DEPRECATED
 #AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH)
 #LDADD      = $(LIB_KIO) $(LDAP_LIBS)
 #
 ######## Files
 #
 #kde_module_LTLIBRARIES = kio_ldap.la
 #
 #kio_ldap_la_SOURCES = kio_ldap.cpp
 #kio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC)
 #kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
 #
 #noinst_HEADERS = kio_ldap.h
 #
 #kdelnk_DATA = ldap.protocol ldaps.protocol
 #kdelnkdir = $(kde_servicesdir)
 #
 #messages:
 #	$(XGETTEXT) *.cpp -o $(podir)/kio_ldap.pot
diff --git a/kioslave/nntp/CMakeLists.txt b/kioslave/nntp/CMakeLists.txt
index 71d8fe4d7..b50e8d469 100644
--- a/kioslave/nntp/CMakeLists.txt
+++ b/kioslave/nntp/CMakeLists.txt
@@ -1,50 +1,50 @@
 kde4_header()
 
 project(kioslave-nntp)
-include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
 
 set(kio_nntp_PART_SRCS nntp.cpp )
 
 kde4_automoc(${kio_nntp_PART_SRCS})
 
 kde4_add_plugin(kio_nntp ${kio_nntp_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kio_nntp )
 
 target_link_libraries(kio_nntp  ${KDE4_KIO_LIBS}  )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kio_nntp )
 
 
 ########### install files ###############
 
 install_files( ${SERVICES_INSTALL_DIR} FILES nntp.protocol nntps.protocol )
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 #INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
 #
 ######## Files
 #
 #kde_module_LTLIBRARIES = kio_nntp.la
 #
 #kio_nntp_la_SOURCES = nntp.cpp
 #kio_nntp_la_LIBADD  = $(LIB_KIO)
 #kio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 #
 #METASOURCES = AUTO
 #
 #noinst_HEADERS = nntp.h
 #
 #kdelnk_DATA = nntp.protocol nntps.protocol
 #kdelnkdir = $(kde_servicesdir)
 #
 #messages:
 #	$(XGETTEXT) *.cpp -o $(podir)/kio_nntp.pot
diff --git a/kioslave/pop3/CMakeLists.txt b/kioslave/pop3/CMakeLists.txt
index 054241f52..9d225de00 100644
--- a/kioslave/pop3/CMakeLists.txt
+++ b/kioslave/pop3/CMakeLists.txt
@@ -1,56 +1,56 @@
 kde4_header()
 
 project(kioslave-pop3)
 
 macro_optional_find_package(Sasl2)
 
 set(pop3_optional_includes)
 set(pop3_optional_libs)
 IF(SASL2_FOUND)
   set(pop3_optional_includes ${pop3_optional_includes} ${SASL2_INCLUDE_DIR})
   set(pop3_optional_libs     ${pop3_optional_libs}     ${SASL2_LIBRARIES})
 ENDIF(SASL2_FOUND)
-include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${pop3_optional_includes} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${pop3_optional_includes} ${KDE4_INCLUDES} )
 
 ########### next target ###############
 
 set(kio_pop3_PART_SRCS pop3.cc )
 
 kde4_automoc(${kio_pop3_PART_SRCS})
 
 kde4_add_plugin(kio_pop3 ${kio_pop3_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kio_pop3 )
 
 target_link_libraries(kio_pop3  ${KDE4_KIO_LIBS} ${pop3_optional_libs})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kio_pop3 )
 
 
 ########### install files ###############
 
 install_files( ${SERVICES_INSTALL_DIR} FILES pop3.protocol pop3s.protocol )
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 #INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 #
 ######## Files
 #
 #kde_module_LTLIBRARIES = kio_pop3.la
 #
 #kio_pop3_la_SOURCES = pop3.cc
 #kio_pop3_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
 #kio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 #
 #noinst_HEADERS = pop3.h
 #
 #kdelnk_DATA = pop3.protocol pop3s.protocol
 #kdelnkdir = $(kde_servicesdir)
 #
 #messages:
 #	$(XGETTEXT) *.cc -o $(podir)/kio_pop3.pot
diff --git a/kioslave/smtp/CMakeLists.txt b/kioslave/smtp/CMakeLists.txt
index 84cb10445..4886f86c2 100644
--- a/kioslave/smtp/CMakeLists.txt
+++ b/kioslave/smtp/CMakeLists.txt
@@ -1,138 +1,138 @@
 kde4_header()
 
 project(kioslave-smtp)
 
 macro_optional_find_package(Sasl2)
 
 set(smtp_optional_includes)
 set(smtp_optional_libs)
 IF(SASL2_FOUND)
   set(smtp_optional_includes ${smtp_optional_includes} ${SASL2_INCLUDE_DIR})
   set(smtp_optional_libs     ${smtp_optional_libs}     ${SASL2_LIBRARIES})
 ENDIF(SASL2_FOUND)
-include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${smtp_optional_includes} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${smtp_optional_includes} ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
 
 set(kio_smtp_PART_SRCS 
    smtp.cc 
    request.cc 
    response.cc 
    capabilities.cc 
    command.cc 
    transactionstate.cc )
 
 kde4_automoc(${kio_smtp_PART_SRCS})
 
 kde4_add_plugin(kio_smtp ${kio_smtp_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kio_smtp )
 
 target_link_libraries(kio_smtp  ${KDE4_KIO_LIBS} ${smtp_optional_libs})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kio_smtp )
 
 ########### next target ###############
 
 set(test_responseparser_SRCS test_responseparser.cc )
 
 kde4_automoc(test_responseparser_SRCS})
 
 if(KDE4_BUILD_TESTS)
 
 kde4_add_executable(test_responseparser ${test_responseparser_SRCS})
 
 target_link_libraries(test_responseparser  ${KDE4_KDECORE_LIBS} )
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 set(test_headergeneration_SRCS test_headergeneration.cc )
 
 kde4_automoc(test_headergeneration_SRCS})
 
 if(KDE4_BUILD_TESTS)
 
 kde4_add_executable(test_headergeneration ${test_headergeneration_SRCS})
 
 target_link_libraries(test_headergeneration  ${KDE4_KDECORE_LIBS} )
 
 endif(KDE4_BUILD_TESTS)
 
 
 
 ########### next target ###############
 set(test_commands_SRCS test_commands.cc )
 
 kde4_automoc(test_commands_SRCS})
 
 if(KDE4_BUILD_TESTS)
 
 kde4_add_executable(test_commands ${test_commands_SRCS})
 
 target_link_libraries(test_commands  ${KDE4_KDECORE_LIBS} )
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
 set(interactivesmtpserver_SRCS interactivesmtpserver.cc )
 
 kde4_automoc(${interactivesmtpserver_SRCS})
 
 if(KDE4_BUILD_TESTS)
 
 kde4_add_executable(interactivesmtpserver ${interactivesmtpserver_SRCS})
 
 target_link_libraries(interactivesmtpserver  ${KDE4_KDECORE_LIBS} )
 
 endif(KDE4_BUILD_TESTS)
 
 ########### install files ###############
 
 install_files( ${SERVICES_INSTALL_DIR} FILES smtp.protocol smtps.protocol )
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 #
 #INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 #
 #kde_module_LTLIBRARIES = kio_smtp.la
 #
 #kio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
 #kio_smtp_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
 #kio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 #
 #noinst_HEADERS = smtp.h request.h response.h capabilities.h command.h transactionstate.h
 #
 #kdelnk_DATA = smtp.protocol smtps.protocol
 #kdelnkdir = $(kde_servicesdir)
 #
 #TESTS = test_headergeneration test_responseparser test_commands
 #
 #check_PROGRAMS = $(TESTS) interactivesmtpserver
 #
 #test_headergeneration_SOURCES = test_headergeneration.cc
 #test_headergeneration_LDADD =  $(LIB_KDECORE)
 #test_headergeneration_LDFLAGS = $(all_libraries)
 #
 #test_responseparser_SOURCES = test_responseparser.cc
 #test_responseparser_LDADD =  $(LIB_KDECORE)
 #test_responseparser_LDFLAGS = $(all_libraries)
 #
 #test_commands_SOURCES = test_commands.cc
 #test_commands_LDADD =  $(kio_smtp_la_LIBADD)
 #test_commands_LDFLAGS = $(all_libraries)
 #
 #interactivesmtpserver_SOURCES = interactivesmtpserver.cc
 #interactivesmtpserver_LDADD = $(LIB_QT)
 #interactivesmtpserver_LDFLAGS = $(all_libraries)
 #interactivesmtpserver_METASOURCES = AUTO
 #
 #messages:
 #	$(XGETTEXT) *.cc -o $(podir)/kio_smtp.pot