diff --git a/channels/drdynvc/drdynvc_types.h b/channels/drdynvc/drdynvc_types.h
index a08a60523..5c9ce5947 100644
--- a/channels/drdynvc/drdynvc_types.h
+++ b/channels/drdynvc/drdynvc_types.h
@@ -20,7 +20,10 @@
 #ifndef __DRDYNVC_TYPES_H
 #define __DRDYNVC_TYPES_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <freerdp/dvc.h>
 #include <freerdp/types.h>
 #include <freerdp/utils/debug.h>
diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h
index dc4dfcc48..1a2d673b4 100644
--- a/client/X11/xfreerdp.h
+++ b/client/X11/xfreerdp.h
@@ -20,7 +20,10 @@
 #ifndef __XFREERDP_H
 #define __XFREERDP_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <freerdp/freerdp.h>
 #include <freerdp/channels/channels.h>
 #include <freerdp/gdi/gdi.h>
diff --git a/libfreerdp/channels/libchannels.h b/libfreerdp/channels/libchannels.h
index ab116719e..f34bdeed8 100644
--- a/libfreerdp/channels/libchannels.h
+++ b/libfreerdp/channels/libchannels.h
@@ -21,7 +21,10 @@
 #ifndef __LIBCHANNELS_H
 #define __LIBCHANNELS_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <freerdp/utils/debug.h>
 
 #ifdef WITH_DEBUG_CHANNELS
diff --git a/libfreerdp/codec/nsc_types.h b/libfreerdp/codec/nsc_types.h
index 96a5787ba..3982a9bfb 100644
--- a/libfreerdp/codec/nsc_types.h
+++ b/libfreerdp/codec/nsc_types.h
@@ -21,7 +21,10 @@
 #ifndef __NSC_TYPES_H
 #define __NSC_TYPES_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <freerdp/utils/debug.h>
 #include <freerdp/utils/profiler.h>
 
diff --git a/libfreerdp/codec/rfx_types.h b/libfreerdp/codec/rfx_types.h
index a18034ed0..dd3f739ef 100644
--- a/libfreerdp/codec/rfx_types.h
+++ b/libfreerdp/codec/rfx_types.h
@@ -20,7 +20,10 @@
 #ifndef __RFX_TYPES_H
 #define __RFX_TYPES_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <freerdp/utils/debug.h>
 #include <freerdp/utils/profiler.h>
 
diff --git a/libfreerdp/core/rdp.h b/libfreerdp/core/rdp.h
index 16d779466..b327f8bce 100644
--- a/libfreerdp/core/rdp.h
+++ b/libfreerdp/core/rdp.h
@@ -20,7 +20,10 @@
 #ifndef __RDP_H
 #define __RDP_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "mcs.h"
 #include "tpkt.h"
 #include "fastpath.h"
diff --git a/libfreerdp/core/rts.h b/libfreerdp/core/rts.h
index b7ce7ae2b..449c0e2b3 100644
--- a/libfreerdp/core/rts.h
+++ b/libfreerdp/core/rts.h
@@ -22,7 +22,9 @@
 
 #include "rpc.h"
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <freerdp/types.h>
 #include <freerdp/utils/debug.h>
diff --git a/libfreerdp/core/timezone.h b/libfreerdp/core/timezone.h
index 17b1f70ad..79ef076fc 100644
--- a/libfreerdp/core/timezone.h
+++ b/libfreerdp/core/timezone.h
@@ -21,7 +21,10 @@
 #define __TIMEZONE_H
 
 #include "rdp.h"
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/stream.h>
diff --git a/libfreerdp/gdi/gdi.h b/libfreerdp/gdi/gdi.h
index f9075b131..99fa73683 100644
--- a/libfreerdp/gdi/gdi.h
+++ b/libfreerdp/gdi/gdi.h
@@ -20,8 +20,6 @@
 #ifndef __GDI_CORE_H
 #define __GDI_CORE_H
 
-#include "config.h"
-
 #include "graphics.h"
 
 gdiBitmap* gdi_bitmap_new_ex(rdpGdi* gdi, int width, int height, int bpp, uint8* data);
diff --git a/libfreerdp/locale/liblocale.h b/libfreerdp/locale/liblocale.h
index 40aefe782..27c0987c9 100644
--- a/libfreerdp/locale/liblocale.h
+++ b/libfreerdp/locale/liblocale.h
@@ -20,7 +20,10 @@
 #ifndef __LIBLOCALE_H
 #define __LIBLOCALE_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <freerdp/utils/debug.h>
 
 #ifdef WITH_DEBUG_KBD
diff --git a/libfreerdp/rail/librail.h b/libfreerdp/rail/librail.h
index 08f1f6863..68d9c8b49 100644
--- a/libfreerdp/rail/librail.h
+++ b/libfreerdp/rail/librail.h
@@ -20,7 +20,10 @@
 #ifndef __LIBRAIL_H
 #define __LIBRAIL_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <freerdp/utils/debug.h>
 
 #ifdef WITH_DEBUG_RAIL