Reorganized FreeRDP headers

2022-02-16 11:20:38 +01:00 · 2022-02-16 11:20:38 +01:00 · b2ad47a809
commit b2ad47a809
parent 8dc7c2b612
352 changed files with 360 additions and 371 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -951,7 +951,6 @@ if(WITH_THIRD_PARTY)
 	endif()
 endif()

-add_subdirectory(include)

 add_subdirectory(libfreerdp)

@ -979,8 +978,7 @@ if(WITH_SERVER)
 	add_subdirectory(server)
 endif()

-# Configure files - Add last so all symbols are defined
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+add_subdirectory(include)

 # Packaging

@ -1006,7 +1004,6 @@ FOREACH(var ${res})
 	ENDIF()
 ENDFOREACH()
 string(REPLACE ";" " " FREERDP_BUILD_CONFIG "${FREERDP_BUILD_CONFIG_LIST}")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/buildflags.h)

 message(STATUS "Intrinsic path configuration:")
 #ShowCMakeVars("^CMAKE_INSTALL_PREFIX")
--- a/channels/audin/client/alsa/audin_alsa.c
+++ b/channels/audin/client/alsa/audin_alsa.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/audin/client/audin_main.c
+++ b/channels/audin/client/audin_main.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <errno.h>
--- a/channels/audin/client/audin_main.h
+++ b/channels/audin/client/audin_main.h
@ -21,7 +21,7 @@
 #define FREERDP_CHANNEL_AUDIN_CLIENT_MAIN_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/channels/audin/client/ios/audin_ios.m
+++ b/channels/audin/client/ios/audin_ios.m
@ -19,7 +19,7 @@
  */

 #ifdef HAVE_CONFIG_H
- #include "config.h"
+ #include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/audin/client/mac/audin_mac.m
+++ b/channels/audin/client/mac/audin_mac.m
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/audin/client/opensles/audin_opensl_es.c
+++ b/channels/audin/client/opensles/audin_opensl_es.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/channels/audin/client/oss/audin_oss.c
+++ b/channels/audin/client/oss/audin_oss.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/audin/client/pulse/audin_pulse.c
+++ b/channels/audin/client/pulse/audin_pulse.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/audin/client/sndio/audin_sndio.c
+++ b/channels/audin/client/sndio/audin_sndio.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <sndio.h>
--- a/channels/audin/client/winmm/audin_winmm.c
+++ b/channels/audin/client/winmm/audin_winmm.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/audin/server/audin.c
+++ b/channels/audin/server/audin.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/client/addin.c
+++ b/channels/client/addin.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/cliprdr/client/cliprdr_format.c
+++ b/channels/cliprdr/client/cliprdr_format.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/cliprdr/client/cliprdr_main.c
+++ b/channels/cliprdr/client/cliprdr_main.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/wtypes.h>
--- a/channels/cliprdr/server/cliprdr_main.c
+++ b/channels/cliprdr/server/cliprdr_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/disp/client/disp_main.c
+++ b/channels/disp/client/disp_main.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/disp/client/disp_main.h
+++ b/channels/disp/client/disp_main.h
@ -23,7 +23,7 @@
 #define FREERDP_CHANNEL_DISP_CLIENT_MAIN_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/channels/disp/disp_common.c
+++ b/channels/disp/disp_common.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/disp/server/disp_main.c
+++ b/channels/disp/server/disp_main.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include "disp_main.h"
--- a/channels/drdynvc/client/drdynvc_main.c
+++ b/channels/drdynvc/client/drdynvc_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/drdynvc/server/drdynvc_main.c
+++ b/channels/drdynvc/server/drdynvc_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/drive/client/drive_file.c
+++ b/channels/drive/client/drive_file.c
@ -26,7 +26,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <errno.h>
--- a/channels/drive/client/drive_main.c
+++ b/channels/drive/client/drive_main.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <errno.h>
--- a/channels/echo/client/echo_main.c
+++ b/channels/echo/client/echo_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/echo/client/echo_main.h
+++ b/channels/echo/client/echo_main.h
@ -21,7 +21,7 @@
 #define FREERDP_CHANNEL_ECHO_CLIENT_MAIN_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/channels/echo/server/echo_main.c
