diff --git a/client/Windows/wf_cliprdr.c b/client/Windows/wf_cliprdr.c
index 5ce19004e..ca277bc2c 100644
--- a/client/Windows/wf_cliprdr.c
+++ b/client/Windows/wf_cliprdr.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c
index 89edbd0e1..bbdad59a3 100644
--- a/client/Windows/wf_event.c
+++ b/client/Windows/wf_event.c
@@ -19,8 +19,14 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+
 #include <freerdp/freerdp.h>
+
 #include "wfreerdp.h"
 
 #include "wf_event.h"
diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c
index 3ebe379f6..bcbe1c6ec 100644
--- a/client/Windows/wf_gdi.c
+++ b/client/Windows/wf_gdi.c
@@ -19,6 +19,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/client/Windows/wf_graphics.c b/client/Windows/wf_graphics.c
index e6d2a7bba..2920c6b0e 100644
--- a/client/Windows/wf_graphics.c
+++ b/client/Windows/wf_graphics.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <freerdp/utils/memory.h>
 #include <freerdp/codec/bitmap.h>
 
diff --git a/client/Windows/wf_rail.c b/client/Windows/wf_rail.c
index 6a831c9ba..4dac4a4fb 100644
--- a/client/Windows/wf_rail.c
+++ b/client/Windows/wf_rail.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/utils/rail.h>
diff --git a/client/Windows/wf_window.c b/client/Windows/wf_window.c
index 670ddc1e0..9dfc91b6f 100644
--- a/client/Windows/wf_window.c
+++ b/client/Windows/wf_window.c
@@ -17,4 +17,8 @@
  * limitations under the License.
  */
 
-#include "wf_window.h"
\ No newline at end of file
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "wf_window.h"
diff --git a/client/Windows/wfreerdp.c b/client/Windows/wfreerdp.c
index e1a8741cd..2fe643dca 100644
--- a/client/Windows/wfreerdp.c
+++ b/client/Windows/wfreerdp.c
@@ -19,6 +19,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/windows.h>
 
 #include <errno.h>
diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c
index 700a7d447..982fabab4 100644
--- a/client/X11/xf_cliprdr.c
+++ b/client/X11/xf_cliprdr.c
@@ -17,9 +17,14 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/unicode.h>
diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index c89ac4bfa..9a0e9b2d4 100644
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c
index 539f5ffa2..462465e37 100644
--- a/client/X11/xf_gdi.c
+++ b/client/X11/xf_gdi.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
index a97fc86d1..58c94e366 100644
--- a/client/X11/xf_graphics.c
+++ b/client/X11/xf_graphics.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c
index 771f40181..b9382d5cf 100644
--- a/client/X11/xf_keyboard.c
+++ b/client/X11/xf_keyboard.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/client/X11/xf_monitor.c b/client/X11/xf_monitor.c
index 8fdfcf3cb..14ce09ab5 100644
--- a/client/X11/xf_monitor.c
+++ b/client/X11/xf_monitor.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c
index 474956bda..daeef3196 100644
--- a/client/X11/xf_rail.c
+++ b/client/X11/xf_rail.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
diff --git a/client/X11/xf_tsmf.c b/client/X11/xf_tsmf.c
index 7256aae4c..61e5e4382 100644
--- a/client/X11/xf_tsmf.c
+++ b/client/X11/xf_tsmf.c
@@ -17,15 +17,22 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <sys/ipc.h>
 #include <sys/shm.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XShm.h>
+
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/plugins/tsmf.h>
diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c
index 9b05ee315..a2e2677ea 100644
--- a/client/X11/xf_window.c
+++ b/client/X11/xf_window.c
@@ -18,13 +18,18 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/types.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#include <sys/types.h>
+
 #include <sys/shm.h>
 #include <sys/ipc.h>
 
diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c
index 8ea76c3e3..232d6e048 100644
--- a/client/X11/xfreerdp.c
+++ b/client/X11/xfreerdp.c
@@ -18,6 +18,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
@@ -40,6 +44,7 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/select.h>
+
 #include <freerdp/constants.h>
 #include <freerdp/codec/nsc.h>
 #include <freerdp/codec/rfx.h>
