[includes] untangled circular includes

channels/ainput/server/ainput_main.c

@@ -32,8 +32,9 @@
 #include <winpr/sysinfo.h>
 #include <winpr/stream.h>
 
-#include <freerdp/server/ainput.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/ainput.h>
+#include <freerdp/server/ainput.h>
 #include <freerdp/channels/log.h>
 
 #include "../common/ainput_common.h"

channels/audin/client/alsa/audin_alsa.c

@@ -33,6 +33,7 @@
 
 #include <alsa/asoundlib.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/addin.h>
 #include <freerdp/channels/rdpsnd.h>
 

channels/audin/client/opensles/audin_opensl_es.c

@@ -29,6 +29,7 @@
 #include <winpr/crt.h>
 #include <winpr/cmdline.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/addin.h>
 #include <freerdp/channels/rdpsnd.h>
 

channels/audin/client/oss/audin_oss.c

@@ -44,6 +44,7 @@
 #endif
 #include <sys/ioctl.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/addin.h>
 #include <freerdp/channels/rdpsnd.h>
 

channels/audin/client/pulse/audin_pulse.c

@@ -33,6 +33,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/codec/audio.h>
 #include <freerdp/client/audin.h>
 

channels/audin/client/sndio/audin_sndio.c

@@ -26,6 +26,7 @@
 
 #include <winpr/cmdline.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/rdpsnd.h>
 
 #include "audin_main.h"

channels/audin/client/winmm/audin_winmm.c

@@ -30,6 +30,7 @@
 
 #include <winpr/crt.h>
 #include <winpr/cmdline.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/addin.h>
 #include <freerdp/client/audin.h>
 

channels/audin/server/audin.c

@@ -31,6 +31,7 @@
 #include <winpr/thread.h>
 #include <winpr/stream.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/codec/dsp.h>
 #include <freerdp/codec/audio.h>
 #include <freerdp/channels/wtsvc.h>

channels/client/addin.c

@@ -30,6 +30,7 @@
 #include <winpr/library.h>
 #include <winpr/collections.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/addin.h>
 #include <freerdp/build-config.h>
 #include <freerdp/client/channels.h>

channels/client/tables.c.in

@@ -19,6 +19,7 @@
  * limitations under the License.
  */
 
+#include <freerdp/dvc.h>
 #include <freerdp/channels/rdpdr.h>
 #include "tables.h"
 

channels/cliprdr/client/cliprdr_main.c

@@ -29,6 +29,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/client/cliprdr.h>
 
 #include "../../../channels/client/addin.h"

channels/cliprdr/server/cliprdr_main.c

@@ -26,6 +26,7 @@
 #include <winpr/print.h>
 #include <winpr/stream.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 #include "cliprdr_main.h"
 #include "../cliprdr_common.h"

channels/drdynvc/client/drdynvc_main.c

@@ -25,6 +25,7 @@
 #include <winpr/stream.h>
 #include <winpr/interlocked.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/drdynvc.h>
 #include <freerdp/utils/drdynvc.h>
 

channels/drive/client/drive_main.c

@@ -41,6 +41,7 @@
 #include <winpr/collections.h>
 #include <winpr/shell.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/rdpdr.h>
 
 #include "drive_file.h"

channels/echo/server/echo_main.c

@@ -32,6 +32,7 @@
 #include <winpr/stream.h>
 #include <winpr/sysinfo.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/server/echo.h>
 #include <freerdp/channels/echo.h>
 #include <freerdp/channels/log.h>

channels/encomsp/client/encomsp_main.c

@@ -25,6 +25,7 @@
 #include <winpr/assert.h>
 #include <winpr/print.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 #include <freerdp/client/encomsp.h>
 

channels/encomsp/server/encomsp_main.c

@@ -25,6 +25,7 @@
 #include <winpr/print.h>
 #include <winpr/stream.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 
 #include "encomsp_main.h"

channels/parallel/client/parallel_main.c

@@ -49,6 +49,7 @@
 #include <winpr/interlocked.h>
 
 #include <freerdp/types.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/channels/log.h>

channels/printer/client/printer_main.c

@@ -36,8 +36,10 @@
 #include <winpr/interlocked.h>
 #include <winpr/path.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/crypto/crypto.h>
+#include <freerdp/freerdp.h>
 
 #include "../printer.h"
 

channels/rail/client/rail_main.c

@@ -29,6 +29,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
+#include <freerdp/freerdp.h>
 
 #include "rail_orders.h"
 #include "rail_main.h"

channels/rail/client/rail_orders.c

@@ -27,6 +27,7 @@
 #include <winpr/crt.h>
 
 #include <freerdp/channels/log.h>