+++ b/channels/echo/server/echo_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/encomsp/client/encomsp_main.c
+++ b/channels/encomsp/client/encomsp_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/encomsp/server/encomsp_main.c
+++ b/channels/encomsp/server/encomsp_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/geometry/client/geometry_main.c
+++ b/channels/geometry/client/geometry_main.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/geometry/client/geometry_main.h
+++ b/channels/geometry/client/geometry_main.h
@ -21,7 +21,7 @@
 #define FREERDP_CHANNEL_GEOMETRY_CLIENT_MAIN_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/channels/gfxredir/gfxredir_common.c
+++ b/channels/gfxredir/gfxredir_common.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/gfxredir/server/gfxredir_main.c
+++ b/channels/gfxredir/server/gfxredir_main.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include "gfxredir_main.h"
--- a/channels/parallel/client/parallel_main.c
+++ b/channels/parallel/client/parallel_main.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/printer/client/cups/printer_cups.c
+++ b/channels/printer/client/cups/printer_cups.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/printer/client/printer_main.c
+++ b/channels/printer/client/printer_main.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/printer/client/win/printer_win.c
+++ b/channels/printer/client/win/printer_win.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rail/client/rail_main.c
+++ b/channels/rail/client/rail_main.c
@ -24,7 +24,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rail/client/rail_orders.c
+++ b/channels/rail/client/rail_orders.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rdpdr/client/devman.c
+++ b/channels/rdpdr/client/devman.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpdr/client/irp.c
+++ b/channels/rdpdr/client/irp.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpdr/client/rdpdr_capabilities.c
+++ b/channels/rdpdr/client/rdpdr_capabilities.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpdr/client/rdpdr_main.c
+++ b/channels/rdpdr/client/rdpdr_main.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpdr/server/rdpdr_main.c
+++ b/channels/rdpdr/server/rdpdr_main.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rdpei/client/rdpei_main.c
+++ b/channels/rdpei/client/rdpei_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpei/client/rdpei_main.h
+++ b/channels/rdpei/client/rdpei_main.h
@ -21,7 +21,7 @@
 #define FREERDP_CHANNEL_RDPEI_CLIENT_MAIN_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/channels/rdpei/rdpei_common.c
+++ b/channels/rdpei/rdpei_common.c
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rdpei/server/rdpei_main.c
+++ b/channels/rdpei/server/rdpei_main.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rdpgfx/client/rdpgfx_codec.c
+++ b/channels/rdpgfx/client/rdpgfx_codec.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rdpgfx/client/rdpgfx_main.c
+++ b/channels/rdpgfx/client/rdpgfx_main.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/channels/rdpgfx/rdpgfx_common.c
+++ b/channels/rdpgfx/rdpgfx_common.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/rdpgfx/server/rdpgfx_main.c
+++ b/channels/rdpgfx/server/rdpgfx_main.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
+++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpsnd/client/fake/rdpsnd_fake.c
+++ b/channels/rdpsnd/client/fake/rdpsnd_fake.c
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpsnd/client/ios/rdpsnd_ios.c
+++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/wtypes.h>
--- a/channels/rdpsnd/client/mac/rdpsnd_mac.m
+++ b/channels/rdpsnd/client/mac/rdpsnd_mac.m
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
+++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/channels/rdpsnd/client/oss/rdpsnd_oss.c
+++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
+++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpsnd/client/rdpsnd_main.c
+++ b/channels/rdpsnd/client/rdpsnd_main.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #ifndef _WIN32
--- a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c
+++ b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <sndio.h>
--- a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
+++ b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/rdpsnd/server/rdpsnd_main.c
+++ b/channels/rdpsnd/server/rdpsnd_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/remdesk/client/remdesk_main.c
+++ b/channels/remdesk/client/remdesk_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/remdesk/server/remdesk_main.c
+++ b/channels/remdesk/server/remdesk_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/serial/client/serial_main.c
+++ b/channels/serial/client/serial_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/channels/server/channels.c
+++ b/channels/server/channels.c
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/smartcard/client/smartcard_main.c
+++ b/channels/smartcard/client/smartcard_main.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/sshagent/client/sshagent_main.c
+++ b/channels/sshagent/client/sshagent_main.c
@ -36,7 +36,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/sshagent/client/sshagent_main.h
+++ b/channels/sshagent/client/sshagent_main.h
@ -22,7 +22,7 @@
 #define SSHAGENT_MAIN_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/stream.h>
