diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 3fe1484..eb5f00e 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -33,6 +33,7 @@ endif( WITH_GCC_VISIBILITY )
 unset( COMPILE_NO_X )
 unset( COMPILE_NO_X_BELL )
 unset( COMPILE_ON_WINDOWS )
+pkg_search_module( X11 x11 REQUIRED )
 
 
 ##### build with TDE integration
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 5b5b36b..4c37519 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -12,17 +12,17 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${X11_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
+  ${X11_LIBRARY_DIRS}
 )
 
 if( WITH_TDE )
-  set( LINK_LIBRARIES tdecore-shared tdeui-shared tdeio-shared )
-else( )
-  set( LINK_LIBRARIES ${TQT_LIBRARIES} )
+  set( TDE_LIBRARIES tdecore-shared tdeui-shared tdeio-shared )
 endif( )
 
 tde_add_library( kvilib SHARED AUTOMOC
@@ -95,7 +95,8 @@ tde_add_library( kvilib SHARED AUTOMOC
     tal/kvi_tal_vbox.cpp
     tal/kvi_tal_widgetstack.cpp
     tal/kvi_tal_wizard.cpp
-  LINK ${LINK_LIBRARIES} ${CMAKE_DL_LIBS} ${SSL_LIBRARIES}
+  LINK ${CMAKE_DL_LIBS} ${SSL_LIBRARIES} ${TDE_LIBRARIES}
+    ${TQT_LIBRARIES} ${X11_LIBRARIES} ${ZLIB_LIBRARIES}
   VERSION 3.0.0
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES tde-includes
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index cd80567..40a654a 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -38,7 +38,6 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqdatetime.h>
-#include <tdestandarddirs.h>
 
 #include "config.h"
 
@@ -91,7 +90,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
 		case DefScript     : szData.append("defscript");                                               break;
 		case License       : szData.append("license");                                                 break;
 		case Filters       : szData.append("filters");                                                 break;
-		case Locale        : szData=locate("locale","");                                               break;
+		case Locale        : szData.append("locale");                                                  break;
 		case Tmp           : tqDebug("WARNING Global tmp directory requested!");                         break;
 		case Themes        : szData.append("themes");                                                  break;
 		case Classes       : szData.append("classes");                                                 break;
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 8a94def..57a13e9 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -705,7 +705,11 @@ void KviApp::loadDirectories()
 	// First find the global (readable) one...
 	findGlobalKvircDirectory();
 	// Init locale
-	TQString szLocalePath = locate("locale","");
+	TQString szLocalePath = m_szGlobalKvircDir;
+	szLocalePath.append(KVI_PATH_SEPARATOR);
+	szLocalePath.append("locale");
+	szLocalePath.append(KVI_PATH_SEPARATOR);
+
 	KviLocale::init(this,szLocalePath);
 
 	//__debug_1arg("Global Kvirc directory is %s",m_szGlobalKvircDir.ptr());
diff --git a/src/modules/dcc/gsmcodec.cpp b/src/modules/dcc/gsmcodec.cpp
index e5145f8..19f9f57 100644
--- a/src/modules/dcc/gsmcodec.cpp
+++ b/src/modules/dcc/gsmcodec.cpp
@@ -23,10 +23,11 @@
 #define _GSMCODEC_CPP_
 
 #include "gsmcodec.h"
-#include "gsm.h"
 
 #ifdef COMPILE_USE_GSM
 
+#include <gsm/gsm.h>
+
 #define GSM_PACKED_FRAME_SIZE_IN_BYTES 33
 #define GSM_UNPACKED_FRAME_SIZE_IN_BYTES 320
 #define GSM_UNPACKED_FRAME_SIZE_IN_SHORTS 160
diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt
index adf4a43..4715f2e 100644
--- a/src/modules/term/CMakeLists.txt
+++ b/src/modules/term/CMakeLists.txt
@@ -5,12 +5,16 @@ include_directories(
   ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
 )
 
+if( WITH_TDE )
+  set( TDE_LIBRARIES tdeparts-shared )
+endif( )
+
 
 ##### kviterm
 
 tde_add_kpart( libkviterm AUTOMOC
   SOURCES libkviterm.cpp termwidget.cpp termwindow.cpp
-  LINK kvirc-shared tdeparts-shared
+  LINK kvirc-shared ${TDE_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
 )