+#include <freerdp/freerdp.h>
 
 #include "rail_orders.h"
 

channels/rail/server/rail_main.c

@@ -21,6 +21,7 @@
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 
 #include <winpr/crt.h>

channels/rdp2tcp/client/rdp2tcp_main.c

@@ -24,6 +24,7 @@
 #include <winpr/pipe.h>
 #include <winpr/thread.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/svc.h>
 #include <freerdp/channels/rdp2tcp.h>
 

channels/rdpdr/client/rdpdr_main.c

@@ -37,6 +37,7 @@
 #include <winpr/sspicli.h>
 
 #include <freerdp/types.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/channels/log.h>
 #include <freerdp/channels/rdpdr.h>

channels/rdpdr/server/rdpdr_main.c

@@ -22,6 +22,7 @@
  */
 
 #include <freerdp/config.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/utils/rdpdr_utils.h>
 
 #include <winpr/crt.h>

channels/rdpecam/server/camera_device_enumerator_main.c

@@ -19,6 +19,7 @@
 
 #include <freerdp/config.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 #include <freerdp/server/rdpecam-enumerator.h>
 

channels/rdpecam/server/camera_device_main.c

@@ -19,6 +19,7 @@
 
 #include <freerdp/config.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 #include <freerdp/server/rdpecam.h>
 

channels/rdpgfx/server/rdpgfx_main.c

@@ -29,6 +29,9 @@
 #include <winpr/thread.h>
 #include <winpr/stream.h>
 
+#include <freerdp/freerdp.h>
+#include <freerdp/codec/color.h>
+
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/channels/log.h>
 

channels/rdpsnd/client/fake/rdpsnd_fake.c

@@ -29,6 +29,7 @@
 #include <winpr/cmdline.h>
 
 #include <freerdp/types.h>
+#include <freerdp/settings.h>
 
 #include "rdpsnd_main.h"
 

channels/rdpsnd/client/oss/rdpsnd_oss.c

@@ -45,6 +45,7 @@
 #include <sys/ioctl.h>
 
 #include <freerdp/types.h>
+#include <freerdp/settings.h>
 #include <freerdp/channels/log.h>
 
 #include "rdpsnd_main.h"

channels/rdpsnd/client/rdpsnd_main.c

@@ -44,6 +44,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/codec/dsp.h>
 #include <freerdp/client/channels.h>
 

channels/rdpsnd/server/rdpsnd_main.c

@@ -30,6 +30,7 @@
 #include <winpr/print.h>
 #include <winpr/stream.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 
 #include "rdpsnd_common.h"

channels/remdesk/client/remdesk_main.c

@@ -25,8 +25,10 @@
 #include <winpr/assert.h>
 #include <winpr/print.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/assistance.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 #include <freerdp/client/remdesk.h>
 

channels/remdesk/server/remdesk_main.c

@@ -25,6 +25,8 @@
 #include <winpr/print.h>
 #include <winpr/stream.h>
 
+#include <freerdp/freerdp.h>
+
 #include "remdesk_main.h"
 
 /**

channels/smartcard/client/smartcard_main.c

@@ -28,6 +28,7 @@
 #include <winpr/smartcard.h>
 #include <winpr/environment.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/channels/scard.h>
 #include <freerdp/utils/smartcard_call.h>

channels/sshagent/client/sshagent_main.c

@@ -52,6 +52,8 @@
 #include <winpr/stream.h>
 
 #include "sshagent_main.h"
+
+#include <freerdp/freerdp.h>
 #include <freerdp/client/channels.h>
 #include <freerdp/channels/log.h>
 

channels/telemetry/server/telemetry_main.c

@@ -19,6 +19,7 @@
 
 #include <freerdp/config.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/log.h>
 #include <freerdp/server/telemetry.h>
 

channels/tsmf/client/tsmf_media.c

@@ -38,6 +38,7 @@
 #include <winpr/stream.h>
 #include <winpr/collections.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/client/tsmf.h>
 
 #include "tsmf_constants.h"

client/common/client.c

@@ -26,6 +26,7 @@
 
 #include <freerdp/client.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/addin.h>
 #include <freerdp/assistance.h>
 #include <freerdp/client/file.h>

client/common/cmdline.c

@@ -30,8 +30,10 @@
 #include <winpr/path.h>
 #include <winpr/ncrypt.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/addin.h>
 #include <freerdp/settings.h>
+#include <freerdp/client.h>
 #include <freerdp/client/channels.h>
 #include <freerdp/channels/drdynvc.h>
 #include <freerdp/channels/cliprdr.h>
@@ -2373,7 +2375,7 @@ static BOOL parse_gateway_cred_option(rdpSettings* settings, const char* value,
 			break;
 		default:
 			if (!freerdp_settings_set_string(settings, what, value))
-				return COMMAND_LINE_ERROR_MEMORY;
+				return FALSE;
 			break;
 	}
 
@@ -2452,7 +2454,7 @@ static BOOL parse_gateway_usage_option(rdpSettings* settings, const char* value)
 		LONGLONG val = 0;
 
 		if (!value_to_int(value, &val, TSC_PROXY_MODE_NONE_DIRECT, TSC_PROXY_MODE_NONE_DETECT))
-			return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
+			return FALSE;
 	}
 
 	return freerdp_set_gateway_usage_method(settings, type);

client/common/file.c

@@ -26,6 +26,7 @@
 #include <winpr/string.h>
 #include <winpr/file.h>
 
+#include <freerdp/client.h>
 #include <freerdp/client/file.h>
 #include <freerdp/client/cmdline.h>
 

include/freerdp/api.h

@@ -88,4 +88,14 @@
 #define IFCALLRESULT(_default_return, _cb, ...) \
 	((_cb != NULL) ? _cb(__VA_ARGS__) : (_default_return))
 
+#ifdef __GNUC__
+#define ALIGN64 __attribute__((aligned(8)))
+#else
+#ifdef _WIN32
+#define ALIGN64 __declspec(align(8))
+#else
+#define ALIGN64
+#endif
+#endif
+
 #endif /* FREERDP_API */