diff --git a/client/test/freerdp.c b/client/test/freerdp.c
index 31d0257b4..a301666ba 100644
--- a/client/test/freerdp.c
+++ b/client/test/freerdp.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef _WIN32
 #include <unistd.h>
 #include <pthread.h>
diff --git a/server/Windows/wf_input.c b/server/Windows/wf_input.c
index 94bdc23e7..6c28a93cd 100644
--- a/server/Windows/wf_input.c
+++ b/server/Windows/wf_input.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/windows.h>
 
 #include "wf_input.h"
diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c
index 66f6892de..56273b3d9 100644
--- a/server/Windows/wf_peer.c
+++ b/server/Windows/wf_peer.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <freerdp/listener.h>
 
 #include "wf_peer.h"
diff --git a/server/Windows/wfreerdp.c b/server/Windows/wfreerdp.c
index fcf6ed98a..f793bc8f8 100644
--- a/server/Windows/wfreerdp.c
+++ b/server/Windows/wfreerdp.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/X11/xf_encode.c b/server/X11/xf_encode.c
index 80f6bd3b7..5a941ceb6 100644
--- a/server/X11/xf_encode.c
+++ b/server/X11/xf_encode.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <freerdp/utils/sleep.h>
 
diff --git a/server/X11/xf_event.c b/server/X11/xf_event.c
index d361a5c10..1a3780792 100644
--- a/server/X11/xf_event.c
+++ b/server/X11/xf_event.c
@@ -17,12 +17,17 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
+
 #include <freerdp/utils/memory.h>
 
 #include "xf_event.h"
diff --git a/server/X11/xf_input.c b/server/X11/xf_input.c
index 169c20e49..9d56ab224 100644
--- a/server/X11/xf_input.c
+++ b/server/X11/xf_input.c
@@ -17,7 +17,12 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
+
 #include <freerdp/locale/keyboard.h>
 
 #include "xf_input.h"
diff --git a/server/X11/xf_peer.c b/server/X11/xf_peer.c
index 7cf58b19b..e20c11938 100644
--- a/server/X11/xf_peer.c
+++ b/server/X11/xf_peer.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,6 +31,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <sys/select.h>
+
 #include <freerdp/locale/keyboard.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/utils/file.h>
diff --git a/server/X11/xfreerdp.c b/server/X11/xfreerdp.c
index b8dd6a0d2..379209760 100644
--- a/server/X11/xfreerdp.c
+++ b/server/X11/xfreerdp.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/channels/audin.c b/server/channels/audin.c
index 587b99f0a..9703d4963 100644
--- a/server/channels/audin.c
+++ b/server/channels/audin.c
@@ -17,6 +17,14 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
@@ -25,10 +33,6 @@
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/server/audin.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define MSG_SNDIN_VERSION       0x01
 #define MSG_SNDIN_FORMATS       0x02
 #define MSG_SNDIN_OPEN          0x03
