diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c
index 2e7e3c89d..6bb465025 100644
--- a/channels/ainput/server/ainput_main.c
+++ b/channels/ainput/server/ainput_main.c
@@ -30,7 +30,6 @@
 #include <winpr/thread.h>
 #include <winpr/stream.h>
 #include <winpr/sysinfo.h>
-#include <winpr/stream.h>
 
 #include <freerdp/freerdp.h>
 #include <freerdp/channels/ainput.h>
diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c
index 4157431f4..c346c506a 100644
--- a/client/X11/xf_client.c
+++ b/client/X11/xf_client.c
@@ -36,7 +36,6 @@
 
 #ifdef WITH_XRENDER
 #include <X11/extensions/Xrender.h>
-#include <math.h>
 #endif
 
 #ifdef WITH_XI
@@ -84,12 +83,10 @@
 #include <freerdp/client/cmdline.h>
 
 #include <winpr/crt.h>
-#include <winpr/assert.h>
 #include <winpr/synch.h>
 #include <winpr/file.h>
 #include <winpr/print.h>
 #include <winpr/sysinfo.h>
-#include <X11/XKBlib.h>
 
 #include "xf_rail.h"
 #if defined(CHANNEL_TSMF_CLIENT)
@@ -103,7 +100,6 @@
 #include "xf_monitor.h"
 #include "xf_graphics.h"
 #include "xf_keyboard.h"
-#include "xf_input.h"
 #include "xf_channels.h"
 #include "xfreerdp.h"
 #include "xf_utils.h"
diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index 3c0fe667a..88d51d6f7 100644
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -37,7 +37,6 @@
 #include "xf_graphics.h"
 
 #include "xf_event.h"
-#include "xf_input.h"
 
 #define TAG CLIENT_TAG("x11")
 
diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c
index dd51a0fd1..d0f65acf1 100644
--- a/client/X11/xf_window.c
+++ b/client/X11/xf_window.c
@@ -48,7 +48,6 @@
 
 #ifdef WITH_XI
 #include <X11/extensions/XInput2.h>
-#include "xf_input.h"
 #endif
 
 #include "xf_gfx.h"
diff --git a/client/common/client.c b/client/common/client.c
index fd7722586..195a7447e 100644
--- a/client/common/client.c
+++ b/client/common/client.c
@@ -43,7 +43,6 @@
 #if defined(CHANNEL_VIDEO_CLIENT)
 #include <freerdp/client/video.h>
 #include <freerdp/channels/video.h>
-#include <freerdp/gdi/video.h>
 #endif
 
 #if defined(CHANNEL_RDPGFX_CLIENT)
@@ -55,6 +54,9 @@
 #if defined(CHANNEL_GEOMETRY_CLIENT)
 #include <freerdp/client/geometry.h>
 #include <freerdp/channels/geometry.h>
+#endif
+
+#if defined(CHANNEL_GEOMETRY_CLIENT) || defined(CHANNEL_VIDEO_CLIENT)
 #include <freerdp/gdi/video.h>
 #endif
 
diff --git a/client/common/file.c b/client/common/file.c
index 06be2fa3c..437ec7fc4 100644
--- a/client/common/file.c
+++ b/client/common/file.c
@@ -45,7 +45,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <winpr/wtypes.h>
diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
index 3b8846606..6a61d9d7b 100644
--- a/libfreerdp/codec/rfx.c
+++ b/libfreerdp/codec/rfx.c
@@ -30,7 +30,6 @@
 #include <winpr/tchar.h>
 #include <winpr/sysinfo.h>
 #include <winpr/registry.h>
-#include <winpr/tchar.h>
 
 #include <freerdp/log.h>
 #include <freerdp/settings.h>
@@ -39,7 +38,6 @@
 #include <freerdp/primitives.h>
 #include <freerdp/codec/region.h>
 #include <freerdp/build-config.h>
-#include <freerdp/codec/region.h>
 
 #include "rfx_constants.h"
 #include "rfx_types.h"
diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
index 8ff575f30..4767604b7 100644
--- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
+++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
@@ -4,7 +4,6 @@
 #include <winpr/image.h>
 #include <winpr/print.h>
 #include <winpr/wlog.h>
