diff --git a/client/DirectFB/dfreerdp.h b/client/DirectFB/dfreerdp.h
index 622329d71..785693377 100644
--- a/client/DirectFB/dfreerdp.h
+++ b/client/DirectFB/dfreerdp.h
@@ -20,6 +20,7 @@
 #ifndef __DFREERDP_H
 #define __DFREERDP_H
 
+#include "config.h"
 #include <freerdp/freerdp.h>
 #include <freerdp/graphics.h>
 #include <freerdp/gdi/gdi.h>
diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h
index 88850cade..f7214bd38 100644
--- a/client/X11/xfreerdp.h
+++ b/client/X11/xfreerdp.h
@@ -20,6 +20,7 @@
 #ifndef __XFREERDP_H
 #define __XFREERDP_H
 
+#include "config.h"
 #include <freerdp/freerdp.h>
 #include <freerdp/channels/channels.h>
 #include <freerdp/gdi/gdi.h>
diff --git a/include/freerdp/utils/debug.h b/include/freerdp/utils/debug.h
index 55fc2895e..dfdbe533a 100644
--- a/include/freerdp/utils/debug.h
+++ b/include/freerdp/utils/debug.h
@@ -20,8 +20,6 @@
 #ifndef __UTILS_DEBUG_H
 #define __UTILS_DEBUG_H
 
-#include "config.h"
-
 #include <stdio.h>
 
 #define DEBUG_NULL(fmt, ...) do { } while (0)
diff --git a/include/freerdp/utils/profiler.h b/include/freerdp/utils/profiler.h
index fa367aeef..bdeccdd1b 100644
--- a/include/freerdp/utils/profiler.h
+++ b/include/freerdp/utils/profiler.h
@@ -21,11 +21,6 @@
 #define __UTILS_PROFILER_H
 
 #include <freerdp/api.h>
-
-#include "config.h"
-
-#include <stdio.h>
-
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/stopwatch.h>
 
diff --git a/libfreerdp-channels/libchannels.h b/libfreerdp-channels/libchannels.h
index 27058e383..ab116719e 100644
--- a/libfreerdp-channels/libchannels.h
+++ b/libfreerdp-channels/libchannels.h
@@ -21,6 +21,7 @@
 #ifndef __LIBCHANNELS_H
 #define __LIBCHANNELS_H
 
+#include "config.h"
 #include <freerdp/utils/debug.h>
 
 #ifdef WITH_DEBUG_CHANNELS
diff --git a/libfreerdp-core/rdp.h b/libfreerdp-core/rdp.h
index 6d5f3c196..439d78d41 100644
--- a/libfreerdp-core/rdp.h
+++ b/libfreerdp-core/rdp.h
@@ -20,6 +20,7 @@
 #ifndef __RDP_H
 #define __RDP_H
 
+#include "config.h"
 #include "mcs.h"
 #include "tpkt.h"
 #include "fastpath.h"
diff --git a/libfreerdp-gdi/gdi.h b/libfreerdp-gdi/gdi.h
index 99fa73683..edf8950dc 100644
--- a/libfreerdp-gdi/gdi.h
+++ b/libfreerdp-gdi/gdi.h
@@ -20,6 +20,7 @@
 #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 8dae7970c..617c118ea 100644
--- a/libfreerdp-locale/liblocale.h
+++ b/libfreerdp-locale/liblocale.h
@@ -20,6 +20,7 @@
 #ifndef __LIBLOCALE_H
 #define __LIBLOCALE_H
 
+#include "config.h"
 #include <freerdp/types.h>
 #include <freerdp/utils/debug.h>
 
diff --git a/libfreerdp-rail/librail.h b/libfreerdp-rail/librail.h
index 50bd07b92..08f1f6863 100644
--- a/libfreerdp-rail/librail.h
+++ b/libfreerdp-rail/librail.h
@@ -20,6 +20,7 @@
 #ifndef __LIBRAIL_H
 #define __LIBRAIL_H
 
+#include "config.h"
 #include <freerdp/utils/debug.h>
 
 #ifdef WITH_DEBUG_RAIL
diff --git a/libfreerdp-sspi/sspi.h b/libfreerdp-sspi/sspi.h
index c5c09534d..716609c21 100644
--- a/libfreerdp-sspi/sspi.h
+++ b/libfreerdp-sspi/sspi.h
@@ -20,6 +20,7 @@
 #ifndef FREERDP_AUTH_SSPI_PRIVATE_H
 #define FREERDP_AUTH_SSPI_PRIVATE_H
 
+#include "config.h"
 #include <freerdp/types.h>
 #include <freerdp/sspi/sspi.h>
 
diff --git a/libfreerdp-utils/profiler.c b/libfreerdp-utils/profiler.c
index 13b560c93..e4406b86f 100644
--- a/libfreerdp-utils/profiler.c
+++ b/libfreerdp-utils/profiler.c
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 
+#include "config.h"
 #include <freerdp/utils/profiler.h>
 
 PROFILER* profiler_create(char* name)