diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c
index 80532460d..33c852057 100644
--- a/channels/audin/client/alsa/audin_alsa.c
+++ b/channels/audin/client/alsa/audin_alsa.c
@@ -31,9 +31,8 @@
 #include <alsa/asoundlib.h>
 
 #include <freerdp/addin.h>
-#include <freerdp/utils/memory.h>
-#include <freerdp/utils/thread.h>
 #include <freerdp/utils/dsp.h>
+#include <freerdp/utils/thread.h>
 
 #include "audin_main.h"
 
diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c
index 2575661c8..0ad1e6129 100644
--- a/channels/audin/client/audin_main.c
+++ b/channels/audin/client/audin_main.c
@@ -30,7 +30,6 @@
 
 #include <freerdp/addin.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 
 #include "audin_main.h"
diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c
index 1f4873b74..75b1e4cdf 100644
--- a/channels/audin/client/pulse/audin_pulse.c
+++ b/channels/audin/client/pulse/audin_pulse.c
@@ -32,7 +32,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
 
 #include "audin_main.h"
diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c
index 2e0145238..529927bbb 100644
--- a/channels/audin/server/audin.c
+++ b/channels/audin/server/audin.c
@@ -27,10 +27,9 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
 #include <freerdp/utils/thread.h>
+#include <freerdp/utils/stream.h>
 #include <freerdp/utils/wait_obj.h>
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/server/audin.h>
diff --git a/channels/client/channels.c b/channels/client/channels.c
index 45fa8c400..268c80265 100644
--- a/channels/client/channels.c
+++ b/channels/client/channels.c
@@ -35,7 +35,6 @@
 #include <freerdp/channels/channels.h>
 #include <freerdp/svc.h>
 #include <freerdp/addin.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/wait_obj.h>
 #include <freerdp/utils/load_plugin.h>
 #include <freerdp/utils/file.h>
diff --git a/channels/cliprdr/client/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c
index 895d75269..e86d1a218 100644
--- a/channels/cliprdr/client/cliprdr_format.c
+++ b/channels/cliprdr/client/cliprdr_format.c
@@ -31,7 +31,6 @@
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
 #include <freerdp/utils/hexdump.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/unicode.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/client/cliprdr.h>
diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c
index 0f85e553d..44cf58382 100644
--- a/channels/cliprdr/client/cliprdr_main.c
+++ b/channels/cliprdr/client/cliprdr_main.c
@@ -30,7 +30,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/unicode.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/client/cliprdr.h>
diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c
index c9e0ebc87..11b5a271c 100644
--- a/channels/drdynvc/client/drdynvc_main.c
+++ b/channels/drdynvc/client/drdynvc_main.c
@@ -28,10 +28,9 @@
 #include <winpr/crt.h>
 
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/svc_plugin.h>
 #include <freerdp/utils/wait_obj.h>
+#include <freerdp/utils/svc_plugin.h>
 
 #include "dvcman.h"
 #include "drdynvc_types.h"
diff --git a/channels/drdynvc/client/dvcman.c b/channels/drdynvc/client/dvcman.c
index a5631ee73..03cab4b03 100644
--- a/channels/drdynvc/client/dvcman.c
+++ b/channels/drdynvc/client/dvcman.c
@@ -30,7 +30,6 @@
 
 #include <freerdp/addin.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/load_plugin.h>
@@ -41,6 +40,7 @@
 #define MAX_PLUGINS 10
 
 typedef struct _DVCMAN DVCMAN;