-#include <winpr/image.h>
 #include <winpr/sysinfo.h>
 #include <winpr/file.h>
 
diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c
index 060a24607..e57ea6821 100644
--- a/libfreerdp/core/settings.c
+++ b/libfreerdp/core/settings.c
@@ -36,7 +36,6 @@
 
 #include <freerdp/settings.h>
 #include <freerdp/build-config.h>
-#include <ctype.h>
 
 #include "../crypto/certificate.h"
 #include "../crypto/privatekey.h"
diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c
index 120253252..2ad2228ec 100644
--- a/libfreerdp/core/transport.c
+++ b/libfreerdp/core/transport.c
@@ -56,7 +56,6 @@
 #include "utils.h"
 #include "state.h"
 #include "childsession.h"
-#include "settings.h"
 
 #include "gateway/rdg.h"
 #include "gateway/wst.h"
diff --git a/libfreerdp/gdi/test/TestGdiCreate.c b/libfreerdp/gdi/test/TestGdiCreate.c
index 0f50e3fbb..b979fc11a 100644
--- a/libfreerdp/gdi/test/TestGdiCreate.c
+++ b/libfreerdp/gdi/test/TestGdiCreate.c
@@ -5,7 +5,6 @@
 #include <freerdp/gdi/pen.h>
 #include <freerdp/gdi/region.h>
 #include <freerdp/gdi/bitmap.h>
-#include <freerdp/gdi/gdi.h>
 
 #include <winpr/crt.h>
 