include/freerdp/assistance.h

@@ -21,7 +21,8 @@
 #define FREERDP_REMOTE_ASSISTANCE_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
+#include <freerdp/settings.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/autodetect.h

@@ -22,7 +22,7 @@
 #define FREERDP_AUTODETECT_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/cache/persistent.h

@@ -23,7 +23,6 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/freerdp.h>
 
 #include <winpr/crt.h>
 #include <winpr/stream.h>

include/freerdp/channels/channels.h

@@ -26,7 +26,7 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/settings.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/channels/rdpdr.h

@@ -33,7 +33,9 @@
 #include <winpr/interlocked.h>
 #include <winpr/collections.h>
 
-#include <freerdp/freerdp.h>
+#include <freerdp/api.h>
+#include <freerdp/types.h>
+#include <freerdp/settings.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/client.h

@@ -22,8 +22,9 @@
 
 #include <freerdp/config.h>
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 #include <freerdp/event.h>
+#include <freerdp/freerdp.h>
 
 #if defined(CHANNEL_AINPUT_CLIENT)
 #include <freerdp/client/ainput.h>

include/freerdp/client/audin.h

@@ -22,8 +22,10 @@
 #ifndef FREERDP_CHANNEL_AUDIN_CLIENT_AUDIN_H
 #define FREERDP_CHANNEL_AUDIN_CLIENT_AUDIN_H
 
+#include <freerdp/api.h>
+#include <freerdp/types.h>
+
 #include <freerdp/channels/audin.h>
-#include <freerdp/freerdp.h>
 #include <freerdp/codec/audio.h>
 
 #ifdef __cplusplus

include/freerdp/client/channels.h

@@ -21,6 +21,7 @@
 #define FREERDP_CHANNELS_CLIENT_H
 
 #include <freerdp/api.h>
+#include <freerdp/dvc.h>
 #include <freerdp/config.h>
 #include <freerdp/addin.h>
 #include <freerdp/channels/channels.h>

include/freerdp/client/cliprdr.h

@@ -22,11 +22,11 @@
 #ifndef FREERDP_CHANNEL_CLIPRDR_CLIENT_CLIPRDR_H
 #define FREERDP_CHANNEL_CLIPRDR_CLIENT_CLIPRDR_H
 
+#include <freerdp/api.h>
 #include <freerdp/types.h>
 
 #include <freerdp/message.h>
 #include <freerdp/channels/cliprdr.h>
-#include <freerdp/freerdp.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/client/cmdline.h

@@ -23,7 +23,8 @@
 #include <winpr/cmdline.h>
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
+#include <freerdp/settings.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/client/file.h

@@ -21,7 +21,8 @@
 #define FREERDP_CLIENT_RDP_FILE_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
+#include <freerdp/settings.h>
 
 /* Ignore invalid integer values */
 #define RDP_FILE_FLAG_PARSE_INT_RELAXED 1

include/freerdp/client/rdpgfx.h

@@ -22,7 +22,11 @@
 #ifndef FREERDP_CHANNEL_RDPGFX_CLIENT_RDPGFX_H
 #define FREERDP_CHANNEL_RDPGFX_CLIENT_RDPGFX_H
 