+
 struct _DVCMAN
 {
 	IWTSVirtualChannelManager iface;
diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c
index df20bd70b..1d0bc595b 100644
--- a/channels/drive/client/drive_file.c
+++ b/channels/drive/client/drive_file.c
@@ -41,7 +41,6 @@
 #include <winpr/crt.h>
 #include <winpr/file.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
 #include <freerdp/channels/rdpdr.h>
diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c
index 94869b640..12156b6b4 100644
--- a/channels/drive/client/drive_main.c
+++ b/channels/drive/client/drive_main.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
 #include <freerdp/utils/list.h>
diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c
index 43c1cfd77..2af03e799 100644
--- a/channels/parallel/client/parallel_main.c
+++ b/channels/parallel/client/parallel_main.c
@@ -53,7 +53,6 @@
 #include <freerdp/constants.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/thread.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
 #include <freerdp/utils/svc_plugin.h>
diff --git a/channels/printer/client/printer_cups.c b/channels/printer/client/printer_cups.c
index 4c0441e27..aa9b0ee2b 100644
--- a/channels/printer/client/printer_cups.c
+++ b/channels/printer/client/printer_cups.c
@@ -31,7 +31,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/channels/rdpdr.h>
 
diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c
index 675a1d582..c00df2aa8 100644
--- a/channels/printer/client/printer_main.c
+++ b/channels/printer/client/printer_main.c
@@ -32,7 +32,6 @@
 
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/thread.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/channels/rdpdr.h>
diff --git a/channels/printer/client/printer_win.c b/channels/printer/client/printer_win.c
index b2734eaa1..733b24ff0 100644
--- a/channels/printer/client/printer_win.c
+++ b/channels/printer/client/printer_win.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <winspool.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/svc_plugin.h>
 
 #include "printer_main.h"
diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c
index 33ea3a914..b984eff8d 100644
--- a/channels/rail/client/rail_main.c
+++ b/channels/rail/client/rail_main.c
@@ -31,7 +31,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/utils/rail.h>
 #include <freerdp/rail.h>
diff --git a/channels/rdpdr/client/irp.c b/channels/rdpdr/client/irp.c
index 154540fba..68ad41655 100644
--- a/channels/rdpdr/client/irp.c
+++ b/channels/rdpdr/client/irp.c
@@ -28,7 +28,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 
diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c
index 55b2553b0..9e4e493f8 100644
--- a/channels/rdpdr/client/rdpdr_main.c
+++ b/channels/rdpdr/client/rdpdr_main.c
@@ -30,7 +30,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
 #include <freerdp/channels/rdpdr.h>
diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
index b978c8053..679826ad5 100644
--- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
+++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c
@@ -32,13 +32,13 @@
 #include <alsa/asoundlib.h>
 
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
 #include <freerdp/utils/svc_plugin.h>
 
 #include "rdpsnd_main.h"
 
 typedef struct rdpsnd_alsa_plugin rdpsndAlsaPlugin;
+
 struct rdpsnd_alsa_plugin
 {
 	rdpsndDevicePlugin device;
diff --git a/channels/rdpsnd/client/mac/rdpsnd_mac.c b/channels/rdpsnd/client/mac/rdpsnd_mac.c
index cf92002d7..eb82d2bc1 100644
--- a/channels/rdpsnd/client/mac/rdpsnd_mac.c
+++ b/channels/rdpsnd/client/mac/rdpsnd_mac.c
@@ -32,7 +32,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
 #include <freerdp/utils/svc_plugin.h>
 
diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
index 4a00c348c..d0bb11f8e 100644
--- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
+++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c
@@ -31,7 +31,6 @@
 #include <pulse/pulseaudio.h>
 
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
 #include <freerdp/utils/svc_plugin.h>
 
diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c
index f83604e6e..910a5044a 100644
--- a/channels/rdpsnd/client/rdpsnd_main.c
+++ b/channels/rdpsnd/client/rdpsnd_main.c
@@ -36,7 +36,6 @@
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/load_plugin.h>
diff --git a/channels/rdpsnd/server/rdpsnd.c b/channels/rdpsnd/server/rdpsnd.c
index 933402b2a..330c539b0 100644
--- a/channels/rdpsnd/server/rdpsnd.c
+++ b/channels/rdpsnd/server/rdpsnd.c
@@ -27,9 +27,8 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
+#include <freerdp/utils/stream.h>
 #include <freerdp/utils/thread.h>
 #include <freerdp/utils/wait_obj.h>
 #include <freerdp/channels/wtsvc.h>
diff --git a/channels/sample/client/sample_main.c b/channels/sample/client/sample_main.c
index e94c33963..d6cac927f 100644
--- a/channels/sample/client/sample_main.c
+++ b/channels/sample/client/sample_main.c
@@ -34,7 +34,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/load_plugin.h>
diff --git a/channels/serial/client/serial_tty.c b/channels/serial/client/serial_tty.c
index 1a6161244..c42860311 100644
--- a/channels/serial/client/serial_tty.c
+++ b/channels/serial/client/serial_tty.c
@@ -28,7 +28,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
 #include <freerdp/utils/list.h>
diff --git a/channels/server/channels.c b/channels/server/channels.c
index 23b8f0b11..5a191f9d4 100644
--- a/channels/server/channels.c
+++ b/channels/server/channels.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/server/channels.h>
 
 #include <winpr/crt.h>
diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c
index 83a3ba131..a3c3a938a 100644
--- a/channels/tsmf/client/alsa/tsmf_alsa.c
+++ b/channels/tsmf/client/alsa/tsmf_alsa.c
@@ -32,7 +32,6 @@
 #include <alsa/asoundlib.h>
 
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
 
 #include "tsmf_audio.h"
diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c
index 92cf0d0ae..4524809d4 100644
--- a/channels/tsmf/client/pulse/tsmf_pulse.c
+++ b/channels/tsmf/client/pulse/tsmf_pulse.c
@@ -30,8 +30,6 @@
 
 #include <pulse/pulseaudio.h>
 
-#include <freerdp/utils/memory.h>
-
 #include "tsmf_audio.h"
 
 typedef struct _TSMFPulseAudioDevice
diff --git a/client/DirectFB/df_graphics.c b/client/DirectFB/df_graphics.c
index 6c74c92ab..3a20ab8fd 100644
--- a/client/DirectFB/df_graphics.c
+++ b/client/DirectFB/df_graphics.c
@@ -19,8 +19,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
-
 #include "df_graphics.h"
 
 /* Pointer Class */
diff --git a/client/DirectFB/dfreerdp.c b/client/DirectFB/dfreerdp.c
index e01c35ef3..1e06a76f9 100644
--- a/client/DirectFB/dfreerdp.c
+++ b/client/DirectFB/dfreerdp.c
@@ -23,7 +23,6 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/args.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/constants.h>
 #include <freerdp/client/channels.h>
diff --git a/client/Sample/freerdp.c b/client/Sample/freerdp.c
index b03c49cdb..83bc18ea4 100644
--- a/client/Sample/freerdp.c
+++ b/client/Sample/freerdp.c
@@ -39,7 +39,6 @@
 #include <freerdp/gdi/gdi.h>
 #include <freerdp/utils/args.h>
 #include <freerdp/utils/event.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/client/cliprdr.h>
 #include <freerdp/channels/channels.h>
 
diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c
index 6fcc51b5d..4a8008831 100644
--- a/client/Windows/wf_gdi.c
+++ b/client/Windows/wf_gdi.c
@@ -32,7 +32,6 @@
 #include <freerdp/constants.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/bitmap.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/codec/rfx.h>
 #include <freerdp/codec/nsc.h>
 
diff --git a/client/Windows/wf_graphics.c b/client/Windows/wf_graphics.c
index 0e70fb8c2..00d7af2c5 100644
--- a/client/Windows/wf_graphics.c
+++ b/client/Windows/wf_graphics.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/codec/bitmap.h>
 
 #include "wf_gdi.h"
diff --git a/client/Windows/wf_window.h b/client/Windows/wf_window.h
index de093424c..f3c0f95b9 100644
--- a/client/Windows/wf_window.h
+++ b/client/Windows/wf_window.h
@@ -20,7 +20,6 @@
 #define __WF_WINDOW_H
 
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/memory.h>
 
 #include "wfreerdp.h"
 
diff --git a/client/Windows/wfreerdp.c b/client/Windows/wfreerdp.c
index 27a024665..bce421ea8 100644
--- a/client/Windows/wfreerdp.c
+++ b/client/Windows/wfreerdp.c
@@ -43,7 +43,6 @@
 #include <freerdp/constants.h>
 #include <freerdp/utils/args.h>
 #include <freerdp/utils/event.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/load_plugin.h>
 #include <freerdp/utils/svc_plugin.h>
 
diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c
index 1e5797008..db8414b67 100644
--- a/client/X11/xf_gdi.c
+++ b/client/X11/xf_gdi.c
@@ -28,7 +28,6 @@
 #include <freerdp/codec/rfx.h>
 #include <freerdp/codec/nsc.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/bitmap.h>
 
diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c
index 5e2c6224f..f6a52ac16 100644
--- a/client/X11/xf_keyboard.c
+++ b/client/X11/xf_keyboard.c
@@ -24,6 +24,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <winpr/crt.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
diff --git a/client/X11/xf_tsmf.c b/client/X11/xf_tsmf.c
index 66a7769b7..21a8cfa8b 100644
--- a/client/X11/xf_tsmf.c
+++ b/client/X11/xf_tsmf.c
@@ -35,7 +35,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/client/tsmf.h>
 
diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h
index 385c02cb7..f5379e8dd 100644
--- a/client/X11/xf_window.h
+++ b/client/X11/xf_window.h
@@ -21,8 +21,8 @@
 #define __XF_WINDOW_H
 
 #include <X11/Xlib.h>
+
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/memory.h>
 
 typedef struct xf_localmove xfLocalMove;
 typedef struct xf_window xfWindow;
diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c
index d9a4ca0f5..150d479ed 100644
--- a/client/X11/xfreerdp.c
+++ b/client/X11/xfreerdp.c
@@ -50,13 +50,14 @@
 #include <freerdp/codec/rfx.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/bitmap.h>
+
 #include <freerdp/utils/args.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/signal.h>
 #include <freerdp/utils/passphrase.h>
 #include <freerdp/client/cliprdr.h>
 #include <freerdp/client/channels.h>
+
 #include <freerdp/rail.h>
 
 #include <freerdp/client/file.h>
diff --git a/cunit/test_cliprdr.c b/cunit/test_cliprdr.c
index 6c2e427aa..636d400c9 100644
--- a/cunit/test_cliprdr.c
+++ b/cunit/test_cliprdr.c
@@ -25,7 +25,6 @@
 #include <freerdp/channels/channels.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/hexdump.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/client/cliprdr.h>
 
 #include "test_cliprdr.h"
diff --git a/cunit/test_drdynvc.c b/cunit/test_drdynvc.c
index 1d5b95082..c293f935c 100644
--- a/cunit/test_drdynvc.c
+++ b/cunit/test_drdynvc.c
@@ -20,12 +20,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
 #include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/channels/channels.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/hexdump.h>
-#include <freerdp/utils/memory.h>
 
 #include "test_drdynvc.h"
 
diff --git a/cunit/test_nsc.c b/cunit/test_nsc.c
index 915d7b692..4c0edb888 100644
--- a/cunit/test_nsc.c
+++ b/cunit/test_nsc.c
@@ -28,7 +28,6 @@
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
 #include <freerdp/utils/print.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/codec/nsc.h>
 
diff --git a/cunit/test_rail.c b/cunit/test_rail.c
index dde749cd1..810ab322c 100644
--- a/cunit/test_rail.c
+++ b/cunit/test_rail.c
@@ -29,7 +29,6 @@
 #include <freerdp/channels/channels.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/hexdump.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/rail.h>
 #include <freerdp/rail.h>
 
diff --git a/cunit/test_rfx.c b/cunit/test_rfx.c
index f97a9e4ff..613153c77 100644
--- a/cunit/test_rfx.c
+++ b/cunit/test_rfx.c
@@ -30,7 +30,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/utils/print.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/codec/rfx.h>
 
diff --git a/include/freerdp/crypto/crypto.h b/include/freerdp/crypto/crypto.h
index 91e0eae33..a1fb28704 100644
--- a/include/freerdp/crypto/crypto.h
+++ b/include/freerdp/crypto/crypto.h
@@ -44,7 +44,6 @@
 
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/memory.h>
 
 struct crypto_sha1_struct
 {
diff --git a/include/freerdp/crypto/der.h b/include/freerdp/crypto/der.h
index f7758e5aa..b7fd3937e 100644
--- a/include/freerdp/crypto/der.h
+++ b/include/freerdp/crypto/der.h
@@ -21,7 +21,6 @@
 #define FREERDP_CRYPTO_DER_H
 
 #include <freerdp/crypto/er.h>
-#include <freerdp/utils/memory.h>
 
 FREERDP_API int _der_skip_length(int length);
 FREERDP_API int der_write_length(STREAM* s, int length);
diff --git a/include/freerdp/utils/list.h b/include/freerdp/utils/list.h
index ca28e1408..c326eb0e5 100644
--- a/include/freerdp/utils/list.h
+++ b/include/freerdp/utils/list.h
@@ -21,9 +21,9 @@
 #define __LIST_UTILS_H
 
 #include <freerdp/api.h>
-#include <freerdp/utils/memory.h>
 
 typedef struct _LIST_ITEM LIST_ITEM;
+
 struct _LIST_ITEM
 {
 	void* data;
@@ -32,6 +32,7 @@ struct _LIST_ITEM
 };
 
 typedef struct _LIST LIST;
+
 struct _LIST
 {
 	int count;
diff --git a/include/freerdp/utils/memory.h b/include/freerdp/utils/memory.h
deleted file mode 100644
index 4dcc2c098..000000000
--- a/include/freerdp/utils/memory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * FreeRDP: A Remote Desktop Protocol Implementation
- * Memory Utils
- *
- * Copyright 2009-2011 Jay Sorg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MEMORY_UTILS_H
-#define __MEMORY_UTILS_H
-
-#include <stddef.h>
-#include <ctype.h>
-#include <wchar.h>
-
-#include <freerdp/api.h>
-
-#include <winpr/crt.h>
-
-#endif /* __MEMORY_UTILS_H */
diff --git a/include/freerdp/utils/msusb.h b/include/freerdp/utils/msusb.h
index fa357902c..af22154ab 100644
--- a/include/freerdp/utils/msusb.h
+++ b/include/freerdp/utils/msusb.h
@@ -23,7 +23,7 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
+
 #include <freerdp/utils/stream.h>
 
 /* a safer free helper */
diff --git a/include/freerdp/utils/profiler.h b/include/freerdp/utils/profiler.h
index b7fb6983e..7c0a79aa4 100644
--- a/include/freerdp/utils/profiler.h
+++ b/include/freerdp/utils/profiler.h
@@ -21,7 +21,6 @@
 #define __UTILS_PROFILER_H
 
 #include <freerdp/api.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stopwatch.h>
 
 struct _PROFILER
diff --git a/include/freerdp/utils/stopwatch.h b/include/freerdp/utils/stopwatch.h
index 1ee50471b..4cd27896e 100644
--- a/include/freerdp/utils/stopwatch.h
+++ b/include/freerdp/utils/stopwatch.h
@@ -21,9 +21,9 @@
 #define __UTILS_STOPWATCH_H
 
 #include <time.h>
+
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 
 struct _STOPWATCH
 {
diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c
index f22916be2..64cf7579a 100644
--- a/libfreerdp/cache/bitmap.c
+++ b/libfreerdp/cache/bitmap.c
@@ -28,7 +28,6 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/bitmap.h>
 
diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c
index bc0149084..68f364c2d 100644
--- a/libfreerdp/cache/brush.c
+++ b/libfreerdp/cache/brush.c
@@ -28,7 +28,6 @@
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/brush.h>
 
diff --git a/libfreerdp/cache/cache.c b/libfreerdp/cache/cache.c
index fac49ff33..a4e47d1d2 100644
--- a/libfreerdp/cache/cache.c
+++ b/libfreerdp/cache/cache.c
@@ -24,7 +24,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/cache.h>
 
diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c
index efd52dd86..d0f57d0f4 100644
--- a/libfreerdp/cache/glyph.c
+++ b/libfreerdp/cache/glyph.c
@@ -27,7 +27,6 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/glyph.h>
 
diff --git a/libfreerdp/cache/nine_grid.c b/libfreerdp/cache/nine_grid.c
index 66701778e..e4de9deff 100644
--- a/libfreerdp/cache/nine_grid.c
+++ b/libfreerdp/cache/nine_grid.c
@@ -28,7 +28,6 @@
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/nine_grid.h>
 
diff --git a/libfreerdp/cache/offscreen.c b/libfreerdp/cache/offscreen.c
index f85ad3f3c..4a696c0bf 100644
--- a/libfreerdp/cache/offscreen.c
+++ b/libfreerdp/cache/offscreen.c
@@ -26,7 +26,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/offscreen.h>
 
diff --git a/libfreerdp/cache/palette.c b/libfreerdp/cache/palette.c
index 790111b9b..66b18dff2 100644
--- a/libfreerdp/cache/palette.c
+++ b/libfreerdp/cache/palette.c
@@ -26,7 +26,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/palette.h>
 
diff --git a/libfreerdp/cache/pointer.c b/libfreerdp/cache/pointer.c
index 0135d02a2..3d4267361 100644
--- a/libfreerdp/cache/pointer.c
+++ b/libfreerdp/cache/pointer.c
@@ -26,7 +26,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/cache/pointer.h>
 
diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
index 0a7b91b20..34deb6bb8 100644
--- a/libfreerdp/codec/bitmap.c
+++ b/libfreerdp/codec/bitmap.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/codec/color.h>
 
 #include <freerdp/codec/bitmap.h>
diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
index 45c910e4b..f5417d362 100644
--- a/libfreerdp/codec/color.c
+++ b/libfreerdp/codec/color.c
@@ -30,14 +30,13 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/codec/color.h>
-#include <freerdp/utils/memory.h>
 
-int freerdp_get_pixel(BYTE * data, int x, int y, int width, int height, int bpp)
+int freerdp_get_pixel(BYTE* data, int x, int y, int width, int height, int bpp)
 {
 	int start;
 	int shift;
-	UINT16 *src16;
-	UINT32 *src32;
+	UINT16* src16;
+	UINT32* src32;
 	int red, green, blue;
 
 	switch (bpp)
diff --git a/libfreerdp/codec/jpeg.c b/libfreerdp/codec/jpeg.c
index 13b1fbcdc..39174d76d 100644
--- a/libfreerdp/codec/jpeg.c
+++ b/libfreerdp/codec/jpeg.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/codec/color.h>
 
diff --git a/libfreerdp/codec/mppc_dec.c b/libfreerdp/codec/mppc_dec.c
index 3ef4aeb2d..8a8761327 100644
--- a/libfreerdp/codec/mppc_dec.c
+++ b/libfreerdp/codec/mppc_dec.c
@@ -28,8 +28,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
-
 #include <freerdp/codec/mppc_dec.h>
 
 static BYTE HuffLenLEC[] = {
diff --git a/libfreerdp/codec/mppc_enc.c b/libfreerdp/codec/mppc_enc.c
index 15851d70a..07f3d421e 100644
--- a/libfreerdp/codec/mppc_enc.c
+++ b/libfreerdp/codec/mppc_enc.c
@@ -28,7 +28,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/codec/mppc_dec.h>
 #include <freerdp/codec/mppc_enc.h>
 
diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c
index 9a8b699cc..171995361 100644
--- a/libfreerdp/codec/nsc.c
+++ b/libfreerdp/codec/nsc.c
@@ -33,7 +33,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/codec/nsc.h>
-#include <freerdp/utils/memory.h>
 
 #include "nsc_types.h"
 #include "nsc_encode.h"
diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c
index 68f5f4c39..56008d298 100644
--- a/libfreerdp/codec/nsc_encode.c
+++ b/libfreerdp/codec/nsc_encode.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <freerdp/codec/nsc.h>
-#include <freerdp/utils/memory.h>
 
 #include "nsc_types.h"
 #include "nsc_encode.h"
diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
index c203756ed..6acf280f8 100644
--- a/libfreerdp/codec/rfx.c
+++ b/libfreerdp/codec/rfx.c
@@ -32,7 +32,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/codec/rfx.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/constants.h>
 
 #include "rfx_constants.h"
diff --git a/libfreerdp/codec/rfx_rlgr.c b/libfreerdp/codec/rfx_rlgr.c
index 38163f9e5..e6a1c2e1a 100644
--- a/libfreerdp/codec/rfx_rlgr.c
+++ b/libfreerdp/codec/rfx_rlgr.c
@@ -32,8 +32,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
-
 #include "rfx_bitstream.h"
 
 #include "rfx_rlgr.h"
diff --git a/libfreerdp/core/activation.h b/libfreerdp/core/activation.h
index 0a231359e..0c1c2540c 100644
--- a/libfreerdp/core/activation.h
+++ b/libfreerdp/core/activation.h
@@ -23,7 +23,6 @@
 #include "rdp.h"
 
 #include <freerdp/settings.h>
-#include <freerdp/utils/memory.h>
 
 #define SYNCMSGTYPE_SYNC		0x0001
 
diff --git a/libfreerdp/core/channel.c b/libfreerdp/core/channel.c
index 810b28f5a..f0a5855a4 100644
--- a/libfreerdp/core/channel.c
+++ b/libfreerdp/core/channel.c
@@ -28,7 +28,6 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/peer.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 
 #include "rdp.h"
diff --git a/libfreerdp/core/connection.h b/libfreerdp/core/connection.h
index e29232822..6525cb763 100644
--- a/libfreerdp/core/connection.h
+++ b/libfreerdp/core/connection.h
@@ -28,7 +28,6 @@
 #include "activation.h"
 
 #include <freerdp/settings.h>
-#include <freerdp/utils/memory.h>
 
 enum CONNECTION_STATE
 {
diff --git a/libfreerdp/core/extension.c b/libfreerdp/core/extension.c
index 608329b8c..bba0db995 100644
--- a/libfreerdp/core/extension.c
+++ b/libfreerdp/core/extension.c
@@ -30,7 +30,6 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/print.h>
-#include <freerdp/utils/memory.h>
 
 #include "extension.h"
 
diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c
index 5122e6408..4aa9f028e 100644
--- a/libfreerdp/core/freerdp.c
+++ b/libfreerdp/core/freerdp.c
@@ -33,7 +33,6 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/errorcodes.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/locale/keyboard.h>
 
 /* connectErrorCode is 'extern' in errorcodes.h. See comment there.*/
diff --git a/libfreerdp/core/graphics.c b/libfreerdp/core/graphics.c
index 354dbc5dc..18b6d05cb 100644
--- a/libfreerdp/core/graphics.c
+++ b/libfreerdp/core/graphics.c
@@ -23,8 +23,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
-
 #include <freerdp/graphics.h>
 
 /* Bitmap Class */
diff --git a/libfreerdp/core/http.c b/libfreerdp/core/http.c
index 76f1eaa4d..98ace5027 100644
--- a/libfreerdp/core/http.c
+++ b/libfreerdp/core/http.c
@@ -24,8 +24,6 @@
 #include <winpr/crt.h>
 #include <winpr/print.h>
 
-#include <freerdp/utils/memory.h>
-
 #include "http.h"
 
 HttpContext* http_context_new()
diff --git a/libfreerdp/core/input.h b/libfreerdp/core/input.h
index 291763e42..7c749319e 100644
--- a/libfreerdp/core/input.h
+++ b/libfreerdp/core/input.h
@@ -26,7 +26,6 @@
 #include <freerdp/input.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 /* Input Events */
 #define INPUT_EVENT_SYNC		0x0000
diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c
index fe3f7fe83..45a2d8b58 100644
--- a/libfreerdp/core/nego.c
+++ b/libfreerdp/core/nego.c
@@ -27,7 +27,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/unicode.h>
 
 #include "tpkt.h"
diff --git a/libfreerdp/core/ntlm.h b/libfreerdp/core/ntlm.h
index 1156e4d14..03c97c325 100644
--- a/libfreerdp/core/ntlm.h
+++ b/libfreerdp/core/ntlm.h
@@ -40,7 +40,6 @@ typedef struct rdp_ntlm_http rdpNtlmHttp;
 #include <freerdp/utils/sleep.h>
 #include <freerdp/utils/debug.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 
 struct rdp_ntlm
diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
index d29454b03..2d91bf5e6 100644
--- a/libfreerdp/core/orders.c
+++ b/libfreerdp/core/orders.c
@@ -22,6 +22,9 @@
 #endif
 
 #include "window.h"
+
+#include <winpr/crt.h>
+
 #include <freerdp/api.h>
 #include <freerdp/graphics.h>
 #include <freerdp/codec/bitmap.h>
diff --git a/libfreerdp/core/rpc.h b/libfreerdp/core/rpc.h
index 7c69b2057..7bf433f9a 100644
--- a/libfreerdp/core/rpc.h
+++ b/libfreerdp/core/rpc.h
@@ -65,7 +65,6 @@ typedef struct
 #include <freerdp/utils/sleep.h>
 #include <freerdp/utils/debug.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 
 /**
diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c
index 92fba8220..5b022217e 100644
--- a/libfreerdp/core/settings.c
+++ b/libfreerdp/core/settings.c
@@ -24,8 +24,6 @@
 #include "certificate.h"
 #include "capabilities.h"
 
-#include <freerdp/utils/memory.h>
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c
index e46576b02..901444c9f 100644
--- a/libfreerdp/core/tcp.c
+++ b/libfreerdp/core/tcp.c
@@ -55,7 +55,6 @@
 #include <freerdp/utils/uds.h>
 #include <freerdp/utils/print.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include "tcp.h"
 
diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c
index 61cf307e0..9b1ef48b2 100644
--- a/libfreerdp/core/transport.c
+++ b/libfreerdp/core/transport.c
@@ -30,7 +30,6 @@
 #include <freerdp/utils/tcp.h>
 #include <freerdp/utils/sleep.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/errorcodes.h>
 
diff --git a/libfreerdp/core/tsg.c b/libfreerdp/core/tsg.c
index 5d08ea91a..fe7ce2900 100644
--- a/libfreerdp/core/tsg.c
+++ b/libfreerdp/core/tsg.c
@@ -28,7 +28,6 @@
 
 #include <freerdp/utils/sleep.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/utils/unicode.h>
 
diff --git a/libfreerdp/core/window.c b/libfreerdp/core/window.c
index 2e65c90b8..60c6f4ec3 100644
--- a/libfreerdp/core/window.c
+++ b/libfreerdp/core/window.c
@@ -25,7 +25,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/rail.h>
-#include <freerdp/utils/memory.h>
 
 #include "window.h"
 
diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
index 45f66925e..c83993f9f 100644
--- a/libfreerdp/crypto/tls.c
+++ b/libfreerdp/crypto/tls.c
@@ -24,7 +24,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/crypto/tls.h>
 
diff --git a/libfreerdp/gdi/bitmap.c b/libfreerdp/gdi/bitmap.c
index 2b9a916c2..10a24fa76 100644
--- a/libfreerdp/gdi/bitmap.c
+++ b/libfreerdp/gdi/bitmap.c
@@ -29,7 +29,6 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
 #include <freerdp/codec/color.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/gdi/32bpp.h>
 #include <freerdp/gdi/16bpp.h>
diff --git a/libfreerdp/gdi/brush.c b/libfreerdp/gdi/brush.c
index c92099306..f1990f9ea 100644
--- a/libfreerdp/gdi/brush.c
+++ b/libfreerdp/gdi/brush.c
@@ -29,7 +29,6 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/gdi/32bpp.h>
 #include <freerdp/gdi/16bpp.h>
diff --git a/libfreerdp/gdi/dc.c b/libfreerdp/gdi/dc.c
index 4c814ebfc..892fc1dc1 100644
--- a/libfreerdp/gdi/dc.c
+++ b/libfreerdp/gdi/dc.c
@@ -30,7 +30,6 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
 #include <freerdp/codec/color.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/gdi/region.h>
 
diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c
index 3aff5a0e2..f222899e1 100644
--- a/libfreerdp/gdi/gdi.c
+++ b/libfreerdp/gdi/gdi.c
@@ -30,7 +30,6 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/bitmap.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/bitmap.h>
diff --git a/libfreerdp/gdi/graphics.c b/libfreerdp/gdi/graphics.c
index 3fba1bda6..d10f49d30 100644
--- a/libfreerdp/gdi/graphics.c
+++ b/libfreerdp/gdi/graphics.c
@@ -34,7 +34,6 @@
 #include <freerdp/gdi/clipping.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/bitmap.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/codec/bitmap.h>
 #include <freerdp/cache/glyph.h>
 
diff --git a/libfreerdp/gdi/palette.c b/libfreerdp/gdi/palette.c
index d069bf2ed..d605b5cfa 100644
--- a/libfreerdp/gdi/palette.c
+++ b/libfreerdp/gdi/palette.c
@@ -29,7 +29,6 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/gdi/palette.h>
 
diff --git a/libfreerdp/gdi/pen.c b/libfreerdp/gdi/pen.c
index db98ceac6..24051191c 100644
--- a/libfreerdp/gdi/pen.c
+++ b/libfreerdp/gdi/pen.c
@@ -30,7 +30,6 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/gdi/pen.h>
 
diff --git a/libfreerdp/gdi/region.c b/libfreerdp/gdi/region.c
index d3147188f..a0869f99e 100644
--- a/libfreerdp/gdi/region.c
+++ b/libfreerdp/gdi/region.c
@@ -28,7 +28,6 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/gdi/region.h>
 
diff --git a/libfreerdp/locale/keyboard.c b/libfreerdp/locale/keyboard.c
index 777f1cb53..99b55116f 100644
--- a/libfreerdp/locale/keyboard.c
+++ b/libfreerdp/locale/keyboard.c
@@ -24,8 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <winpr/crt.h>
+
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/locale/keyboard.h>
 #include <freerdp/locale/locale.h>
 
diff --git a/libfreerdp/locale/keyboard_keymap.c b/libfreerdp/locale/keyboard_keymap.c
index 920e6b59f..18e9ecf96 100644
--- a/libfreerdp/locale/keyboard_keymap.c
+++ b/libfreerdp/locale/keyboard_keymap.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include <freerdp/utils/file.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/locale/vkcodes.h>
 #include <freerdp/locale/keyboard.h>
 
@@ -36,7 +35,6 @@
 
 #include <stdlib.h>
 
-
 extern const RDP_SCANCODE VIRTUAL_KEY_CODE_TO_DEFAULT_RDP_SCANCODE_TABLE[256];
 
 int freerdp_keyboard_load_map(UINT32 keycode_to_vkcode[256], char* name)
diff --git a/libfreerdp/locale/keyboard_layout.c b/libfreerdp/locale/keyboard_layout.c
index fd82fd0c1..7ab045b74 100644
--- a/libfreerdp/locale/keyboard_layout.c
+++ b/libfreerdp/locale/keyboard_layout.c
@@ -31,7 +31,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/scancode.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/locale/keyboard.h>
 
 /*
diff --git a/libfreerdp/locale/keyboard_sun.c b/libfreerdp/locale/keyboard_sun.c
index 3ae0bf455..d0b7f7234 100644
--- a/libfreerdp/locale/keyboard_sun.c
+++ b/libfreerdp/locale/keyboard_sun.c
@@ -26,8 +26,8 @@
 #include <string.h>
 
 #include "liblocale.h"
+
 #include <freerdp/locale/keyboard.h>
-#include <freerdp/utils/memory.h>
 
 #include "keyboard_x11.h"
 
diff --git a/libfreerdp/locale/keyboard_x11.c b/libfreerdp/locale/keyboard_x11.c
index 639414a44..a572c551d 100644
--- a/libfreerdp/locale/keyboard_x11.c
+++ b/libfreerdp/locale/keyboard_x11.c
@@ -29,7 +29,6 @@
 
 #include "liblocale.h"
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/locale/locale.h>
 #include <freerdp/locale/keyboard.h>
 
diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c
index e25f961aa..40cb40481 100644
--- a/libfreerdp/locale/keyboard_xkbfile.c
+++ b/libfreerdp/locale/keyboard_xkbfile.c
@@ -27,8 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <winpr/crt.h>
+
 #include <freerdp/locale/keyboard.h>
-#include <freerdp/utils/memory.h>
 
 #include "keyboard_x11.h"
 #include "xkb_layout_ids.h"
diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c
index 957d8f8ae..ba60498b3 100644
--- a/libfreerdp/locale/locale.c
+++ b/libfreerdp/locale/locale.c
@@ -25,9 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <winpr/crt.h>
+
 #include "liblocale.h"
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/locale/locale.h>
 
 struct _SYSTEM_LOCALE
diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c
index d4a2cb102..6dfc4640d 100644
--- a/libfreerdp/locale/timezone.c
+++ b/libfreerdp/locale/timezone.c
@@ -31,7 +31,6 @@
 #include "liblocale.h"
 
 #include <freerdp/utils/time.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/locale/timezone.h>
 
diff --git a/libfreerdp/locale/virtual_key_codes.c b/libfreerdp/locale/virtual_key_codes.c
index ab6337d7a..7247f9872 100644
--- a/libfreerdp/locale/virtual_key_codes.c
+++ b/libfreerdp/locale/virtual_key_codes.c
@@ -25,9 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <freerdp/locale/vkcodes.h>
+#include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
+#include <freerdp/locale/vkcodes.h>
 
 struct _VIRTUAL_KEY_CODE
 {
diff --git a/libfreerdp/locale/xkb_layout_ids.c b/libfreerdp/locale/xkb_layout_ids.c
index 371756482..75ae0419b 100644
--- a/libfreerdp/locale/xkb_layout_ids.c
+++ b/libfreerdp/locale/xkb_layout_ids.c
@@ -25,7 +25,8 @@
 
 #include <string.h>
 
-#include <freerdp/utils/memory.h>
+#include <winpr/crt.h>
+
 #include <freerdp/locale/keyboard.h>
 
 #include "liblocale.h"
diff --git a/libfreerdp/rail/icon.c b/libfreerdp/rail/icon.c
index 92016b564..1334b8aea 100644
--- a/libfreerdp/rail/icon.c
+++ b/libfreerdp/rail/icon.c
@@ -24,7 +24,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/utils/unicode.h>
 
diff --git a/libfreerdp/rail/rail.c b/libfreerdp/rail/rail.c
index 1ffa1fe89..ae11d79a9 100644
--- a/libfreerdp/rail/rail.c
+++ b/libfreerdp/rail/rail.c
@@ -24,7 +24,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include "librail.h"
 
diff --git a/libfreerdp/rail/window.c b/libfreerdp/rail/window.c
index e52f7a191..3fc0145d6 100644
--- a/libfreerdp/rail/window.c
+++ b/libfreerdp/rail/window.c
@@ -21,10 +21,10 @@
 #include "config.h"
 #endif
 
+#include <winpr/crt.h>
 #include <winpr/windows.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/utils/unicode.h>
 
diff --git a/libfreerdp/rail/window_list.c b/libfreerdp/rail/window_list.c
index 41f0e389e..da27d8f9a 100644
--- a/libfreerdp/rail/window_list.c
+++ b/libfreerdp/rail/window_list.c
@@ -24,7 +24,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/stream.h>
-#include <freerdp/utils/memory.h>
 
 #include "librail.h"
 
diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt
index cfb5f14da..b0481a6e7 100644
--- a/libfreerdp/utils/CMakeLists.txt
+++ b/libfreerdp/utils/CMakeLists.txt
@@ -27,7 +27,6 @@ set(${MODULE_PREFIX}_SRCS
 	list.c
 	file.c
 	load_plugin.c
-	memory.c
 	passphrase.c
 	pcap.c
 	profiler.c
diff --git a/libfreerdp/utils/args.c b/libfreerdp/utils/args.c
index 9d028ff46..62251f537 100644
--- a/libfreerdp/utils/args.c
+++ b/libfreerdp/utils/args.c
@@ -41,7 +41,6 @@
 #include <freerdp/settings.h>
 #include <freerdp/constants.h>
 #include <freerdp/utils/print.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/args.h>
 #include <freerdp/utils/passphrase.h>
 
diff --git a/libfreerdp/utils/dsp.c b/libfreerdp/utils/dsp.c
index afcbe88c4..881d969a8 100644
--- a/libfreerdp/utils/dsp.c
+++ b/libfreerdp/utils/dsp.c
@@ -28,7 +28,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
 
 static void freerdp_dsp_resample(FREERDP_DSP_CONTEXT* context,
diff --git a/libfreerdp/utils/event.c b/libfreerdp/utils/event.c
index 370d56d83..5f461a696 100644
--- a/libfreerdp/utils/event.c
+++ b/libfreerdp/utils/event.c
@@ -27,7 +27,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/client/cliprdr.h>
 #include <freerdp/client/tsmf.h>
diff --git a/libfreerdp/utils/file.c b/libfreerdp/utils/file.c
index 446fb0191..8e148b86a 100644
--- a/libfreerdp/utils/file.c
+++ b/libfreerdp/utils/file.c
@@ -30,7 +30,6 @@
 
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/string.h>
 
 #ifndef _WIN32
diff --git a/libfreerdp/utils/list.c b/libfreerdp/utils/list.c
index 87b9a590f..9d255505c 100644
--- a/libfreerdp/utils/list.c
+++ b/libfreerdp/utils/list.c
@@ -27,7 +27,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/list.h>
 
 /**
diff --git a/libfreerdp/utils/load_plugin.c b/libfreerdp/utils/load_plugin.c
index f4f9195ac..1561222c7 100644
--- a/libfreerdp/utils/load_plugin.c
+++ b/libfreerdp/utils/load_plugin.c
@@ -32,7 +32,6 @@
 
 #include <freerdp/utils/file.h>
 #include <freerdp/utils/print.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/load_plugin.h>
 
 #ifdef _WIN32
diff --git a/libfreerdp/utils/memory.c b/libfreerdp/utils/memory.c
deleted file mode 100644
index 76e6cfb6b..000000000
--- a/libfreerdp/utils/memory.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * FreeRDP: A Remote Desktop Protocol Implementation
- * Memory Utils
- *
- * Copyright 2009-2011 Jay Sorg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <winpr/crt.h>
-
diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c
index e3665d697..4f7f77952 100644
--- a/libfreerdp/utils/pcap.c
+++ b/libfreerdp/utils/pcap.c
@@ -45,8 +45,6 @@ int gettimeofday(struct timeval* tp, void* tz)
 #endif
 
 #include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
-
 #include <freerdp/utils/pcap.h>
 
 #define PCAP_MAGIC	0xA1B2C3D4
diff --git a/libfreerdp/utils/rail.c b/libfreerdp/utils/rail.c
index 6a232af70..4dd87e40d 100644
--- a/libfreerdp/utils/rail.c
+++ b/libfreerdp/utils/rail.c
@@ -24,10 +24,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <freerdp/types.h>
+#include <winpr/crt.h>
 
+#include <freerdp/types.h>
 #include <freerdp/utils/rail.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/rail.h>
 
diff --git a/libfreerdp/utils/signal.c b/libfreerdp/utils/signal.c
index fceded616..0dd7b1adc 100644
--- a/libfreerdp/utils/signal.c
+++ b/libfreerdp/utils/signal.c
@@ -22,8 +22,10 @@
 #endif
 
 #include <stddef.h>
+
+#include <winpr/crt.h>
+
 #include <freerdp/utils/signal.h>
-#include <freerdp/utils/memory.h>
 
 #ifdef _WIN32
 
diff --git a/libfreerdp/utils/stream.c b/libfreerdp/utils/stream.c
index 8f13112ec..bb2a69aa0 100644
--- a/libfreerdp/utils/stream.c
+++ b/libfreerdp/utils/stream.c
@@ -27,7 +27,6 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>
 
 /**
diff --git a/libfreerdp/utils/svc_plugin.c b/libfreerdp/utils/svc_plugin.c
index 84703b0b4..cf6e1d5eb 100644
--- a/libfreerdp/utils/svc_plugin.c
+++ b/libfreerdp/utils/svc_plugin.c
@@ -29,7 +29,6 @@
 #include <winpr/crt.h>
 
 #include <freerdp/constants.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/debug.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/list.h>
diff --git a/libfreerdp/utils/thread.c b/libfreerdp/utils/thread.c
index 6b14c9b74..ff3188e5d 100644
--- a/libfreerdp/utils/thread.c
+++ b/libfreerdp/utils/thread.c
@@ -36,7 +36,6 @@
 #endif
 
 #include <freerdp/utils/sleep.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/thread.h>
 
 freerdp_thread* freerdp_thread_new(void)
diff --git a/libfreerdp/utils/unicode.c b/libfreerdp/utils/unicode.c
index bc347254b..6bfe9d7a9 100644
--- a/libfreerdp/utils/unicode.c
+++ b/libfreerdp/utils/unicode.c
@@ -25,7 +25,6 @@
 #include <wctype.h>
 #include <freerdp/types.h>
 #include <freerdp/utils/hexdump.h>
-#include <freerdp/utils/memory.h>
 
 #include <freerdp/utils/unicode.h>
 
diff --git a/libfreerdp/utils/wait_obj.c b/libfreerdp/utils/wait_obj.c
index 552f0e3a6..3c4218ee9 100644
--- a/libfreerdp/utils/wait_obj.c
+++ b/libfreerdp/utils/wait_obj.c
@@ -28,7 +28,6 @@
 #include <winpr/crt.h>
 #include <winpr/windows.h>
 
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/wait_obj.h>
 
 #ifndef _WIN32
diff --git a/server/Mac/mfreerdp.c b/server/Mac/mfreerdp.c
index 867f2cc3c..76de5f206 100644
--- a/server/Mac/mfreerdp.c
+++ b/server/Mac/mfreerdp.c
@@ -33,7 +33,6 @@
 
 #include <freerdp/constants.h>
 #include <freerdp/utils/sleep.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/server/rdpsnd.h>
 
 #include "mf_audin.h"
diff --git a/server/Sample/sfreerdp.c b/server/Sample/sfreerdp.c
index 76df53e51..26b266b3c 100644
--- a/server/Sample/sfreerdp.c
+++ b/server/Sample/sfreerdp.c
@@ -34,7 +34,6 @@
 
 #include <freerdp/constants.h>
 #include <freerdp/utils/sleep.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/server/rdpsnd.h>
 
 #include "sf_audin.h"
diff --git a/server/X11/xf_peer.c b/server/X11/xf_peer.c
index f94a0edaf..c2c1110b1 100644
--- a/server/X11/xf_peer.c
+++ b/server/X11/xf_peer.c
@@ -39,7 +39,6 @@
 #include <freerdp/codec/color.h>
 #include <freerdp/utils/file.h>
 #include <freerdp/utils/sleep.h>
-#include <freerdp/utils/memory.h>
 #include <freerdp/utils/thread.h>
 
 extern char* xf_pcap_file;
diff --git a/server/X11/xfreerdp.c b/server/X11/xfreerdp.c
index d6a28d806..8a37f156b 100644
--- a/server/X11/xfreerdp.c
+++ b/server/X11/xfreerdp.c
@@ -30,8 +30,6 @@
 #include <sys/select.h>
 #include <sys/signal.h>
 
-#include <freerdp/utils/memory.h>
-
 #include "xf_peer.h"
 #include "xfreerdp.h"