diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
index 5f1fb3187..d48428ec1 100644
--- a/channels/client/CMakeLists.txt
+++ b/channels/client/CMakeLists.txt
@@ -43,7 +43,11 @@ foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
 				set(ENTRY_POINT_IMPORT "extern BOOL VCAPITYPE ${ENTRY_POINT_NAME}(PCHANNEL_ENTRY_POINTS);")
 			elseif(${${STATIC_MODULE}_CLIENT_ENTRY} STREQUAL "VirtualChannelEntryEx")
 				set(ENTRY_POINT_IMPORT "extern BOOL VCAPITYPE ${ENTRY_POINT_NAME}(PCHANNEL_ENTRY_POINTS,PVOID);")
-			else()
+			elseif(${${STATIC_MODULE}_CLIENT_ENTRY} MATCHES "DVCPluginEntry$")
+				set(ENTRY_POINT_IMPORT "extern UINT ${ENTRY_POINT_NAME}(IDRDYNVC_ENTRY_POINTS* pEntryPoints);")
+			elseif(${${STATIC_MODULE}_CLIENT_ENTRY} MATCHES "DeviceServiceEntry$")
+				set(ENTRY_POINT_IMPORT "extern UINT ${ENTRY_POINT_NAME}(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints);")
+			else()                            
 				set(ENTRY_POINT_IMPORT "extern UINT ${ENTRY_POINT_NAME}(void);")
 			endif()
 			set(${STATIC_ENTRY}_IMPORTS "${${STATIC_ENTRY}_IMPORTS}\n${ENTRY_POINT_IMPORT}")
diff --git a/channels/client/addin.c b/channels/client/addin.c
index 5bd6276ee..ee30c53a4 100644
--- a/channels/client/addin.c
+++ b/channels/client/addin.c
@@ -46,7 +46,7 @@ extern const STATIC_ENTRY_TABLE CLIENT_STATIC_ENTRY_TABLES[];
 void* freerdp_channels_find_static_entry_in_table(const STATIC_ENTRY_TABLE* table,
                                                   const char* identifier)
 {
-	int index = 0;
+	size_t index = 0;
 	STATIC_ENTRY* pEntry;
 	pEntry = (STATIC_ENTRY*)&table->table[index++];
 
@@ -65,7 +65,7 @@ void* freerdp_channels_find_static_entry_in_table(const STATIC_ENTRY_TABLE* tabl
 
 void* freerdp_channels_client_find_static_entry(const char* name, const char* identifier)
 {
-	int index = 0;
+	size_t index = 0;
 	STATIC_ENTRY_TABLE* pEntry;
 	pEntry = (STATIC_ENTRY_TABLE*)&CLIENT_STATIC_ENTRY_TABLES[index++];
 
diff --git a/channels/client/tables.c.in b/channels/client/tables.c.in
index cc789d8b4..aafc71d6c 100644
--- a/channels/client/tables.c.in
+++ b/channels/client/tables.c.in
@@ -19,6 +19,7 @@
  * limitations under the License.
  */
 
+#include <freerdp/channels/rdpdr.h>
 #include "tables.h"
 
 ${CLIENT_STATIC_TYPEDEFS}