-#include <freerdp/freerdp.h>
+#include <freerdp/api.h>
+#include <freerdp/types.h>
+
+#include <freerdp/codecs.h>
+
 #include <freerdp/channels/rdpgfx.h>
 #include <freerdp/utils/profiler.h>
 

include/freerdp/client/rdpsnd.h

@@ -22,6 +22,8 @@
 #define FREERDP_CHANNEL_RDPSND_CLIENT_RDPSND_H
 
 #include <freerdp/channels/rdpsnd.h>
+#include <freerdp/settings.h>
+
 #ifdef __cplusplus
 extern "C"
 {

include/freerdp/client/sshagent.h

@@ -20,11 +20,11 @@
 #ifndef FREERDP_CHANNEL_CLIENT_SSHAGENT_H
 #define FREERDP_CHANNEL_CLIENT_SSHAGENT_H
 
+#include <freerdp/api.h>
 #include <freerdp/types.h>
 
 #include <freerdp/message.h>
 #include <freerdp/channels/cliprdr.h>
-#include <freerdp/freerdp.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/codec/yuv.h

@@ -22,7 +22,6 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 
 #ifdef __cplusplus

include/freerdp/codecs.h

@@ -21,8 +21,7 @@
 #define FREERDP_CODECS_H
 
 #include <freerdp/api.h>
-
+#include <freerdp/types.h>
-#include <freerdp/freerdp.h>
 
 #include <freerdp/codec/color.h>
 
@@ -62,6 +61,7 @@ extern "C"
 		BITMAP_PLANAR_CONTEXT* planar;
 		BITMAP_INTERLEAVED_CONTEXT* interleaved;
 	};
+	typedef struct rdp_codecs rdpCodecs;
 
 	FREERDP_API BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags, UINT32 width,
 	                                               UINT32 height);

include/freerdp/crypto/crypto.h

@@ -23,7 +23,7 @@
 #define FREERDP_CRYPTO_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 #include <freerdp/crypto/certificate_data.h>
 
 #ifdef __cplusplus

include/freerdp/display.h

@@ -20,7 +20,9 @@
 #ifndef FREERDP_DISPLAY_H
 #define FREERDP_DISPLAY_H
 
-#include <freerdp/freerdp.h>
+#include <freerdp/api.h>
+#include <freerdp/types.h>
+#include <freerdp/settings.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/dvc.h

@@ -55,6 +55,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
+#include <freerdp/settings.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/event.h

@@ -21,7 +21,6 @@
 #define FREERDP_EVENT_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
 
 #include <winpr/collections.h>
 

include/freerdp/extension.h

@@ -22,7 +22,6 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/freerdp.h>
 
 #define FREERDP_EXT_EXPORT_FUNC_NAME "FreeRDPExtensionEntry"
 

include/freerdp/freerdp.h

@@ -22,49 +22,42 @@
 #ifndef FREERDP_H
 #define FREERDP_H
 
+#include <winpr/stream.h>
+
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/error.h>
 #include <freerdp/event.h>
+
+#include <freerdp/settings.h>
+
+#include <freerdp/gdi/gdi.h>
 #include <freerdp/codecs.h>
 #include <freerdp/metrics.h>
-#include <freerdp/settings.h>
 #include <freerdp/extension.h>
-
+#include <freerdp/heartbeat.h>
-#include <winpr/stream.h>
-
-#include <freerdp/input.h>
-#include <freerdp/update.h>
 #include <freerdp/message.h>
 #include <freerdp/autodetect.h>
-#include <freerdp/heartbeat.h>
+#include <freerdp/streamdump.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-	typedef struct stream_dump_context rdpStreamDumpContext;
-	typedef struct SmartcardCertInfo_st SmartcardCertInfo;
-
 	typedef struct rdp_rdp rdpRdp;
-	typedef struct rdp_gdi rdpGdi;
 	typedef struct rdp_rail rdpRail;
 	typedef struct rdp_cache rdpCache;
-	typedef struct rdp_channels rdpChannels;
-	typedef struct rdp_graphics rdpGraphics;
-	typedef struct rdp_metrics rdpMetrics;
-	typedef struct rdp_codecs rdpCodecs;
-	typedef struct rdp_transport rdpTransport; /* Opaque */
-
-	typedef struct rdp_freerdp freerdp;
-	typedef struct rdp_context rdpContext;
-	typedef struct rdp_freerdp_peer freerdp_peer;
 
 	typedef struct rdp_client_context rdpClientContext;
 	typedef struct rdp_client_entry_points_v1 RDP_CLIENT_ENTRY_POINTS_V1;
 	typedef RDP_CLIENT_ENTRY_POINTS_V1 RDP_CLIENT_ENTRY_POINTS;
 
