diff --git a/CMakeLists.txt b/CMakeLists.txt
index d37a07b2..a1545fd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,36 +1,37 @@
 cmake_minimum_required (VERSION 3.0)
 
 project (kdenetwork)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
 find_package(KDE1 REQUIRED)
 #find_package(uulib REQUIRED)
 
 add_definitions(-DHAVE_CONFIG_H)
 
 include_directories(common)
 
 include(CMakePackageConfigHelpers)
+include(Qt1Macros)
 include(KDE1Macros)
 include(KDE1InstallDirs)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-write-strings")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -std=c++98")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 endif()
 
 #add_subdirectory(karchie)
 add_subdirectory(kbiff)
 add_subdirectory(kfinger)
 add_subdirectory(kmail)
 add_subdirectory(knu)
 add_subdirectory(korn)
 #add_subdirectory(kppp)
 #add_subdirectory(krn)
 #add_subdirectory(ksirc)
 #add_subdirectory(ktalkd)
 add_subdirectory(mimelib)
 add_subdirectory(po)
diff --git a/kbiff/CMakeLists.txt b/kbiff/CMakeLists.txt
index 92c2c1bc..4b3c3307 100644
--- a/kbiff/CMakeLists.txt
+++ b/kbiff/CMakeLists.txt
@@ -1,33 +1,32 @@
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
 )
 
 set(KBIFF_SRCS
     setupdlg.cpp kbiff.cpp main.cpp kbiffmonitor.cpp notify.cpp  Trace.cpp
     kbiffurl.cpp status.cpp
 )
 
 set(KBIFF_MOC
     kbiffmonitor.moc setupdlg.moc kbiff.moc notify.moc status.moc
 )
 
 QT1_WRAP_MOC(MOC_FILES ${KBIFF_MOC})
 
 add_executable(kbiff ${KBIFF_SRCS} ${MOC_FILES})
 target_link_libraries(kbiff
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
     ${KDE1_KFILE}
     ${KDE1_MEDIATOOL}
 )
 
 install(TARGETS kbiff RUNTIME DESTINATION ${KDE1_BINDIR})
 install(FILES kbiff.kdelnk DESTINATION ${KDE1_APPSDIR}/Internet)
 
 install_icon(kbiff.xpm)
diff --git a/kfinger/CMakeLists.txt b/kfinger/CMakeLists.txt
index bb671bdc..ff87f048 100644
--- a/kfinger/CMakeLists.txt
+++ b/kfinger/CMakeLists.txt
@@ -1,24 +1,23 @@
 add_subdirectory(toolbar)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
 )
 
 set(KFINGER_SRCS finger.C kfinger.C)
 
 set(KFINGER_MOC finger.moc kfinger.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KFINGER_MOC})
 
 add_executable(kfinger ${KFINGER_SRCS} ${MOC_FILES})
 target_link_libraries(kfinger
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
 )
 
 install(TARGETS kfinger RUNTIME DESTINATION ${KDE1_BINDIR})
 install(FILES kfinger.kdelnk DESTINATION ${KDE1_APPSDIR}/Internet)
 install(FILES kfingerrc DESTINATION ${KDE1_CONFDIR})
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 4a40d1ff..3c6f2932 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -1,51 +1,50 @@
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
 )
 
 set(KMAIL_SRCS
     charsetsDlg.cpp kalarmtimer.cpp kbusyptr.cpp kfileio.cpp kfontutils.cpp
     kmaccount.cpp kmacctfolder.cpp kmacctlocal.cpp kmacctmgr.cpp kmacctpop.cpp
     kmacctseldlg.cpp kmaddrbook.cpp kmaddrbookdlg.cpp kmcomposewin.cpp
     kmfilteraction.cpp kmfilter.cpp kmfilterdlg.cpp kmfiltermgr.cpp kmfolder.cpp
     kmfolderdia.cpp kmfolderdir.cpp kmfoldermgr.cpp kmfoldernode.cpp
     kmfolderseldlg.cpp kmfoldertree.cpp kmheaders.cpp kmidentity.cpp kmimemagic.cpp
     kmiostatusdlg.cpp kmmainwin.cpp kmmessage.cpp kmmsgbase.cpp kmmsginfo.cpp
     kmmsglist.cpp kmmsgpart.cpp kmmsgpartdlg.cpp kmnewiostatus.cpp
     kmnewiostatuswdg.cpp kmreaderwin.cpp kmsender.cpp kmsettings.cpp
     kmtopwidget.cpp kpgpbase.cpp kpgp.cpp main.cpp
 )
 
 set(KMAIL_MOC
     charsetsDlg.moc kalarmtimer.moc kbusyptr.moc kmaccount.moc
     kmacctmgr.moc kmacctpop.moc kmacctseldlg.moc kmaddrbookdlg.moc
     kmcomposewin.moc kmfilteraction.moc kmfilterdlg.moc kmfolderdia.moc
     kmfolderdir.moc kmfolder.moc kmfoldermgr.moc kmfoldernode.moc
     kmfolderseldlg.moc kmfoldertree.moc kmheaders.moc kmiostatusdlg.moc
     kmmainwin.moc kmmsgbase.moc kmmsgpartdlg.moc kmnewiostatus.moc
     kmnewiostatuswdg.moc kmreaderwin.moc kmsender.moc kmsettings.moc
     kmtopwidget.moc kpgp.moc
 )
 
 QT1_WRAP_MOC(MOC_FILES ${KMAIL_MOC})
 
 add_executable(kmail ${KMAIL_SRCS} ${MOC_FILES})
 target_link_libraries(kmail
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KHTMLW}
     ${KDE1_KFILE}
     ${KDE1_JSCRIPT}
     ${KDE1_KFM}
     ${KDE1_KIMGIO}
     ${KDE1_KSPELL}
     mimelib
 )
 
 install(TARGETS kmail RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install(FILES KMail.kdelnk DESTINATION ${KDE1_APPSDIR}/Internet)
diff --git a/knu/CMakeLists.txt b/knu/CMakeLists.txt
index 79d3569b..ae3d5347 100644
--- a/knu/CMakeLists.txt
+++ b/knu/CMakeLists.txt
@@ -1,28 +1,27 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
 )
 
 set(KNU_SRCS CommandDlg.cpp FingerDlg.cpp HostDlg.cpp knu.cpp
     MtrDlg.cpp OptionsDlg.cpp PingDlg.cpp TracerouteDlg.cpp
 )
 
 set(KNU_MOC CommandDlg.moc FingerDlg.moc HostDlg.moc knu.moc
     MtrDlg.moc OptionsDlg.moc PingDlg.moc TracerouteDlg.moc
 )
 
 QT1_WRAP_MOC(MOC_FILES ${KNU_MOC})
 
 add_executable(knu ${KNU_SRCS} ${MOC_FILES})
 target_link_libraries(knu
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFILE}
     ${KDE1_KFM}
 )
 
 install(TARGETS knu RUNTIME DESTINATION ${KDE1_BINDIR})
 install(FILES knu.kdelnk DESTINATION ${KDE1_APPSDIR}/Internet)
 install_icon(knu.xpm)
