diff --git a/CMakeLists.txt b/CMakeLists.txt
index bba6085..b5dcfb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,19 +275,6 @@ if(ENABLE_GNUTLS)
   endif()
 endif()
 
-# Check for PAM library
-if(UNIX AND NOT APPLE)
-  check_include_files(security/pam_appl.h HAVE_PAM_H)
-  set(CMAKE_REQUIRED_LIBRARIES -lpam)
-  check_function_exists(pam_start HAVE_PAM_START)
-  set(CMAKE_REQUIRED_LIBRARIES)
-  if(HAVE_PAM_H AND HAVE_PAM_START)
-    set(PAM_LIBS pam)
-  else()
-    message(FATAL_ERROR "Could not find PAM development files")
-  endif()
-endif()
-
 # Generate config.h and make sure the source finds it
 configure_file(config.h.in config.h)
 add_definitions(-DHAVE_CONFIG_H)
@@ -315,9 +302,6 @@ if(BUILD_VIEWER)
   add_subdirectory(media)
 endif()
 
-add_subdirectory(tests)
-
-
 if(BUILD_VIEWER)
   add_subdirectory(release)
 endif()
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index fc5a37b..d3fd783 100644
--- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt
@@ -75,12 +75,6 @@ endif(WIN32)
 
 set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
 
-if(UNIX AND NOT APPLE)
-  set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
-    UnixPasswordValidator.h pam.c pam.h)
-  set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
-endif()
-
 if(GNUTLS_FOUND)
   set(RFB_SOURCES
     ${RFB_SOURCES}
diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt
index 5456e00..09ac599 100644
--- a/unix/CMakeLists.txt
+++ b/unix/CMakeLists.txt
@@ -1,6 +1,3 @@
 add_subdirectory(tx)
 add_subdirectory(common)
-add_subdirectory(vncconfig)
 add_subdirectory(vncpasswd)
-add_subdirectory(vncserver)
-add_subdirectory(x0vncserver)