+#include <freerdp/utils/smartcardlogon.h>
+#include <freerdp/update.h>
+#include <freerdp/input.h>
+#include <freerdp/graphics.h>
+
 #define MCS_BASE_CHANNEL_ID 1001
 #define MCS_GLOBAL_CHANNEL_ID 1003
 
@@ -78,41 +71,6 @@ extern "C"
 #define VERIFY_CERT_FLAG_MATCH_LEGACY_SHA1 0x100
 #define VERIFY_CERT_FLAG_FP_IS_PEM 0x200
 
-	typedef enum
-	{
-		CONNECTION_STATE_INITIAL,
-		CONNECTION_STATE_NEGO,
-		CONNECTION_STATE_NLA,
-		CONNECTION_STATE_AAD,
-		CONNECTION_STATE_MCS_CREATE_REQUEST,
-		CONNECTION_STATE_MCS_CREATE_RESPONSE,
-		CONNECTION_STATE_MCS_ERECT_DOMAIN,
-		CONNECTION_STATE_MCS_ATTACH_USER,
-		CONNECTION_STATE_MCS_ATTACH_USER_CONFIRM,
-		CONNECTION_STATE_MCS_CHANNEL_JOIN_REQUEST,
-		CONNECTION_STATE_MCS_CHANNEL_JOIN_RESPONSE,
-		CONNECTION_STATE_RDP_SECURITY_COMMENCEMENT,
-		CONNECTION_STATE_SECURE_SETTINGS_EXCHANGE,
-		CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_REQUEST,
-		CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_RESPONSE,
-		CONNECTION_STATE_LICENSING,
-		CONNECTION_STATE_MULTITRANSPORT_BOOTSTRAPPING_REQUEST,
-		CONNECTION_STATE_MULTITRANSPORT_BOOTSTRAPPING_RESPONSE,
-		CONNECTION_STATE_CAPABILITIES_EXCHANGE_DEMAND_ACTIVE,
-		CONNECTION_STATE_CAPABILITIES_EXCHANGE_MONITOR_LAYOUT,
-		CONNECTION_STATE_CAPABILITIES_EXCHANGE_CONFIRM_ACTIVE,
-		CONNECTION_STATE_FINALIZATION_SYNC,
-		CONNECTION_STATE_FINALIZATION_COOPERATE,
-		CONNECTION_STATE_FINALIZATION_REQUEST_CONTROL,
-		CONNECTION_STATE_FINALIZATION_PERSISTENT_KEY_LIST,
-		CONNECTION_STATE_FINALIZATION_FONT_LIST,
-		CONNECTION_STATE_FINALIZATION_CLIENT_SYNC,
-		CONNECTION_STATE_FINALIZATION_CLIENT_COOPERATE,
-		CONNECTION_STATE_FINALIZATION_CLIENT_GRANTED_CONTROL,
-		CONNECTION_STATE_FINALIZATION_CLIENT_FONT_MAP,
-		CONNECTION_STATE_ACTIVE
-	} CONNECTION_STATE;
-
 /* Message types used by gateway messaging callback */
 #define GATEWAY_MESSAGE_CONSENT 1
 #define GATEWAY_MESSAGE_SERVICE 2
@@ -136,7 +94,7 @@ extern "C"
 
 	/** \brief Authentication callback function pointer definition
 	 *
-	 * \param freerdp A pointer to the instance to work on
+	 * \param instance A pointer to the instance to work on
 	 * \param username A pointer to the username string. On input the current username, on output
 	 * the username that should be used. Must not be NULL. \param password A pointer to the password
 	 * string. On input the current password, on output the password that sohould be used. Must not
@@ -152,7 +110,7 @@ extern "C"
 
 	/** \brief Extended authentication callback function pointer definition
 	 *
-	 * \param freerdp A pointer to the instance to work on
+	 * \param instance A pointer to the instance to work on
 	 * \param username A pointer to the username string. On input the current username, on output
 	 * the username that should be used. Must not be NULL. \param password A pointer to the password
 	 * string. On input the current password, on output the password that sohould be used. Must not

include/freerdp/gdi/gdi.h

@@ -25,8 +25,10 @@
 #include <winpr/wlog.h>
 
 #include <freerdp/api.h>
+#include <freerdp/types.h>
+
 #include <freerdp/log.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/region.h>
 
@@ -520,6 +522,7 @@ extern "C"
 
 		wLog* log;
 	};
+	typedef struct rdp_gdi rdpGdi;
 
 	FREERDP_API DWORD gdi_rop3_code(BYTE code);
 	FREERDP_API const char* gdi_rop3_code_string(BYTE code);

include/freerdp/gdi/video.h

@@ -20,7 +20,8 @@
 #define FREERDP_GDI_VIDEO_H_
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
+#include <freerdp/gdi/gdi.h>
 #include <freerdp/client/geometry.h>
 #include <freerdp/client/video.h>
 

include/freerdp/graphics.h

@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/freerdp.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -158,6 +157,7 @@ extern "C"
 		rdpGlyph* Glyph_Prototype;     /* 3 */
 		UINT32 paddingA[16 - 4];       /* 4 */
 	};
