Removed BUILTIN_CHANNELS

Building client channels out of tree does not work reliable as the dependencies can not be easily split. (exceptions may be simple ones as echo channel) It does complicate the build system and code though, so remove this for maintainability reasons.
2022-02-16 15:45:55 +01:00 · 2022-02-16 15:45:55 +01:00 · fd027d1bf0
parent 538b34c51d
commit fd027d1bf0
71 changed files with 69 additions and 496 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -120,12 +120,6 @@ if (WITH_FREERDP_DEPRECATED)
 	add_definitions(-DWITH_FREERDP_DEPRECATED)
 endif()

-# Compatibility options
-if(DEFINED STATIC_CHANNELS)
-	message(WARNING "STATIC_CHANNELS is obsolete, please use BUILTIN_CHANNELS instead")
-	set(BUILTIN_CHANNELS ${STATIC_CHANNELS} CACHE BOOL "" FORCE)
-endif()
-
 # Make paths absolute
 if (CMAKE_INSTALL_PREFIX)
 	get_filename_component(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
@ -1004,7 +998,7 @@ include(${CMAKE_CPACK_INCLUDE_FILE})
 set(FREERDP_BUILD_CONFIG_LIST "")
 GET_CMAKE_PROPERTY(res VARIABLES)
 FOREACH(var ${res})
-	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^BUILTIN_CHANNELS|^HAVE_*")
+	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*")
 		LIST(APPEND FREERDP_BUILD_CONFIG_LIST "${var}=${${var}}")
 	ENDIF()
 ENDFOREACH()
--- a/channels/CMakeLists.txt
+++ b/channels/CMakeLists.txt
@ -163,7 +163,7 @@ macro(add_channel_client_subsystem _channel_prefix _channel_name _subsystem _typ
 endmacro(add_channel_client_subsystem)

 macro(channel_install _targets _destination _export_target)
-    if (NOT BUILTIN_CHANNELS OR NOT BUILD_SHARED_LIBS)
+    if (NOT BUILD_SHARED_LIBS)
        install(TARGETS ${_targets} DESTINATION ${_destination} EXPORT ${_export_target})
    endif()
 endmacro(channel_install)
@ -182,39 +182,16 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna
    link_directories(${_lnk_dir})
  endif()

-  if(${_dynamic} AND (NOT BUILTIN_CHANNELS))
-    # On windows create dll version information.
-    # Vendor, product and year are already set in top level CMakeLists.txt
-    if (WIN32)
-      set (RC_VERSION_MAJOR ${FREERDP_VERSION_MAJOR})
-      set (RC_VERSION_MINOR ${FREERDP_VERSION_MINOR})
-      set (RC_VERSION_BUILD ${FREERDP_VERSION_REVISION})
-      set (RC_VERSION_PATCH 0)
-      set (RC_VERSION_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${_module_name}${CMAKE_SHARED_LIBRARY_SUFFIX}" )
+	set(${_module_prefix}_STATIC ON PARENT_SCOPE)
+	set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
+	set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
+	set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
+	add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
+	target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})

-      configure_file(
-      ${PROJECT_SOURCE_DIR}/cmake/WindowsDLLVersion.rc.in
-      ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-      @ONLY)
-
-      set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    endif()
-
-    add_library(${_module_name} ${${_module_prefix}_SRCS})
-    target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
-    client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
-  else()
-    set(${_module_prefix}_STATIC ON PARENT_SCOPE)
-    set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
-    set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
-    set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
-    add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
-    target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
-
-    if (NOT BUILD_SHARED_LIBS)
-        client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
-    endif()
-  endif()
+	if (NOT BUILD_SHARED_LIBS)
+			client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
+	endif()
 endmacro(add_channel_client_library)

 macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry)
@ -223,38 +200,15 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_
    link_directories(${_lnk_dir})
  endif()