diff --git a/korn/CMakeLists.txt b/korn/CMakeLists.txt
index 025e25b7..7b58cdf0 100644
--- a/korn/CMakeLists.txt
+++ b/korn/CMakeLists.txt
@@ -1,26 +1,25 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
 )
 
 set(KORN_SRCS kmailbox.cpp kornbutt.cpp korn.cpp kornopt.cpp kornset.cpp
     main.cpp optdata.cpp real_from.cpp
 )
 
 set(KORN_MOC kmailbox.moc kornbutt.moc korn.moc kornopt.moc optdata.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KORN_MOC})
 
 add_executable(korn ${KORN_SRCS} ${MOC_FILES})
 target_link_libraries(korn
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
 )
 
 install(TARGETS korn RUNTIME DESTINATION ${KDE1_BINDIR})
 install(FILES KOrn.kdelnk DESTINATION ${KDE1_APPSDIR}/Internet)
 install_icon(korn.xpm)
 
 
diff --git a/mimelib/CMakeLists.txt b/mimelib/CMakeLists.txt
index 2d53921c..59a243f3 100644
--- a/mimelib/CMakeLists.txt
+++ b/mimelib/CMakeLists.txt
@@ -1,21 +1,19 @@
-include_directories(
-    ${QT_INCLUDE_DIR}
-)
 
 set(MIMELIB_SRCS
     address.cpp addrlist.cpp attach.cpp basicmsg.cpp
     binhex.cpp body.cpp bodypart.cpp boyermor.cpp
     datetime.cpp disptype.cpp dw_cte.cpp dw_date.cpp
     dw_mime.cpp entity.cpp fieldbdy.cpp field.cpp
     group.cpp headers.cpp mailbox.cpp mboxlist.cpp
     mediatyp.cpp mechansm.cpp message.cpp msgcmp.cpp
     msgid.cpp multipar.cpp nntp.cpp param.cpp pop.cpp
     protocol.cpp smtp.cpp string.cpp text.cpp token.cpp
     uuencode.cpp
     )
 
 add_library(mimelib SHARED ${MIMELIB_SRCS})
+target_link_libraries(mimelib Qt::Qt1)
 set_target_properties(mimelib PROPERTIES VERSION 1.0 SOVERSION 1)
 install(TARGETS mimelib LIBRARY DESTINATION ${KDE1_LIBDIR})
 
 install(DIRECTORY mimelib DESTINATION ${KDE1_INCLUDES})