+	typedef struct rdp_graphics rdpGraphics;
 
 	FREERDP_API void graphics_register_bitmap(rdpGraphics* graphics, const rdpBitmap* bitmap);
 	FREERDP_API void graphics_register_pointer(rdpGraphics* graphics, const rdpPointer* pointer);

include/freerdp/heartbeat.h

@@ -21,6 +21,7 @@
 #define FREERDP_HEARTBEAT_H
 
 #include <freerdp/types.h>
+#include <freerdp/api.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/input.h

@@ -21,7 +21,7 @@
 #define FREERDP_INPUT_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 #include <freerdp/scancode.h>
 
 #include <winpr/crt.h>

include/freerdp/license.h

@@ -23,7 +23,7 @@
 #define FREERDP_LICENSE_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/metrics.h

@@ -35,6 +35,7 @@ extern "C"
 		UINT64 TotalUncompressedBytes;
 		double TotalCompressionRatio;
 	};
+	typedef struct rdp_metrics rdpMetrics;
 
 	FREERDP_API double metrics_write_bytes(rdpMetrics* metrics, UINT32 UncompressedBytes,
 	                                       UINT32 CompressedBytes);

include/freerdp/rail.h

@@ -23,6 +23,7 @@
 
 #include <winpr/windows.h>
 
+#include <freerdp/api.h>
 #include <freerdp/types.h>
 
 #ifdef __cplusplus

include/freerdp/server/disp.h

@@ -22,7 +22,6 @@
 
 #include <freerdp/channels/disp.h>
 
-#include <freerdp/freerdp.h>
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 

include/freerdp/server/gfxredir.h

@@ -22,7 +22,6 @@
 
 #include <freerdp/channels/gfxredir.h>
 
-#include <freerdp/freerdp.h>
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 

include/freerdp/server/proxy/proxy_context.h

@@ -22,6 +22,9 @@
 #ifndef FREERDP_SERVER_PROXY_PFCONTEXT_H
 #define FREERDP_SERVER_PROXY_PFCONTEXT_H
 
+#include <freerdp/api.h>
+#include <freerdp/types.h>
+
 #include <freerdp/freerdp.h>
 #include <freerdp/channels/wtsvc.h>
 

include/freerdp/server/rail.h

@@ -22,7 +22,6 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/freerdp.h>
 
 #include <freerdp/rail.h>
 #include <freerdp/channels/rail.h>

include/freerdp/server/rdpgfx.h

@@ -21,7 +21,7 @@
 #define FREERDP_CHANNEL_RDPGFX_SERVER_RDPGFX_H
 
 #include <freerdp/channels/rdpgfx.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/server/shadow.h

@@ -23,6 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/settings.h>
 #include <freerdp/listener.h>
 

include/freerdp/settings.h

@@ -468,16 +468,6 @@ typedef struct
 #define THREADING_FLAGS_DISABLE_THREADS 0x00000001
 /* Settings */
 