-  if(${_dynamic} AND (NOT BUILTIN_CHANNELS))
-    # On windows create dll version information.
-    # Vendor, product and year are already set in top level CMakeLists.txt
-    if (WIN32)
-      set (RC_VERSION_MAJOR ${FREERDP_VERSION_MAJOR})
-      set (RC_VERSION_MINOR ${FREERDP_VERSION_MINOR})
-      set (RC_VERSION_BUILD ${FREERDP_VERSION_REVISION})
-      set (RC_VERSION_PATCH 0)
-      set (RC_VERSION_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${_module_name}${CMAKE_SHARED_LIBRARY_SUFFIX}" )
+	set(${_module_prefix}_STATIC ON PARENT_SCOPE)
+	set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
+	set(${_module_prefix}_TYPE ${_type} PARENT_SCOPE)

-      configure_file(
-      ${PROJECT_SOURCE_DIR}/cmake/WindowsDLLVersion.rc.in
-      ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-      @ONLY)
-
-      set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    endif()
-
-    add_library(${_module_name} ${${_module_prefix}_SRCS})
-    target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
-    client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
-  else()
-    set(${_module_prefix}_STATIC ON PARENT_SCOPE)
-    set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
-    set(${_module_prefix}_TYPE ${_type} PARENT_SCOPE)
-
-    add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
-    target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
-    if (NOT BUILD_SHARED_LIBS)
-        client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
-    endif()
-  endif()
+	add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
+	target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
+	if (NOT BUILD_SHARED_LIBS)
+			client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
+	endif()
 endmacro(add_channel_client_subsystem_library)

 macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry)
@ -263,34 +217,13 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna
    link_directories(${_lnk_dir})
  endif()

-  if(${_dynamic} AND (NOT BUILTIN_CHANNELS))
-    # On windows create dll version information.
-    # Vendor, product and year are already set in top level CMakeLists.txt
-    if (WIN32)
-      set (RC_VERSION_MAJOR ${FREERDP_VERSION_MAJOR})
-      set (RC_VERSION_MINOR ${FREERDP_VERSION_MINOR})
-      set (RC_VERSION_BUILD ${FREERDP_VERSION_REVISION})
-      set (RC_VERSION_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${_module_name}${FREERDP_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}" )
-
-      configure_file(
-      ${PROJECT_SOURCE_DIR}/cmake/WindowsDLLVersion.rc.in
-      ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-      @ONLY)
-
-      set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    endif()
-
-    add_library(${_module_name} ${${_module_prefix}_SRCS})
-    server_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
-  else()
-    set(${_module_prefix}_STATIC ON PARENT_SCOPE)
-    set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
-    set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
-    set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
-    add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
-    if (NOT BUILD_SHARED_LIBS)
-        server_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
-    endif()
+	set(${_module_prefix}_STATIC ON PARENT_SCOPE)
+	set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
+	set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
+	set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
+	add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
+	if (NOT BUILD_SHARED_LIBS)
+			server_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
  endif()
 endmacro(add_channel_server_library)

--- a/channels/ainput/client/CMakeLists.txt
+++ b/channels/ainput/client/CMakeLists.txt
@ -26,7 +26,7 @@ include_directories(..)

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
+if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
 	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()

--- a/channels/ainput/client/ainput_main.c
+++ b/channels/ainput/client/ainput_main.c
@ -269,18 +269,12 @@ static UINT ainput_plugin_terminated(IWTSPlugin* pPlugin)
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry ainput_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT ainput_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT status = CHANNEL_RC_OK;
 	AINPUT_PLUGIN* ainput = (AINPUT_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, "ainput");
--- a/channels/audin/client/CMakeLists.txt
+++ b/channels/audin/client/CMakeLists.txt
@ -27,10 +27,6 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE

 target_link_libraries(${MODULE_NAME} freerdp winpr)

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

 if(WITH_OSS)
--- a/channels/audin/client/alsa/audin_alsa.c
+++ b/channels/audin/client/alsa/audin_alsa.c
@ -390,18 +390,12 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARG
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_audin_client_subsystem_entry alsa_freerdp_audin_client_subsystem_entry
-#else
-#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT alsa_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	AudinALSADevice* alsa;
--- a/channels/audin/client/audin_main.c
+++ b/channels/audin/client/audin_main.c
@ -953,18 +953,12 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args)
 	return TRUE;
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry audin_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT audin_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	struct SubsystemEntry
 	{
--- a/channels/audin/client/ios/audin_ios.m
+++ b/channels/audin/client/ios/audin_ios.m
@ -296,13 +296,7 @@ typedef struct
 	return CHANNEL_RC_OK;
 }

- #ifdef BUILTIN_CHANNELS
- #define freerdp_audin_client_subsystem_entry ios_freerdp_audin_client_subsystem_entry
- #else
- #define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
- #endif
-
- UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+ UINT ios_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	DWORD errCode;
 	char errString[1024];