diff --git a/server/channels/rdpsnd.c b/server/channels/rdpsnd.c
index a18e76916..48b9bb096 100644
--- a/server/channels/rdpsnd.c
+++ b/server/channels/rdpsnd.c
@@ -17,6 +17,14 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/dsp.h>
@@ -25,10 +33,6 @@
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/server/rdpsnd.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct _rdpsnd_server
 {
 	rdpsnd_server_context context;
diff --git a/server/test/tfreerdp.c b/server/test/tfreerdp.c
index 3f6771496..d3052ccc7 100644
--- a/server/test/tfreerdp.c
+++ b/server/test/tfreerdp.c
@@ -18,6 +18,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -25,6 +29,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <sys/time.h>
+
 #include <freerdp/constants.h>
 #include <freerdp/utils/sleep.h>
 #include <freerdp/utils/memory.h>
diff --git a/winpr/libwinpr/asn1/asn1.c b/winpr/libwinpr/asn1/asn1.c
index bbd2454a7..ee11192f3 100644
--- a/winpr/libwinpr/asn1/asn1.c
+++ b/winpr/libwinpr/asn1/asn1.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/asn1.h>
 
 #include <winpr/crt.h>
diff --git a/winpr/libwinpr/bcrypt/bcrypt.c b/winpr/libwinpr/bcrypt/bcrypt.c
index 08b9e205f..63840e850 100644
--- a/winpr/libwinpr/bcrypt/bcrypt.c
+++ b/winpr/libwinpr/bcrypt/bcrypt.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/bcrypt.h>
 
 /**
diff --git a/winpr/libwinpr/crt/memory.c b/winpr/libwinpr/crt/memory.c
index 0f9b16f39..39ac0dbe3 100644
--- a/winpr/libwinpr/crt/memory.c
+++ b/winpr/libwinpr/crt/memory.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/crt.h>
 
 /* Memory Allocation: http://msdn.microsoft.com/en-us/library/hk1k7x6x.aspx */
diff --git a/winpr/libwinpr/crt/string.c b/winpr/libwinpr/crt/string.c
index a8472e80f..307cede6a 100644
--- a/winpr/libwinpr/crt/string.c
+++ b/winpr/libwinpr/crt/string.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <wctype.h>
 
diff --git a/winpr/libwinpr/dsparse/dsparse.c b/winpr/libwinpr/dsparse/dsparse.c
index cf4e04926..45ff7ed90 100644
--- a/winpr/libwinpr/dsparse/dsparse.c
+++ b/winpr/libwinpr/dsparse/dsparse.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/dsparse.h>
 
 /**
diff --git a/winpr/libwinpr/handle/handle.c b/winpr/libwinpr/handle/handle.c
index 23ac25566..6f9f9c742 100644
--- a/winpr/libwinpr/handle/handle.c
+++ b/winpr/libwinpr/handle/handle.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/handle.h>
 
 #ifndef _WIN32
diff --git a/winpr/libwinpr/heap/heap.c b/winpr/libwinpr/heap/heap.c
index cb859e056..5de8cba21 100644
--- a/winpr/libwinpr/heap/heap.c
+++ b/winpr/libwinpr/heap/heap.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/crt.h>
 
 /* Memory Allocation: http://msdn.microsoft.com/en-us/library/hk1k7x6x.aspx */
diff --git a/winpr/libwinpr/library/library.c b/winpr/libwinpr/library/library.c
index f19f7615d..9688076cc 100644
--- a/winpr/libwinpr/library/library.c
+++ b/winpr/libwinpr/library/library.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/library.h>
 
 /**
diff --git a/winpr/libwinpr/registry/registry.c b/winpr/libwinpr/registry/registry.c
index b1229b0bd..dbc82e849 100644
--- a/winpr/libwinpr/registry/registry.c
+++ b/winpr/libwinpr/registry/registry.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/registry.h>
 
 /*
diff --git a/winpr/libwinpr/registry/registry_reg.c b/winpr/libwinpr/registry/registry_reg.c
index 65246d6d6..6082b2a25 100644
--- a/winpr/libwinpr/registry/registry_reg.c
+++ b/winpr/libwinpr/registry/registry_reg.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/winpr/libwinpr/rpc/midl.c b/winpr/libwinpr/rpc/midl.c
index bdd5bde5e..aab05d549 100644
--- a/winpr/libwinpr/rpc/midl.c
+++ b/winpr/libwinpr/rpc/midl.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr.c b/winpr/libwinpr/rpc/ndr.c
index bca80d84a..d90a2a03b 100644
--- a/winpr/libwinpr/rpc/ndr.c
+++ b/winpr/libwinpr/rpc/ndr.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/winpr/libwinpr/rpc/ndr_array.c b/winpr/libwinpr/rpc/ndr_array.c
index 3c800144d..d9c53c5ea 100644
--- a/winpr/libwinpr/rpc/ndr_array.c
+++ b/winpr/libwinpr/rpc/ndr_array.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_context.c b/winpr/libwinpr/rpc/ndr_context.c
index 270074f95..531840074 100644
--- a/winpr/libwinpr/rpc/ndr_context.c
+++ b/winpr/libwinpr/rpc/ndr_context.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_correlation.c b/winpr/libwinpr/rpc/ndr_correlation.c
index 1a9383403..3deb4caca 100644
--- a/winpr/libwinpr/rpc/ndr_correlation.c
+++ b/winpr/libwinpr/rpc/ndr_correlation.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_pointer.c b/winpr/libwinpr/rpc/ndr_pointer.c
index bec4b4f2e..f140776d3 100644
--- a/winpr/libwinpr/rpc/ndr_pointer.c
+++ b/winpr/libwinpr/rpc/ndr_pointer.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_private.c b/winpr/libwinpr/rpc/ndr_private.c
index 22fc59868..db57de23b 100644
--- a/winpr/libwinpr/rpc/ndr_private.c
+++ b/winpr/libwinpr/rpc/ndr_private.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_simple.c b/winpr/libwinpr/rpc/ndr_simple.c
index 97927f19e..d9492c130 100644
--- a/winpr/libwinpr/rpc/ndr_simple.c
+++ b/winpr/libwinpr/rpc/ndr_simple.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_string.c b/winpr/libwinpr/rpc/ndr_string.c
index a52fb9923..e5f022df4 100644
--- a/winpr/libwinpr/rpc/ndr_string.c
+++ b/winpr/libwinpr/rpc/ndr_string.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_structure.c b/winpr/libwinpr/rpc/ndr_structure.c
index d7f3957c2..cf0895c30 100644
--- a/winpr/libwinpr/rpc/ndr_structure.c
+++ b/winpr/libwinpr/rpc/ndr_structure.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/ndr_union.c b/winpr/libwinpr/rpc/ndr_union.c
index 644ef5831..be4fab3e2 100644
--- a/winpr/libwinpr/rpc/ndr_union.c
+++ b/winpr/libwinpr/rpc/ndr_union.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/winpr/libwinpr/rpc/rpc.c b/winpr/libwinpr/rpc/rpc.c
index c76096627..2987cfb54 100644
--- a/winpr/libwinpr/rpc/rpc.c
+++ b/winpr/libwinpr/rpc/rpc.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 
 #include <winpr/rpc.h>
diff --git a/winpr/libwinpr/sspi/CredSSP/credssp.c b/winpr/libwinpr/sspi/CredSSP/credssp.c
index e92d53841..3da23e942 100644
--- a/winpr/libwinpr/sspi/CredSSP/credssp.c
+++ b/winpr/libwinpr/sspi/CredSSP/credssp.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/crt.h>
 #include <winpr/sspi.h>
 
diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.c b/winpr/libwinpr/sspi/NTLM/ntlm.c
index fdf3194c6..9c5bf4b0c 100644
--- a/winpr/libwinpr/sspi/NTLM/ntlm.c
+++ b/winpr/libwinpr/sspi/NTLM/ntlm.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <time.h>
 #include <openssl/des.h>
 #include <openssl/md4.h>
diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
index 0625e394e..26967621f 100644
--- a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
+++ b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ntlm.h"
 #include "../sspi.h"
 
diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c
index 99529e158..3fe05ee58 100644
--- a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c
+++ b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ntlm.h"
 #include "../sspi.h"
 
diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c
index 8f5348d37..28d17f02c 100644
--- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c
+++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ntlm.h"
 #include "../sspi.h"
 
diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c
index c8bc191dd..616c647a7 100644
--- a/winpr/libwinpr/sspi/Negotiate/negotiate.c
+++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/crt.h>
 #include <winpr/sspi.h>
 
diff --git a/winpr/libwinpr/sspi/Schannel/schannel.c b/winpr/libwinpr/sspi/Schannel/schannel.c
index 2f94c41c2..b6d755379 100644
--- a/winpr/libwinpr/sspi/Schannel/schannel.c
+++ b/winpr/libwinpr/sspi/Schannel/schannel.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/crt.h>
 #include <winpr/sspi.h>
 
diff --git a/winpr/libwinpr/sspi/sspi.c b/winpr/libwinpr/sspi/sspi.c
index 68b756156..87697460c 100644
--- a/winpr/libwinpr/sspi/sspi.c
+++ b/winpr/libwinpr/sspi/sspi.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include <winpr/crt.h>
diff --git a/winpr/libwinpr/sspi/sspi.h b/winpr/libwinpr/sspi/sspi.h
index 92a7894d2..b51f72398 100644
--- a/winpr/libwinpr/sspi/sspi.h
+++ b/winpr/libwinpr/sspi/sspi.h
@@ -20,8 +20,6 @@
 #ifndef WINPR_SSPI_PRIVATE_H
 #define WINPR_SSPI_PRIVATE_H
 
-#include "config.h"
-
 #include <winpr/sspi.h>
 
 struct _CREDENTIALS
diff --git a/winpr/libwinpr/sspicli/sspicli.c b/winpr/libwinpr/sspicli/sspicli.c
index ef18f7e0c..6a820b2a2 100644
--- a/winpr/libwinpr/sspicli/sspicli.c
+++ b/winpr/libwinpr/sspicli/sspicli.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/sspicli.h>
 
 /**
diff --git a/winpr/libwinpr/synch/critical.c b/winpr/libwinpr/synch/critical.c
index b929ef678..1ebbf99c4 100644
--- a/winpr/libwinpr/synch/critical.c
+++ b/winpr/libwinpr/synch/critical.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/synch.h>
 
 
diff --git a/winpr/libwinpr/synch/event.c b/winpr/libwinpr/synch/event.c
index b929ef678..1ebbf99c4 100644
--- a/winpr/libwinpr/synch/event.c
+++ b/winpr/libwinpr/synch/event.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/synch.h>
 
 
diff --git a/winpr/libwinpr/synch/mutex.c b/winpr/libwinpr/synch/mutex.c
index b929ef678..1ebbf99c4 100644
--- a/winpr/libwinpr/synch/mutex.c
+++ b/winpr/libwinpr/synch/mutex.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/synch.h>
 
 
diff --git a/winpr/libwinpr/synch/semaphore.c b/winpr/libwinpr/synch/semaphore.c
index 867364a1e..8d4be4ea7 100644
--- a/winpr/libwinpr/synch/semaphore.c
+++ b/winpr/libwinpr/synch/semaphore.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/synch.h>
 
 #ifndef _WIN32
diff --git a/winpr/libwinpr/synch/sleep.c b/winpr/libwinpr/synch/sleep.c
index b929ef678..1ebbf99c4 100644
--- a/winpr/libwinpr/synch/sleep.c
+++ b/winpr/libwinpr/synch/sleep.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/synch.h>
 
 
diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c
index feadc8986..000e7a757 100644
--- a/winpr/libwinpr/sysinfo/sysinfo.c
+++ b/winpr/libwinpr/sysinfo/sysinfo.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/sysinfo.h>
 
 /**
diff --git a/winpr/libwinpr/utils/ntlm.c b/winpr/libwinpr/utils/ntlm.c
index f345bc391..200583ac6 100644
--- a/winpr/libwinpr/utils/ntlm.c
+++ b/winpr/libwinpr/utils/ntlm.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/ntlm.h>
 
 #include <winpr/crt.h>
diff --git a/winpr/libwinpr/utils/print.c b/winpr/libwinpr/utils/print.c
index 9aa50fee2..173df27c7 100644
--- a/winpr/libwinpr/utils/print.c
+++ b/winpr/libwinpr/utils/print.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/crt.h>
 #include <winpr/print.h>
 
diff --git a/winpr/libwinpr/utils/sam.c b/winpr/libwinpr/utils/sam.c
index f51b35781..b4cebc685 100644
--- a/winpr/libwinpr/utils/sam.c
+++ b/winpr/libwinpr/utils/sam.c
@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/winpr/libwinpr/utils/stream.c b/winpr/libwinpr/utils/stream.c
index 3def650cf..a1be346a5 100644
--- a/winpr/libwinpr/utils/stream.c
+++ b/winpr/libwinpr/utils/stream.c
@@ -18,6 +18,10 @@
  * limitations under the License.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <winpr/crt.h>
 #include <winpr/stream.h>