-#ifdef __GNUC__
-#define ALIGN64 __attribute__((aligned(8)))
-#else
-#ifdef _WIN32
-#define ALIGN64 __declspec(align(8))
-#else
-#define ALIGN64
-#endif
-#endif
-
 /**
  * FreeRDP Settings Ids
  * This is generated with a script parsing the rdpSettings data structure

include/freerdp/streamdump.h

@@ -25,7 +25,7 @@
 #include <winpr/wtypes.h>
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/svc.h

@@ -26,7 +26,7 @@
 #include <freerdp/types.h>
 
 #include <winpr/wtsapi.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 
 #define CHANNEL_EVENT_USER 1000
 

include/freerdp/transport_io.h

@@ -22,11 +22,11 @@
 #ifndef FREERDP_TRANSPORT_IO_H
 #define FREERDP_TRANSPORT_IO_H
 
+#include <winpr/stream.h>
+
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-
+#include <freerdp/settings.h>
-#include <winpr/stream.h>
-#include <freerdp/freerdp.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/types.h

@@ -37,6 +37,47 @@ extern "C"
 {
 #endif
 
+	typedef enum
+	{
+		CONNECTION_STATE_INITIAL,
+		CONNECTION_STATE_NEGO,
+		CONNECTION_STATE_NLA,
+		CONNECTION_STATE_AAD,
+		CONNECTION_STATE_MCS_CREATE_REQUEST,
+		CONNECTION_STATE_MCS_CREATE_RESPONSE,
+		CONNECTION_STATE_MCS_ERECT_DOMAIN,
+		CONNECTION_STATE_MCS_ATTACH_USER,
+		CONNECTION_STATE_MCS_ATTACH_USER_CONFIRM,
+		CONNECTION_STATE_MCS_CHANNEL_JOIN_REQUEST,
+		CONNECTION_STATE_MCS_CHANNEL_JOIN_RESPONSE,
+		CONNECTION_STATE_RDP_SECURITY_COMMENCEMENT,
+		CONNECTION_STATE_SECURE_SETTINGS_EXCHANGE,
+		CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_REQUEST,
+		CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_RESPONSE,
+		CONNECTION_STATE_LICENSING,
+		CONNECTION_STATE_MULTITRANSPORT_BOOTSTRAPPING_REQUEST,
+		CONNECTION_STATE_MULTITRANSPORT_BOOTSTRAPPING_RESPONSE,
+		CONNECTION_STATE_CAPABILITIES_EXCHANGE_DEMAND_ACTIVE,
+		CONNECTION_STATE_CAPABILITIES_EXCHANGE_MONITOR_LAYOUT,
+		CONNECTION_STATE_CAPABILITIES_EXCHANGE_CONFIRM_ACTIVE,
+		CONNECTION_STATE_FINALIZATION_SYNC,
+		CONNECTION_STATE_FINALIZATION_COOPERATE,
+		CONNECTION_STATE_FINALIZATION_REQUEST_CONTROL,
+		CONNECTION_STATE_FINALIZATION_PERSISTENT_KEY_LIST,
+		CONNECTION_STATE_FINALIZATION_FONT_LIST,
+		CONNECTION_STATE_FINALIZATION_CLIENT_SYNC,
+		CONNECTION_STATE_FINALIZATION_CLIENT_COOPERATE,
+		CONNECTION_STATE_FINALIZATION_CLIENT_GRANTED_CONTROL,
+		CONNECTION_STATE_FINALIZATION_CLIENT_FONT_MAP,
+		CONNECTION_STATE_ACTIVE
+	} CONNECTION_STATE;
+
+	typedef struct rdp_channels rdpChannels;
+	typedef struct rdp_freerdp freerdp;
+	typedef struct rdp_context rdpContext;
+	typedef struct rdp_freerdp_peer freerdp_peer;
+	typedef struct rdp_transport rdpTransport; /* Opaque */
+
 	typedef struct
 	{
 		BYTE red;
@@ -50,45 +91,43 @@ extern "C"
 		PALETTE_ENTRY entries[256];
 	} rdpPalette;
 
-#include <freerdp/settings.h>
+	typedef struct
+	{
+		DWORD size;
+		void* data[4];
+	} RDP_PLUGIN_DATA;
 
-typedef struct
+	typedef struct
-{
+	{
-	DWORD size;
+		INT16 x;
-	void* data[4];
+		INT16 y;
-} RDP_PLUGIN_DATA;
+		INT16 width;
+		INT16 height;
+	} RDP_RECT;
 
-typedef struct
+	typedef struct
-{
+	{
-	INT16 x;
+		UINT16 left;
-	INT16 y;
+		UINT16 top;
-	INT16 width;
+		UINT16 right;
-	INT16 height;
+		UINT16 bottom;
-} RDP_RECT;
+	} RECTANGLE_16;
 
-typedef struct
+	typedef struct
-{
+	{
-	UINT16 left;
+		UINT32 left;
-	UINT16 top;
+		UINT32 top;
-	UINT16 right;
+		UINT32 width;
-	UINT16 bottom;
+		UINT32 height;
-} RECTANGLE_16;
+	} RECTANGLE_32;
 
