diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt
index 8633c3c456..7670d416f6 100644
--- a/remmina-plugins-gnome/CMakeLists.txt
+++ b/remmina-plugins-gnome/CMakeLists.txt
@@ -37,7 +37,7 @@ if(GNOMEKEYRING_FOUND)
 		src/gkeyring_plugin.c
 		)
 
-	add_library(remmina-plugins-gnome ${REMMINA_PLUGINS_GNOME_SRCS})
+	add_library(remmina-plugins-gnome MODULE ${REMMINA_PLUGINS_GNOME_SRCS})
 	set_target_properties(remmina-plugins-gnome PROPERTIES PREFIX "")
 	set_target_properties(remmina-plugins-gnome PROPERTIES NO_SONAME 1)
 
@@ -45,7 +45,7 @@ if(GNOMEKEYRING_FOUND)
 	target_link_libraries(remmina-plugins-gnome ${GTK_LIBRARY_DIRS})
 
 		include_directories(${GNOMEKEYRING_INCLUDE_DIRS})
-		target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES})
+		target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES} ${GLIB2_LIBRARY})
 
 	install(TARGETS remmina-plugins-gnome DESTINATION ${REMMINA_PLUGINDIR})
 endif()
diff --git a/remmina-plugins/CMakeLists.txt b/remmina-plugins/CMakeLists.txt
index a3c13cde57..72d29a322b 100644
--- a/remmina-plugins/CMakeLists.txt
+++ b/remmina-plugins/CMakeLists.txt
@@ -43,7 +43,7 @@ set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
 set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems")
 
 set(REMMINA_COMMON_INCLUDE_DIRS ${GTK_INCLUDE_DIRS})
-set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES})
+set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES} ${PTHREAD_LIBRARY})
 
 find_suggested_package(LIBSSH)
 if(LIBSSH_FOUND)
diff --git a/remmina-plugins/nx/CMakeLists.txt b/remmina-plugins/nx/CMakeLists.txt
index f0d15cf907..c33102db1e 100644
--- a/remmina-plugins/nx/CMakeLists.txt
+++ b/remmina-plugins/nx/CMakeLists.txt
@@ -44,8 +44,10 @@ add_library(remmina-plugin-nx ${REMMINA_PLUGIN_NX_SRCS})
 set_target_properties(remmina-plugin-nx PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-nx PROPERTIES NO_SONAME 1)
 
+find_package(X11)
+
 include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${XKBFILE_INCLUDE_DIRS} ${LIBSSH_INCLUDE_DIRS})
-target_link_libraries(remmina-plugin-nx ${REMMINA_COMMON_LIBRARIES} ${XKBFILE_LIBRARIES} ${LIBSSH_LIBRARIES})
+target_link_libraries(remmina-plugin-nx ${REMMINA_COMMON_LIBRARIES} ${XKBFILE_LIBRARIES} ${LIBSSH_LIBRARIES} ${X11_X11_LIB})
 
 install(TARGETS remmina-plugin-nx DESTINATION ${REMMINA_PLUGINDIR})
 
diff --git a/remmina-plugins/rdp/CMakeLists.txt b/remmina-plugins/rdp/CMakeLists.txt
index fe1e40d987..2c694c001c 100644
--- a/remmina-plugins/rdp/CMakeLists.txt
+++ b/remmina-plugins/rdp/CMakeLists.txt
@@ -58,7 +58,7 @@ add_definitions(-DFREERDP_REQUIRED_MAJOR=${FREERDP_REQUIRED_MAJOR})
 add_definitions(-DFREERDP_REQUIRED_MINOR=${FREERDP_REQUIRED_MINOR})
 add_definitions(-DFREERDP_REQUIRED_REVISION=${FREERDP_REQUIRED_REVISION})
 
-add_library(remmina-plugin-rdp ${REMMINA_PLUGIN_RDP_SRCS})
+add_library(remmina-plugin-rdp MODULE ${REMMINA_PLUGIN_RDP_SRCS})
 set_target_properties(remmina-plugin-rdp PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-rdp PROPERTIES NO_SONAME 1)
 
diff --git a/remmina-plugins/telepathy/CMakeLists.txt b/remmina-plugins/telepathy/CMakeLists.txt
index f667c37456..f97fb45672 100644
--- a/remmina-plugins/telepathy/CMakeLists.txt
+++ b/remmina-plugins/telepathy/CMakeLists.txt
@@ -35,7 +35,7 @@ set(REMMINA_PLUGIN_TELEPATHY_SRCS
 	telepathy_plugin.c
 	)
 
-add_library(remmina-plugin-telepathy ${REMMINA_PLUGIN_TELEPATHY_SRCS})
+add_library(remmina-plugin-telepathy MODULE ${REMMINA_PLUGIN_TELEPATHY_SRCS})
 set_target_properties(remmina-plugin-telepathy PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-telepathy PROPERTIES NO_SONAME 1)
 
diff --git a/remmina-plugins/tool_hello_world/CMakeLists.txt b/remmina-plugins/tool_hello_world/CMakeLists.txt
index 794c283114..63cc38ab09 100644
--- a/remmina-plugins/tool_hello_world/CMakeLists.txt
+++ b/remmina-plugins/tool_hello_world/CMakeLists.txt
@@ -36,7 +36,7 @@ set(REMMINA_PLUGIN_SRCS
 	plugin.c
 	)
 
-add_library(remmina-plugin-tool_hello_world ${REMMINA_PLUGIN_SRCS})
+add_library(remmina-plugin-tool_hello_world MODULE ${REMMINA_PLUGIN_SRCS})
 set_target_properties(remmina-plugin-tool_hello_world PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-tool_hello_world PROPERTIES NO_SONAME 1)
 
diff --git a/remmina-plugins/vnc/CMakeLists.txt b/remmina-plugins/vnc/CMakeLists.txt
index a9fbac736a..d7a8e671f7 100644
--- a/remmina-plugins/vnc/CMakeLists.txt
+++ b/remmina-plugins/vnc/CMakeLists.txt
@@ -38,7 +38,7 @@ set(REMMINA_PLUGIN_VNC_SRCS
 	vnc_plugin.c
 	)
 
-add_library(remmina-plugin-vnc ${REMMINA_PLUGIN_VNC_SRCS})
+add_library(remmina-plugin-vnc MODULE ${REMMINA_PLUGIN_VNC_SRCS})
 set_target_properties(remmina-plugin-vnc PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-vnc PROPERTIES NO_SONAME 1)
 
diff --git a/remmina-plugins/xdmcp/CMakeLists.txt b/remmina-plugins/xdmcp/CMakeLists.txt
index e807d7d517..3acaf94637 100644
--- a/remmina-plugins/xdmcp/CMakeLists.txt
+++ b/remmina-plugins/xdmcp/CMakeLists.txt
@@ -35,7 +35,7 @@ set(REMMINA_PLUGIN_XDMCP_SRCS
 	xdmcp_plugin.c
 	)
 
-add_library(remmina-plugin-xdmcp ${REMMINA_PLUGIN_XDMCP_SRCS})
+add_library(remmina-plugin-xdmcp MODULE ${REMMINA_PLUGIN_XDMCP_SRCS})
 set_target_properties(remmina-plugin-xdmcp PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-xdmcp PROPERTIES NO_SONAME 1)