diff --git a/libfreerdp/utils/passphrase.c b/libfreerdp/utils/passphrase.c
index 96f5a3185..016da79fe 100644
--- a/libfreerdp/utils/passphrase.c
+++ b/libfreerdp/utils/passphrase.c
@@ -72,7 +72,6 @@ char* freerdp_passphrase_read(rdpContext* context, const char* prompt, char* buf
 #include <sys/stat.h>
 #include <termios.h>
 #include <unistd.h>
-#include <termios.h>
 #include <freerdp/utils/signal.h>
 
 #if defined(WINPR_HAVE_POLL_H) && !defined(__APPLE__)
diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c
index 956ce64de..397c5de14 100644
--- a/server/proxy/pf_config.c
+++ b/server/proxy/pf_config.c
@@ -30,7 +30,6 @@
 #include "pf_server.h"
 #include <freerdp/server/proxy/proxy_config.h>
 
-#include <freerdp/server/proxy/proxy_config.h>
 #include <freerdp/server/proxy/proxy_log.h>
 
 #include <freerdp/crypto/crypto.h>
diff --git a/winpr/libwinpr/crt/string.c b/winpr/libwinpr/crt/string.c
index 0a5e5070e..003d07294 100644
--- a/winpr/libwinpr/crt/string.c
+++ b/winpr/libwinpr/crt/string.c
@@ -27,7 +27,6 @@
 #include <wchar.h>
 
 #include <winpr/crt.h>
-#include <winpr/assert.h>
 #include <winpr/endian.h>
 
 #if defined(WITH_URIPARSER)
diff --git a/winpr/libwinpr/crypto/crypto.c b/winpr/libwinpr/crypto/crypto.c
index 057253f93..26d371fa1 100644
--- a/winpr/libwinpr/crypto/crypto.c
+++ b/winpr/libwinpr/crypto/crypto.c
@@ -139,7 +139,6 @@
 #include "crypto.h"
 
 #include <winpr/crt.h>
-#include <winpr/crypto.h>
 #include <winpr/collections.h>
 
 static wListDictionary* g_ProtectedMemoryBlocks = NULL;
diff --git a/winpr/libwinpr/environment/environment.c b/winpr/libwinpr/environment/environment.c
index c5da089f1..835c2fb50 100644
--- a/winpr/libwinpr/environment/environment.c
+++ b/winpr/libwinpr/environment/environment.c
@@ -30,9 +30,6 @@
 
 #ifndef _WIN32
 
-#include <winpr/crt.h>
-#include <winpr/platform.h>
-
 #ifdef WINPR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/winpr/libwinpr/pipe/pipe.c b/winpr/libwinpr/pipe/pipe.c
index fb0b46e0e..1c29173d9 100644
--- a/winpr/libwinpr/pipe/pipe.c
+++ b/winpr/libwinpr/pipe/pipe.c
@@ -41,7 +41,6 @@
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <winpr/assert.h>
-#include <unistd.h>
 
 #ifdef WINPR_HAVE_SYS_AIO_H
 #undef WINPR_HAVE_SYS_AIO_H /* disable for now, incomplete */
diff --git a/winpr/libwinpr/sspi/Kerberos/kerberos.c b/winpr/libwinpr/sspi/Kerberos/kerberos.c
index b0c561ec4..d099d7c9b 100644
--- a/winpr/libwinpr/sspi/Kerberos/kerberos.c
+++ b/winpr/libwinpr/sspi/Kerberos/kerberos.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <winpr/assert.h>
diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
index 17768eebb..881a743d5 100644
--- a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
+++ b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
@@ -25,7 +25,6 @@
 #include "../sspi.h"
 
 #include <winpr/crt.h>
-#include <winpr/assert.h>
 #include <winpr/print.h>
 #include <winpr/sysinfo.h>
 #include <winpr/tchar.h>
diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c
index 62b33fc45..cfbdb47e7 100644
--- a/winpr/libwinpr/sspi/Negotiate/negotiate.c
+++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c
@@ -25,7 +25,6 @@
 #include <winpr/assert.h>
 #include <winpr/sspi.h>
 #include <winpr/tchar.h>
-#include <winpr/assert.h>
 #include <winpr/registry.h>
 #include <winpr/build-config.h>
 #include <winpr/asn1.h>
diff --git a/winpr/libwinpr/sspicli/sspicli.c b/winpr/libwinpr/sspicli/sspicli.c
index 4f206c86e..f3e922c70 100644
--- a/winpr/libwinpr/sspicli/sspicli.c
+++ b/winpr/libwinpr/sspicli/sspicli.c
@@ -61,8 +61,6 @@
 
 #if defined(WINPR_HAVE_GETPWUID_R)
 #include <sys/types.h>
-#include <pwd.h>
-#include <unistd.h>
 #endif
 
 #include <pthread.h>
diff --git a/winpr/libwinpr/synch/barrier.c b/winpr/libwinpr/synch/barrier.c
index ee3b84a95..002140859 100644
--- a/winpr/libwinpr/synch/barrier.c
+++ b/winpr/libwinpr/synch/barrier.c
@@ -29,7 +29,6 @@
 
 #ifdef WINPR_SYNCHRONIZATION_BARRIER
 
-#include <winpr/assert.h>
 #include <winpr/sysinfo.h>
 #include <winpr/library.h>
 #include <winpr/interlocked.h>
diff --git a/winpr/libwinpr/utils/debug.c b/winpr/libwinpr/utils/debug.c
index 679638538..df68cdcea 100644
--- a/winpr/libwinpr/utils/debug.c
+++ b/winpr/libwinpr/utils/debug.c
@@ -45,7 +45,6 @@
 #include <windows/debug.h>
 #endif
 
-#include <winpr/crt.h>
 #include <winpr/wlog.h>
 #include <winpr/debug.h>
 
diff --git a/winpr/libwinpr/winsock/winsock.c b/winpr/libwinpr/winsock/winsock.c
index 5a1115fba..af1ccc2c1 100644
--- a/winpr/libwinpr/winsock/winsock.c
+++ b/winpr/libwinpr/winsock/winsock.c
@@ -288,7 +288,6 @@ INT winpr_inet_pton(INT Family, PCSTR pszAddrString, PVOID pAddrBuf)
 
 #include <netdb.h>
 #include <errno.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c
index efef232e0..85baeef95 100644
--- a/winpr/tools/makecert/makecert.c
+++ b/winpr/tools/makecert/makecert.c
@@ -26,7 +26,6 @@
 #include <winpr/cmdline.h>
 #include <winpr/sysinfo.h>
 #include <winpr/crypto.h>
-#include <winpr/file.h>
 
 #ifdef WITH_OPENSSL
 #include <openssl/crypto.h>