-typedef struct
+	/** @brief type of RDP transport */
-{
+	typedef enum
-	UINT32 left;
+	{
-	UINT32 top;
+		RDP_TRANSPORT_TCP = 0,
-	UINT32 width;
+		RDP_TRANSPORT_UDP_R,
-	UINT32 height;
+		RDP_TRANSPORT_UDP_L
-} RECTANGLE_32;
+	} RDP_TRANSPORT_TYPE;
-
-/** @brief type of RDP transport */
-typedef enum
-{
-	RDP_TRANSPORT_TCP = 0,
-	RDP_TRANSPORT_UDP_R,
-	RDP_TRANSPORT_UDP_L
-} RDP_TRANSPORT_TYPE;
 
 #ifdef __cplusplus
 }

include/freerdp/update.h

@@ -29,7 +29,7 @@
 
 #include <freerdp/rail.h>
 #include <freerdp/types.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/settings.h>
 #include <freerdp/graphics.h>
 #include <freerdp/utils/pcap.h>
 

include/freerdp/utils/passphrase.h

@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/utils/signal.h

@@ -21,7 +21,7 @@
 #define FREERDP_UTILS_SIGNAL_H
 
 #include <freerdp/api.h>
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 
 #ifdef __cplusplus
 extern "C"

include/freerdp/utils/smartcardlogon.h

@@ -19,7 +19,7 @@
 #ifndef FREERDP_UTILS_SMARTCARDLOGON_H
 #define FREERDP_UTILS_SMARTCARDLOGON_H
 
-#include <freerdp/freerdp.h>
+#include <freerdp/types.h>
 #include <freerdp/settings.h>
 #include <freerdp/crypto/certificate.h>
 

include/freerdp/window.h

@@ -21,7 +21,6 @@
 #define FREERDP_UPDATE_WINDOW_H
 
 #include <freerdp/types.h>
-#include <freerdp/freerdp.h>
 #include <freerdp/rail.h>
 
 /* Window Order Header Flags */

libfreerdp/codec/ncrush.c

@@ -28,6 +28,8 @@
 #include <winpr/bitstream.h>
 
 #include <freerdp/log.h>
+#include <freerdp/types.h>
+
 #include "ncrush.h"
 
 #define TAG FREERDP_TAG("codec")

libfreerdp/codec/rfx.c

@@ -33,6 +33,7 @@
 #include <winpr/tchar.h>
 
 #include <freerdp/log.h>
+#include <freerdp/settings.h>
 #include <freerdp/codec/rfx.h>
 #include <freerdp/constants.h>
 #include <freerdp/primitives.h>

libfreerdp/codec/yuv.c

@@ -2,6 +2,8 @@
 #include <winpr/assert.h>
 #include <winpr/pool.h>
 
+#include <freerdp/settings.h>
+#include <freerdp/codec/region.h>
 #include <freerdp/primitives.h>
 #include <freerdp/log.h>
 #include <freerdp/codec/yuv.h>

libfreerdp/core/smartcardlogon.c

@@ -26,6 +26,7 @@
 #include <winpr/path.h>
 
 #include <freerdp/log.h>
+#include <freerdp/freerdp.h>
 #include <winpr/print.h>
 
 #include <freerdp/utils/smartcardlogon.h>

libfreerdp/core/streamdump.c

@@ -25,6 +25,7 @@
 #include <winpr/path.h>
 #include <winpr/string.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/streamdump.h>
 #include <freerdp/transport_io.h>
 

libfreerdp/gdi/graphics.c

@@ -24,6 +24,7 @@
 #include <winpr/crt.h>
 
 #include <freerdp/log.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/gdi/dc.h>
 #include <freerdp/gdi/shape.h>
 #include <freerdp/gdi/region.h>

libfreerdp/gdi/graphics.h

@@ -25,6 +25,7 @@
 #include <freerdp/gdi/gdi.h>
 #include <freerdp/graphics.h>
 #include <freerdp/api.h>
+#include <freerdp/types.h>
 
 FREERDP_LOCAL HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, UINT32 width, UINT32 height, UINT32 format,
                                             BYTE* data);

libfreerdp/utils/passphrase.c

@@ -18,6 +18,7 @@
  */
 
 #include <freerdp/config.h>
+#include <freerdp/freerdp.h>
 
 #include <errno.h>
 #include <freerdp/utils/passphrase.h>

libfreerdp/utils/signal.c

@@ -28,6 +28,11 @@
 #include <freerdp/utils/signal.h>
 #include <freerdp/log.h>
 
+#ifndef _WIN32
+#include <signal.h>
+#include <termios.h>
+#endif
+
 #define TAG FREERDP_TAG("utils.signal")
 
 #ifdef _WIN32

server/Sample/sfreerdp.c

@@ -41,6 +41,7 @@
 #include <freerdp/channels/channels.h>
 #include <freerdp/channels/drdynvc.h>
 
+#include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/server/rdpsnd.h>
 #include <freerdp/settings.h>