--- a/channels/audin/client/mac/audin_mac.m
+++ b/channels/audin/client/mac/audin_mac.m
@ -381,13 +381,7 @@ static UINT audin_mac_parse_addin_args(AudinMacDevice *device, const ADDIN_ARGV
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_audin_client_subsystem_entry mac_freerdp_audin_client_subsystem_entry
-#else
-#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
-#endif
-
-UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT mac_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	DWORD errCode;
 	char errString[1024];
--- a/channels/audin/client/opensles/audin_opensl_es.c
+++ b/channels/audin/client/opensles/audin_opensl_es.c
@ -288,18 +288,12 @@ static UINT audin_opensles_parse_addin_args(AudinOpenSLESDevice* device, const A
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_audin_client_subsystem_entry opensles_freerdp_audin_client_subsystem_entry
-#else
-#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT opensles_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	AudinOpenSLESDevice* opensles;
--- a/channels/audin/client/oss/audin_oss.c
+++ b/channels/audin/client/oss/audin_oss.c
@ -443,18 +443,12 @@ static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV*
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_audin_client_subsystem_entry oss_freerdp_audin_client_subsystem_entry
-#else
-#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT oss_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	AudinOSSDevice* oss;
--- a/channels/audin/client/pulse/audin_pulse.c
+++ b/channels/audin/client/pulse/audin_pulse.c
@ -505,18 +505,12 @@ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* device, const ADDIN_A
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_audin_client_subsystem_entry pulse_freerdp_audin_client_subsystem_entry
-#else
-#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT pulse_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	AudinPulseDevice* pulse;
--- a/channels/audin/client/sndio/audin_sndio.c
+++ b/channels/audin/client/sndio/audin_sndio.c
@ -305,18 +305,12 @@ static UINT audin_sndio_parse_addin_args(AudinSndioDevice* device, ADDIN_ARGV* a
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_audin_client_subsystem_entry sndio_freerdp_audin_client_subsystem_entry
-#else
-#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT sndio_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	ADDIN_ARGV* args;
 	AudinSndioDevice* sndio;
--- a/channels/audin/client/winmm/CMakeLists.txt
+++ b/channels/audin/client/winmm/CMakeLists.txt
@ -30,9 +30,4 @@ set(${MODULE_PREFIX}_LIBS freerdp winpr winmm.lib)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client/winmm")
--- a/channels/audin/client/winmm/audin_winmm.c
+++ b/channels/audin/client/winmm/audin_winmm.c
@ -491,18 +491,12 @@ static UINT audin_winmm_parse_addin_args(AudinWinmmDevice* device, const ADDIN_A
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_audin_client_subsystem_entry winmm_freerdp_audin_client_subsystem_entry
-#else
-#define freerdp_audin_client_subsystem_entry FREERDP_API freerdp_audin_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT winmm_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	AudinWinmmDevice* winmm;
--- a/channels/disp/client/CMakeLists.txt
+++ b/channels/disp/client/CMakeLists.txt
@ -33,9 +33,4 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/disp/client/disp_main.c
+++ b/channels/disp/client/disp_main.c
@ -390,18 +390,12 @@ static UINT disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonit
 	return disp_send_display_control_monitor_layout_pdu(callback, NumMonitors, Monitors);
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry disp_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT disp_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT error = CHANNEL_RC_OK;
 	DISP_PLUGIN* disp;
--- a/channels/drive/client/CMakeLists.txt
+++ b/channels/drive/client/CMakeLists.txt
@ -24,13 +24,6 @@ set(${MODULE_PREFIX}_SRCS

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")

-
-
 target_link_libraries(${MODULE_NAME} winpr freerdp)

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/drive/client/drive_main.c
+++ b/channels/drive/client/drive_main.c
@ -994,18 +994,12 @@ out_error:
 	return error;
 }

-#ifdef BUILTIN_CHANNELS
-#define DeviceServiceEntry drive_DeviceServiceEntry
-#else
-#define DeviceServiceEntry FREERDP_API DeviceServiceEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
+UINT drive_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
 {
 	RDPDR_DRIVE* drive;
 	UINT error;
--- a/channels/echo/client/CMakeLists.txt
+++ b/channels/echo/client/CMakeLists.txt
@ -25,9 +25,5 @@ include_directories(..)

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 target_link_libraries(${MODULE_NAME} winpr)
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/echo/client/echo_main.c
+++ b/channels/echo/client/echo_main.c
@ -173,18 +173,12 @@ static UINT echo_plugin_terminated(IWTSPlugin* pPlugin)
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry echo_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT echo_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT status = CHANNEL_RC_OK;
 	ECHO_PLUGIN* echo;
--- a/channels/geometry/client/CMakeLists.txt
+++ b/channels/geometry/client/CMakeLists.txt
@ -26,15 +26,10 @@ include_directories(..)
 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
-if (NOT BUILTIN_CHANNELS OR NOT BUILD_SHARED_LIBS)
+if (NOT BUILD_SHARED_LIBS)
    set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
 endif()

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/geometry/client/geometry_main.c
+++ b/channels/geometry/client/geometry_main.c
@ -443,18 +443,12 @@ static void mappedGeometryUnref_void(void* arg)
 * Channel Client Interface
 */

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry geometry_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT geometry_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT error = CHANNEL_RC_OK;
 	GEOMETRY_PLUGIN* geometry;
--- a/channels/parallel/client/CMakeLists.txt
+++ b/channels/parallel/client/CMakeLists.txt
@ -22,13 +22,6 @@ set(${MODULE_PREFIX}_SRCS

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")

-
-
 target_link_libraries(${MODULE_NAME} freerdp winpr)

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/parallel/client/parallel_main.c
+++ b/channels/parallel/client/parallel_main.c
@ -404,18 +404,12 @@ static UINT parallel_free(DEVICE* device)
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define DeviceServiceEntry parallel_DeviceServiceEntry
-#else
-#define DeviceServiceEntry FREERDP_API DeviceServiceEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
+UINT parallel_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
 {
 	char* name;
 	char* path;
--- a/channels/printer/client/CMakeLists.txt
+++ b/channels/printer/client/CMakeLists.txt
@ -25,10 +25,6 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

 if(WITH_CUPS)
--- a/channels/printer/client/cups/printer_cups.c
+++ b/channels/printer/client/cups/printer_cups.c
@ -382,11 +382,7 @@ static void printer_cups_release_ref_driver(rdpPrinterDriver* driver)
 		cups_driver->references--;
 }

-#ifdef BUILTIN_CHANNELS
 rdpPrinterDriver* cups_freerdp_printer_client_subsystem_entry(void)
-#else
-FREERDP_API rdpPrinterDriver* freerdp_printer_client_subsystem_entry(void)
-#endif
 {
 	if (!uniq_cups_driver)
 	{
--- a/channels/printer/client/printer_main.c
+++ b/channels/printer/client/printer_main.c
@ -961,12 +961,7 @@ static rdpPrinterDriver* printer_load_backend(const char* backend)
 * @return 0 on success, otherwise a Win32 error code
 */
 UINT
-#ifdef BUILTIN_CHANNELS
 printer_DeviceServiceEntry
-#else
-    FREERDP_API
-    DeviceServiceEntry
-#endif
    (PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
 {
 	int i;
--- a/channels/printer/client/win/printer_win.c
+++ b/channels/printer/client/win/printer_win.c
@ -416,11 +416,7 @@ static void printer_win_release_ref_driver(rdpPrinterDriver* driver)
 		win->references--;
 }

-#ifdef BUILTIN_CHANNELS
 rdpPrinterDriver* win_freerdp_printer_client_subsystem_entry(void)
-#else
-FREERDP_API rdpPrinterDriver* freerdp_printer_client_subsystem_entry(void)
-#endif
 {
 	if (!win_driver)
 	{
--- a/channels/rdp2tcp/client/CMakeLists.txt
+++ b/channels/rdp2tcp/client/CMakeLists.txt
@ -22,10 +22,6 @@ set(${MODULE_PREFIX}_SRCS

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "VirtualChannelEntryEx")

-if(BUILTIN_CHANNELS)
-  target_link_libraries(${MODULE_NAME} freerdp)
-else()
-  target_link_libraries(${MODULE_NAME} winpr freerdp)
-endif()
+target_link_libraries(${MODULE_NAME} freerdp)

 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/rdpei/client/CMakeLists.txt
+++ b/channels/rdpei/client/CMakeLists.txt
@ -26,13 +26,6 @@ set(${MODULE_PREFIX}_SRCS
 include_directories(..)
 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

-
-
 target_link_libraries(${MODULE_NAME} winpr freerdp)

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/rdpei/client/rdpei_main.c
+++ b/channels/rdpei/client/rdpei_main.c
@ -1457,18 +1457,12 @@ static UINT rdpei_pen_raw_event(RdpeiClientContext* context, INT32 externalId, U
 	return error;
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry rdpei_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT rdpei_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT error;
 	RDPEI_PLUGIN* rdpei = NULL;
--- a/channels/rdpgfx/client/CMakeLists.txt
+++ b/channels/rdpgfx/client/CMakeLists.txt
@ -29,13 +29,7 @@ include_directories(..)

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

-
-
 target_link_libraries(${MODULE_NAME} winpr freerdp)

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

--- a/channels/rdpgfx/client/rdpgfx_main.c
+++ b/channels/rdpgfx/client/rdpgfx_main.c
@ -2047,12 +2047,6 @@ static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cac
 	return pData;
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry rdpgfx_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 RdpgfxClientContext* rdpgfx_client_context_new(rdpSettings* settings)
 {
 	RDPGFX_PLUGIN* gfx;
@ -2168,7 +2162,7 @@ void rdpgfx_client_context_free(RdpgfxClientContext* context)
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT rdpgfx_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT error = CHANNEL_RC_OK;
 	RDPGFX_PLUGIN* gfx;
--- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
+++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
@ -516,18 +516,12 @@ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry alsa_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT alsa_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	rdpsndAlsaPlugin* alsa;
--- a/channels/rdpsnd/client/fake/rdpsnd_fake.c
+++ b/channels/rdpsnd/client/fake/rdpsnd_fake.c
@ -105,18 +105,12 @@ static UINT rdpsnd_fake_parse_addin_args(rdpsndFakePlugin* fake, const ADDIN_ARG
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry fake_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT fake_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	rdpsndFakePlugin* fake;
--- a/channels/rdpsnd/client/ios/rdpsnd_ios.c
+++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c
@ -259,18 +259,12 @@ static void rdpsnd_ios_free(rdpsndDevicePlugin* device)
 	free(p);
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry ios_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT ios_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	rdpsndIOSPlugin* p = (rdpsndIOSPlugin*)calloc(1, sizeof(rdpsndIOSPlugin));

--- a/channels/rdpsnd/client/mac/rdpsnd_mac.m
+++ b/channels/rdpsnd/client/mac/rdpsnd_mac.m
@ -357,18 +357,12 @@ static UINT rdpsnd_mac_play(rdpsndDevicePlugin *device, const BYTE *data, size_t
 	return mac->diff > UINT_MAX ? UINT_MAX : mac->diff;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry mac_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT mac_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	rdpsndMacPlugin *mac;
 	mac = (rdpsndMacPlugin *)calloc(1, sizeof(rdpsndMacPlugin));
--- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
+++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
@ -328,18 +328,13 @@ static int rdpsnd_opensles_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_AR
 	return status;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry opensles_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT opensles_freerdp_rdpsnd_client_subsystem_entry(
+    PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	ADDIN_ARGV* args;
 	rdpsndopenslesPlugin* opensles;
--- a/channels/rdpsnd/client/oss/rdpsnd_oss.c
+++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c
@ -441,18 +441,12 @@ static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_A
 	return status;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry oss_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT oss_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	rdpsndOssPlugin* oss = (rdpsndOssPlugin*)calloc(1, sizeof(rdpsndOssPlugin));
--- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
+++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
@ -568,18 +568,12 @@ static UINT rdpsnd_pulse_parse_addin_args(rdpsndDevicePlugin* device, const ADDI
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry pulse_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT pulse_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	const ADDIN_ARGV* args;
 	rdpsndPulsePlugin* pulse;
--- a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c
+++ b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c
@ -176,18 +176,12 @@ static UINT rdpsnd_sndio_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry sndio_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT sndio_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	ADDIN_ARGV* args;
 	rdpsndSndioPlugin* sndio;
--- a/channels/rdpsnd/client/winmm/CMakeLists.txt
+++ b/channels/rdpsnd/client/winmm/CMakeLists.txt
@ -24,16 +24,10 @@ include_directories(..)

 add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")

-
-
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winmm.lib)
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client/WinMM")
--- a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
+++ b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
@ -310,18 +310,12 @@ static void rdpsnd_winmm_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV
 	WINPR_UNUSED(args);
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_rdpsnd_client_subsystem_entry winmm_freerdp_rdpsnd_client_subsystem_entry
-#else
-#define freerdp_rdpsnd_client_subsystem_entry FREERDP_API freerdp_rdpsnd_client_subsystem_entry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
+UINT winmm_freerdp_rdpsnd_client_subsystem_entry(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)
 {
 	ADDIN_ARGV* args;
 	rdpsndWinmmPlugin* winmm;
--- a/channels/serial/client/CMakeLists.txt
+++ b/channels/serial/client/CMakeLists.txt
@ -22,13 +22,6 @@ set(${MODULE_PREFIX}_SRCS

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")

-
-
 target_link_libraries(${MODULE_NAME} winpr freerdp)

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/serial/client/serial_main.c
+++ b/channels/serial/client/serial_main.c
@ -797,18 +797,12 @@ static UINT serial_free(DEVICE* device)

 #endif /* __linux__ */

-#ifdef BUILTIN_CHANNELS
-#define DeviceServiceEntry serial_DeviceServiceEntry
-#else
-#define DeviceServiceEntry FREERDP_API DeviceServiceEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
+UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
 {
 	char* name;
 	char* path;
--- a/channels/sshagent/client/CMakeLists.txt
+++ b/channels/sshagent/client/CMakeLists.txt
@ -26,9 +26,5 @@ include_directories(..)

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 target_link_libraries(${MODULE_NAME} winpr)
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/sshagent/client/sshagent_main.c
+++ b/channels/sshagent/client/sshagent_main.c
@ -342,18 +342,12 @@ static UINT sshagent_plugin_terminated(IWTSPlugin* pPlugin)
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry sshagent_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Main entry point for sshagent DVC plugin
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT sshagent_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT status = CHANNEL_RC_OK;
 	SSHAGENT_PLUGIN* sshagent;
--- a/channels/tsmf/client/CMakeLists.txt
+++ b/channels/tsmf/client/CMakeLists.txt
@ -79,10 +79,6 @@ add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE

 target_link_libraries(${MODULE_NAME} freerdp winpr)

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

 if(WITH_FFMPEG)
--- a/channels/tsmf/client/alsa/tsmf_alsa.c
+++ b/channels/tsmf/client/alsa/tsmf_alsa.c
@ -226,14 +226,7 @@ static void tsmf_alsa_free(ITSMFAudioDevice* audio)
 	free(alsa);
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_tsmf_client_audio_subsystem_entry alsa_freerdp_tsmf_client_audio_subsystem_entry
-#else
-#define freerdp_tsmf_client_audio_subsystem_entry \
-	FREERDP_API freerdp_tsmf_client_audio_subsystem_entry
-#endif
-
-ITSMFAudioDevice* freerdp_tsmf_client_audio_subsystem_entry(void)
+ITSMFAudioDevice* alsa_freerdp_tsmf_client_audio_subsystem_entry(void)
 {
 	TSMFAlsaAudioDevice* alsa;
 	alsa = (TSMFAlsaAudioDevice*)malloc(sizeof(TSMFAlsaAudioDevice));
--- a/channels/tsmf/client/ffmpeg/CMakeLists.txt
+++ b/channels/tsmf/client/ffmpeg/CMakeLists.txt
@ -25,8 +25,6 @@ include_directories(${FFMPEG_INCLUDE_DIRS})

 add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")

-
-
 if(APPLE)
    # For this to work on apple, we need to add some frameworks
    FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
@ -39,7 +37,3 @@ else()
    target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 endif()

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@ -621,13 +621,7 @@ static BOOL CALLBACK InitializeAvCodecs(PINIT_ONCE once, PVOID param, PVOID* con
 	return TRUE;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_tsmf_client_subsystem_entry ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry
-#else
-#define freerdp_tsmf_client_subsystem_entry FREERDP_API freerdp_tsmf_client_decoder_subsystem_entry
-#endif
-
-ITSMFDecoder* freerdp_tsmf_client_subsystem_entry(void)
+ITSMFDecoder* ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry(void)
 {
 	TSMFFFmpegDecoder* decoder;
 	InitOnceExecuteOnce(&g_Initialized, InitializeAvCodecs, NULL, NULL);
--- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
+++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
@ -1013,13 +1013,7 @@ static BOOL tsmf_gstreamer_sync(ITSMFDecoder* decoder, void (*cb)(void*), void*
 	return TRUE;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_tsmf_client_subsystem_entry gstreamer_freerdp_tsmf_client_decoder_subsystem_entry
-#else
-#define freerdp_tsmf_client_subsystem_entry FREERDP_API freerdp_tsmf_client_decoder_subsystem_entry
-#endif
-
-ITSMFDecoder* freerdp_tsmf_client_subsystem_entry(void)
+ITSMFDecoder* gstreamer_freerdp_tsmf_client_decoder_subsystem_entry(void)
 {
 	TSMFGstreamerDecoder* decoder;

--- a/channels/tsmf/client/oss/tsmf_oss.c
+++ b/channels/tsmf/client/oss/tsmf_oss.c
@ -229,14 +229,7 @@ static void tsmf_oss_free(ITSMFAudioDevice* audio)
 	free(oss);
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_tsmf_client_audio_subsystem_entry oss_freerdp_tsmf_client_audio_subsystem_entry
-#else
-#define freerdp_tsmf_client_audio_subsystem_entry \
-	FREERDP_API freerdp_tsmf_client_audio_subsystem_entry
-#endif
-
-ITSMFAudioDevice* freerdp_tsmf_client_audio_subsystem_entry(void)
+ITSMFAudioDevice* oss_freerdp_tsmf_client_audio_subsystem_entry(void)
 {
 	TSMFOssAudioDevice* oss;
 	oss = (TSMFOssAudioDevice*)malloc(sizeof(TSMFOssAudioDevice));
--- a/channels/tsmf/client/pulse/tsmf_pulse.c
+++ b/channels/tsmf/client/pulse/tsmf_pulse.c
@ -400,11 +400,7 @@ static void tsmf_pulse_free(ITSMFAudioDevice* audio)
 	free(pulse);
 }

-#ifdef BUILTIN_CHANNELS
 ITSMFAudioDevice* pulse_freerdp_tsmf_client_audio_subsystem_entry(void)
-#else
-FREERDP_API ITSMFAudioDevice* freerdp_tsmf_client_audio_subsystem_entry(void)
-#endif
 {
 	TSMFPulseAudioDevice* pulse;
 	pulse = (TSMFPulseAudioDevice*)calloc(1, sizeof(TSMFPulseAudioDevice));
--- a/channels/tsmf/client/tsmf_main.c
+++ b/channels/tsmf/client/tsmf_main.c
@ -553,18 +553,12 @@ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args)
 	return CHANNEL_RC_OK;
 }

-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry tsmf_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT tsmf_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT status = 0;
 	TSMF_PLUGIN* tsmf;
--- a/channels/urbdrc/client/CMakeLists.txt
+++ b/channels/urbdrc/client/CMakeLists.txt
@ -18,7 +18,7 @@

 define_channel_client("urbdrc")

-set(${MODULE_PREFIX}_SRCS	
+set(${MODULE_PREFIX}_SRCS
 	data_transfer.c
 	data_transfer.h
 	urbdrc_main.c
@ -37,10 +37,6 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)

 target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWOARD} ${${MODULE_PREFIX}_LIBS})

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

 # libusb subsystem
--- a/channels/urbdrc/client/libusb/CMakeLists.txt
+++ b/channels/urbdrc/client/libusb/CMakeLists.txt
@ -40,7 +40,3 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr urbdrc-client)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
--- a/channels/urbdrc/client/libusb/libusb_udevman.c
+++ b/channels/urbdrc/client/libusb/libusb_udevman.c
@ -899,12 +899,7 @@ static DWORD poll_thread(LPVOID lpThreadParameter)
 	return 0;
 }

-#ifdef BUILTIN_CHANNELS
-#define freerdp_urbdrc_client_subsystem_entry libusb_freerdp_urbdrc_client_subsystem_entry
-#else
-#define freerdp_urbdrc_client_subsystem_entry FREERDP_API freerdp_urbdrc_client_subsystem_entry
-#endif
-UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)
+UINT libusb_freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)
 {
 	wObject* obj;
 	UINT rc;
--- a/channels/urbdrc/client/urbdrc_main.c
+++ b/channels/urbdrc/client/urbdrc_main.c
@ -939,18 +939,13 @@ BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1
 	idevman->loading_unlock(idevman);
 	return TRUE;
 }
-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry urbdrc_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif

 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT urbdrc_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT status = 0;
 	const ADDIN_ARGV* args;
--- a/channels/video/client/CMakeLists.txt
+++ b/channels/video/client/CMakeLists.txt
@ -25,18 +25,8 @@ include_directories(..)

 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")

-
-if(NOT BUILTIN_CHANNELS)
-  set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
-  set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpgfx-client)
-endif()
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

-
-if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT BUILTIN_CHANNELS AND BUILD_SHARED_LIBS)
-	install(FILES ${PROJECT_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
--- a/channels/video/client/video_main.c
+++ b/channels/video/client/video_main.c
@ -1161,19 +1161,12 @@ static UINT video_plugin_terminated(IWTSPlugin* pPlugin)
 /**
 * Channel Client Interface
 */
-
-#ifdef BUILTIN_CHANNELS
-#define DVCPluginEntry video_DVCPluginEntry
-#else
-#define DVCPluginEntry FREERDP_API DVCPluginEntry
-#endif
-
 /**
 * Function description
 *
 * @return 0 on success, otherwise a Win32 error code
 */
-UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+UINT video_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 	UINT error = CHANNEL_RC_OK;
 	VIDEO_PLUGIN* videoPlugin;
--- a/ci/cmake-preloads/config-linux-all.txt
+++ b/ci/cmake-preloads/config-linux-all.txt
@ -5,7 +5,6 @@ set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type")
 set (BUILD_TESTING ON CACHE BOOL "build testing")
 set (WITH_PULSE ON CACHE BOOL "pulse")
 set (WITH_CHANNELS ON CACHE BOOL "channels")
-set (BUILTIN_CHANNELS ON CACHE BOOL "static channels")
 set (WITH_CUPS ON CACHE BOOL "cups")
 set (WITH_WAYLAND ON CACHE BOOL "wayland")
 set (WITH_GSSAPI OFF CACHE BOOL "Kerberos support")
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@ -72,8 +72,6 @@ CMAKE_DEPENDENT_OPTION(WITH_CLIENT "Build client binaries" ON "WITH_CLIENT_COMMO

 option(WITH_SERVER "Build server binaries" OFF)

-option(BUILTIN_CHANNELS "Combine all channels into their respective base library" ON)
-
 option(WITH_CHANNELS "Build virtual channel plugins" ON)

 option(FREERDP_UNIFIED_BUILD "Build WinPR, uwac, RdTk and FreeRDP in one go" ON)
--- a/config.h.in
+++ b/config.h.in
@ -63,7 +63,6 @@
 #cmakedefine WITH_CHANNEL_RDPAPPLIST

 /* Plugins */
-#cmakedefine BUILTIN_CHANNELS
 #cmakedefine WITH_RDPDR

 /* Channels */
--- a/packaging/deb/freerdp-nightly/rules
+++ b/packaging/deb/freerdp-nightly/rules
@ -10,7 +10,6 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
                          -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
                          -DWITH_PULSE=ON \
                          -DWITH_CHANNELS=ON \
-                          -DBUILTIN_CHANNELS=ON \
                          -DWITH_CUPS=ON \
                          -DWITH_PCSC=ON \
                          -DWITH_GSTREAMER_0_10=ON \
--- a/packaging/rpm/freerdp-nightly.spec
+++ b/packaging/rpm/freerdp-nightly.spec
@ -116,7 +116,6 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version
        -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
        -DWITH_PULSE=ON \
        -DWITH_CHANNELS=ON \
-        -DBUILTIN_CHANNELS=ON \
        -DWITH_CUPS=ON \
        -DWITH_PCSC=ON \
        -DWITH_JPEG=ON \
--- a/rdtk/templates/CMakeLists.txt
+++ b/rdtk/templates/CMakeLists.txt
@ -20,7 +20,7 @@ write_basic_package_version_file(
 set(RDTK_BUILD_CONFIG_LIST "")
 GET_CMAKE_PROPERTY(res VARIABLES)
 FOREACH(var ${res})
-	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^BUILTIN_CHANNELS|^HAVE_*")
+	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*")
 		LIST(APPEND RDTK_BUILD_CONFIG_LIST "${var}=${${var}}")
 	ENDIF()
 ENDFOREACH()
--- a/server/proxy/CMakeLists.txt
+++ b/server/proxy/CMakeLists.txt
@ -70,14 +70,6 @@ endif()

 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server)
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
-if (NOT BUILTIN_CHANNELS)
-    set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpgfx-client)
-    get_target_property(CUR_INSTALL_RPATH ${MODULE_NAME} INSTALL_RPATH)
-    if (NOT APPLE)
-        set(CUR_INSTALL_RPATH "${CUR_INSTALL_RPATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
-    endif()
-    set_target_properties(${MODULE_NAME} PROPERTIES INSTALL_RPATH ${CUR_INSTALL_RPATH})
-endif()
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@ -375,7 +375,3 @@ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ShadowConfi

 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ShadowConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ShadowConfigVersion.cmake
 	DESTINATION ${FREERDP_SERVER_CMAKE_INSTALL_DIR})
-
-if (NOT BUILTIN_CHANNELS)
-	install(EXPORT FreeRDP-ShadowTargets DESTINATION ${FREERDP_SERVER_CMAKE_INSTALL_DIR})
-endif()
--- a/uwac/templates/CMakeLists.txt
+++ b/uwac/templates/CMakeLists.txt
@ -25,7 +25,7 @@ install(EXPORT uwac DESTINATION ${UWAC_CMAKE_INSTALL_DIR})
 set(UWAC_BUILD_CONFIG_LIST "")
 GET_CMAKE_PROPERTY(res VARIABLES)
 FOREACH(var ${res})
-	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^BUILTIN_CHANNELS|^HAVE_*")
+	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*")
 		LIST(APPEND UWAC_BUILD_CONFIG_LIST "${var}=${${var}}")
 	ENDIF()
 ENDFOREACH()