--- a/channels/tsmf/client/alsa/tsmf_alsa.c
+++ b/channels/tsmf/client/alsa/tsmf_alsa.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
+++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/channels/tsmf/client/oss/tsmf_oss.c
+++ b/channels/tsmf/client/oss/tsmf_oss.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/pulse/tsmf_pulse.c
+++ b/channels/tsmf/client/pulse/tsmf_pulse.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/tsmf_audio.c
+++ b/channels/tsmf/client/tsmf_audio.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/tsmf_codec.c
+++ b/channels/tsmf/client/tsmf_codec.c
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/channels/tsmf/client/tsmf_decoder.c
+++ b/channels/tsmf/client/tsmf_decoder.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/tsmf_ifman.c
+++ b/channels/tsmf/client/tsmf_ifman.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/tsmf_main.c
+++ b/channels/tsmf/client/tsmf_main.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
@ -501,7 +501,7 @@ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args)
 {
 	int status;
 	DWORD flags;
-	COMMAND_LINE_ARGUMENT_A* arg;
+	const COMMAND_LINE_ARGUMENT_A* arg;
 	TSMF_PLUGIN* tsmf = (TSMF_PLUGIN*)pPlugin;
 	COMMAND_LINE_ARGUMENT_A tsmf_args[] = { { "sys", COMMAND_LINE_VALUE_REQUIRED, "<subsystem>",
 		                                      NULL, NULL, -1, NULL, "audio subsystem" },
--- a/channels/tsmf/client/tsmf_media.c
+++ b/channels/tsmf/client/tsmf_media.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/tsmf/client/tsmf_types.h
+++ b/channels/tsmf/client/tsmf_types.h
@ -21,7 +21,7 @@
 #define FREERDP_CHANNEL_TSMF_CLIENT_TYPES_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/channels/urbdrc/common/urbdrc_helpers.c
+++ b/channels/urbdrc/common/urbdrc_helpers.c
@ -18,7 +18,7 @@
 * limitations under the License.
 */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include "urbdrc_helpers.h"
--- a/channels/urbdrc/common/urbdrc_types.h
+++ b/channels/urbdrc/common/urbdrc_types.h
@ -22,7 +22,7 @@
 #define FREERDP_CHANNEL_URBDRC_CLIENT_TYPES_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/channels/video/client/video_main.c
+++ b/channels/video/client/video_main.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/channels/video/client/video_main.h
+++ b/channels/video/client/video_main.h
@ -21,7 +21,7 @@
 #define FREERDP_CHANNEL_VIDEO_CLIENT_MAIN_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/dvc.h>
--- a/client/Android/android_cliprdr.c
+++ b/client/Android/android_cliprdr.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <jni.h>
--- a/client/Android/android_event.c
+++ b/client/Android/android_event.c
@ -11,7 +11,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/crt.h>
--- a/client/Android/android_freerdp.c
+++ b/client/Android/android_freerdp.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <locale.h>
--- a/client/Android/android_jni_callback.c
+++ b/client/Android/android_jni_callback.c
@ -9,7 +9,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdio.h>
--- a/client/Mac/mf_client.m
+++ b/client/Mac/mf_client.m
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include "mfreerdp.h"
--- a/client/Sample/tf_channels.c
+++ b/client/Sample/tf_channels.c
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/client/Sample/tf_freerdp.c
+++ b/client/Sample/tf_freerdp.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <errno.h>
--- a/client/Wayland/wlf_channels.c
+++ b/client/Wayland/wlf_channels.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <freerdp/gdi/gfx.h>
--- a/client/Wayland/wlf_cliprdr.c
+++ b/client/Wayland/wlf_cliprdr.c
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <stdlib.h>
--- a/client/Wayland/wlf_pointer.c
+++ b/client/Wayland/wlf_pointer.c
@ -19,7 +19,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include "wlf_pointer.h"
--- a/client/Windows/cli/wfreerdp.c
+++ b/client/Windows/cli/wfreerdp.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/windows.h>
--- a/client/Windows/wf_channels.c
+++ b/client/Windows/wf_channels.c
@ -17,7 +17,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/assert.h>
--- a/client/Windows/wf_client.c
+++ b/client/Windows/wf_client.c
@ -20,7 +20,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #include <winpr/windows.h>
--- a/client/Windows/wf_cliprdr.c
+++ b/client/Windows/wf_cliprdr.c
@ -21,7 +21,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <freerdp/config.h>
 #endif

 #define CINTERFACE
--- a/Show More
+++ b/Show More