diff --git a/client/application.cpp b/client/application.cpp
index 9e2c7e19..1f3ad242 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #ifdef WIN32
diff --git a/client/canvas.cpp b/client/canvas.cpp
index 284a8149..3b5f4b69 100644
--- a/client/canvas.cpp
+++ b/client/canvas.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "canvas.h"
diff --git a/client/client_net_socket.cpp b/client/client_net_socket.cpp
index 6ce44c52..412c1fd5 100644
--- a/client/client_net_socket.cpp
+++ b/client/client_net_socket.cpp
@@ -18,6 +18,9 @@
     Author:
         yhalperi@redhat.com
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "client_net_socket.h"
diff --git a/client/cmd_line_parser.cpp b/client/cmd_line_parser.cpp
index ec00c3e3..2f63c049 100644
--- a/client/cmd_line_parser.cpp
+++ b/client/cmd_line_parser.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 
diff --git a/client/controller.cpp b/client/controller.cpp
index e8d37e65..e7c4b955 100644
--- a/client/controller.cpp
+++ b/client/controller.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "controller.h"
diff --git a/client/cursor.cpp b/client/cursor.cpp
index 0b7d956f..2ca2cd7f 100644
--- a/client/cursor.cpp
+++ b/client/cursor.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "cursor.h"
diff --git a/client/cursor_channel.cpp b/client/cursor_channel.cpp
index c973e9da..12e2470b 100644
--- a/client/cursor_channel.cpp
+++ b/client/cursor_channel.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "cursor_channel.h"
diff --git a/client/display_channel.cpp b/client/display_channel.cpp
index 2950c30d..16a014cf 100644
--- a/client/display_channel.cpp
+++ b/client/display_channel.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "canvas.h"
diff --git a/client/foreign_menu.cpp b/client/foreign_menu.cpp
index e5d7459d..926e266f 100644
--- a/client/foreign_menu.cpp
+++ b/client/foreign_menu.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "foreign_menu.h"
diff --git a/client/glz_decode_tmpl.c b/client/glz_decode_tmpl.c
index 2c475719..2e4f1369 100644
--- a/client/glz_decode_tmpl.c
+++ b/client/glz_decode_tmpl.c
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 // External defines: PLT, RGBX/PLTXX/ALPHA, TO_RGB32.
 // If PLT4/1 and TO_RGB32 are defined, we need CAST_PLT_DISTANCE (
diff --git a/client/glz_decoder.cpp b/client/glz_decoder.cpp
index c5ccb956..dea1a1be 100644
--- a/client/glz_decoder.cpp
+++ b/client/glz_decoder.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "glz_decoder_config.h"
diff --git a/client/glz_decoder_window.cpp b/client/glz_decoder_window.cpp
index ab081f84..54fdbdc8 100644
--- a/client/glz_decoder_window.cpp
+++ b/client/glz_decoder_window.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 
diff --git a/client/gui/gui.cpp b/client/gui/gui.cpp
index eba241f7..abfe1110 100644
--- a/client/gui/gui.cpp
+++ b/client/gui/gui.cpp
@@ -15,6 +15,10 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "common.h"
 
 #include <limits.h>
diff --git a/client/gui/resource_provider.cpp b/client/gui/resource_provider.cpp
index 2b5c44f3..b80ce092 100644
--- a/client/gui/resource_provider.cpp
+++ b/client/gui/resource_provider.cpp
@@ -15,6 +15,10 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "common.h"
 
 #include "resource_provider.h"
diff --git a/client/gui/softrenderer.cpp b/client/gui/softrenderer.cpp
index bdc7a6cd..92a1c838 100644
--- a/client/gui/softrenderer.cpp
+++ b/client/gui/softrenderer.cpp
@@ -15,10 +15,11 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "common.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include "common.h"
 #include "utils.h"
 #include "debug.h"
 
diff --git a/client/gui/softtexture.cpp b/client/gui/softtexture.cpp
index a633f24e..b41dd65b 100644
--- a/client/gui/softtexture.cpp
+++ b/client/gui/softtexture.cpp
@@ -15,12 +15,11 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "common.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "common.h"
 
 #include "softtexture.h"
 #include "softrenderer.h"
diff --git a/client/hot_keys.cpp b/client/hot_keys.cpp
index 053f4990..65b1bc34 100644
--- a/client/hot_keys.cpp
+++ b/client/hot_keys.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "hot_keys.h"
diff --git a/client/inputs_channel.cpp b/client/inputs_channel.cpp
index ae41624f..4d1232a3 100644
--- a/client/inputs_channel.cpp
+++ b/client/inputs_channel.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "inputs_channel.h"
diff --git a/client/jpeg_decoder.cpp b/client/jpeg_decoder.cpp
index f7aba765..74cb758b 100644
--- a/client/jpeg_decoder.cpp
+++ b/client/jpeg_decoder.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "jpeg_decoder.h"
diff --git a/client/menu.cpp b/client/menu.cpp
index 17438218..ebbd323a 100644
--- a/client/menu.cpp
+++ b/client/menu.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "menu.h"
diff --git a/client/mjpeg_decoder.cpp b/client/mjpeg_decoder.cpp
index 49509507..0ac6eaee 100644
--- a/client/mjpeg_decoder.cpp
+++ b/client/mjpeg_decoder.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "debug.h"
diff --git a/client/monitor.cpp b/client/monitor.cpp
index 0b73956d..3d742967 100644
--- a/client/monitor.cpp
+++ b/client/monitor.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "monitor.h"
diff --git a/client/playback_channel.cpp b/client/playback_channel.cpp
index 1e902a90..731b5202 100644
--- a/client/playback_channel.cpp
+++ b/client/playback_channel.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_client.h"
diff --git a/client/process_loop.cpp b/client/process_loop.cpp
index 9a0dadcb..9cd530e2 100644
--- a/client/process_loop.cpp
+++ b/client/process_loop.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "process_loop.h"
diff --git a/client/record_channel.cpp b/client/record_channel.cpp
index 084866cc..738f98fd 100644
--- a/client/record_channel.cpp
+++ b/client/record_channel.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_client.h"
diff --git a/client/red_channel.cpp b/client/red_channel.cpp
index f4cdf529..bcd70514 100644
--- a/client/red_channel.cpp
+++ b/client/red_channel.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_channel.h"
diff --git a/client/red_client.cpp b/client/red_client.cpp
index ea852786..7fd2b5e9 100644
--- a/client/red_client.cpp
+++ b/client/red_client.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <math.h>
diff --git a/client/red_gdi_canvas.cpp b/client/red_gdi_canvas.cpp
index 2e0b4538..038f784d 100644
--- a/client/red_gdi_canvas.cpp
+++ b/client/red_gdi_canvas.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <stdint.h>
diff --git a/client/red_gl_canvas.cpp b/client/red_gl_canvas.cpp
index db47aafa..92529ce5 100644
--- a/client/red_gl_canvas.cpp
+++ b/client/red_gl_canvas.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <stdint.h>
diff --git a/client/red_peer.cpp b/client/red_peer.cpp
index 86a90478..19919a61 100644
--- a/client/red_peer.cpp
+++ b/client/red_peer.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <openssl/x509.h>
diff --git a/client/red_sw_canvas.cpp b/client/red_sw_canvas.cpp
index fec6605e..782cacab 100644
--- a/client/red_sw_canvas.cpp
+++ b/client/red_sw_canvas.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <stdint.h>
diff --git a/client/screen.cpp b/client/screen.cpp
index 575ab5df..d8b6dde4 100644
--- a/client/screen.cpp
+++ b/client/screen.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "screen.h"
diff --git a/client/screen_layer.cpp b/client/screen_layer.cpp
index 8a016b7e..4515be2e 100644
--- a/client/screen_layer.cpp
+++ b/client/screen_layer.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "screen_layer.h"
diff --git a/client/smartcard_channel.cpp b/client/smartcard_channel.cpp
index 32b6d8d6..e0e9b889 100644
--- a/client/smartcard_channel.cpp
+++ b/client/smartcard_channel.cpp
@@ -14,6 +14,10 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <spice/enums.h>
 
 #include "client/red_client.h"
diff --git a/client/threads.cpp b/client/threads.cpp
index eb4b7a18..0b359e8e 100644
--- a/client/threads.cpp
+++ b/client/threads.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "threads.h"
diff --git a/client/tunnel_channel.cpp b/client/tunnel_channel.cpp
index 52587422..3ed45726 100644
--- a/client/tunnel_channel.cpp
+++ b/client/tunnel_channel.cpp
@@ -18,6 +18,9 @@
     Author:
         yhalperi@redhat.com
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "tunnel_channel.h"
diff --git a/client/utils.cpp b/client/utils.cpp
index 460f6107..01ea0d3a 100644
--- a/client/utils.cpp
+++ b/client/utils.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <stdlib.h>
diff --git a/client/windows/event_sources_p.cpp b/client/windows/event_sources_p.cpp
index c3578572..4a9adf16 100644
--- a/client/windows/event_sources_p.cpp
+++ b/client/windows/event_sources_p.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "event_sources.h"
diff --git a/client/windows/main.cpp b/client/windows/main.cpp
index 9c401023..5d6f85b4 100644
--- a/client/windows/main.cpp
+++ b/client/windows/main.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <fstream>
diff --git a/client/windows/my_getopt.cpp b/client/windows/my_getopt.cpp
index 280850a4..da87655a 100644
--- a/client/windows/my_getopt.cpp
+++ b/client/windows/my_getopt.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "../../common/win/my_getopt-1.5/my_getopt.c"
diff --git a/client/windows/named_pipe.cpp b/client/windows/named_pipe.cpp
index 856235a2..76d77da6 100644
--- a/client/windows/named_pipe.cpp
+++ b/client/windows/named_pipe.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "named_pipe.h"
diff --git a/client/windows/pixels_source.cpp b/client/windows/pixels_source.cpp
index a27bfd37..167255bd 100644
--- a/client/windows/pixels_source.cpp
+++ b/client/windows/pixels_source.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "pixels_source.h"
diff --git a/client/windows/platform.cpp b/client/windows/platform.cpp
index f57413dd..c50d7fd5 100644
--- a/client/windows/platform.cpp
+++ b/client/windows/platform.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 
diff --git a/client/windows/platform_utils.cpp b/client/windows/platform_utils.cpp
index eb87468b..b57e921a 100644
--- a/client/windows/platform_utils.cpp
+++ b/client/windows/platform_utils.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <map>
diff --git a/client/windows/playback.cpp b/client/windows/playback.cpp
index 52782889..701dffcb 100644
--- a/client/windows/playback.cpp
+++ b/client/windows/playback.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "playback.h"
diff --git a/client/windows/record.cpp b/client/windows/record.cpp
index 398b1650..f0bb6446 100644
--- a/client/windows/record.cpp
+++ b/client/windows/record.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "record.h"
diff --git a/client/windows/red_drawable.cpp b/client/windows/red_drawable.cpp
index e4b6d8c1..dabc0d97 100644
--- a/client/windows/red_drawable.cpp
+++ b/client/windows/red_drawable.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_drawable.h"
diff --git a/client/windows/red_pixmap.cpp b/client/windows/red_pixmap.cpp
index 2f8655c4..4538441c 100644
--- a/client/windows/red_pixmap.cpp
+++ b/client/windows/red_pixmap.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_pixmap.h"
diff --git a/client/windows/red_pixmap_gdi.cpp b/client/windows/red_pixmap_gdi.cpp
index 035618c2..4336f461 100644
--- a/client/windows/red_pixmap_gdi.cpp
+++ b/client/windows/red_pixmap_gdi.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_pixmap_gdi.h"
diff --git a/client/windows/red_pixmap_sw.cpp b/client/windows/red_pixmap_sw.cpp
index 4d74da40..a72d8704 100644
--- a/client/windows/red_pixmap_sw.cpp
+++ b/client/windows/red_pixmap_sw.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_pixmap_sw.h"
diff --git a/client/windows/red_window.cpp b/client/windows/red_window.cpp
index 9f79ab3d..92ece9b6 100644
--- a/client/windows/red_window.cpp
+++ b/client/windows/red_window.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_window.h"
diff --git a/client/x11/event_sources_p.cpp b/client/x11/event_sources_p.cpp
index 9a692557..1958a04d 100644
--- a/client/x11/event_sources_p.cpp
+++ b/client/x11/event_sources_p.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/select.h>
 #include <sys/fcntl.h>
diff --git a/client/x11/main.cpp b/client/x11/main.cpp
index dfcc101b..ccc95328 100644
--- a/client/x11/main.cpp
+++ b/client/x11/main.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "application.h"
diff --git a/client/x11/named_pipe.cpp b/client/x11/named_pipe.cpp
index c6f38daa..0653bfcc 100644
--- a/client/x11/named_pipe.cpp
+++ b/client/x11/named_pipe.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/client/x11/pixels_source.cpp b/client/x11/pixels_source.cpp
index a2d49f39..8d8b3443 100644
--- a/client/x11/pixels_source.cpp
+++ b/client/x11/pixels_source.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "x_platform.h"
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index dbd2b6ab..37df809c 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 
diff --git a/client/x11/platform_utils.cpp b/client/x11/platform_utils.cpp
index 5ca68f44..6ae30a46 100644
--- a/client/x11/platform_utils.cpp
+++ b/client/x11/platform_utils.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdarg.h>
 #include "utils.h"
diff --git a/client/x11/playback.cpp b/client/x11/playback.cpp
index be89a984..e69294c8 100644
--- a/client/x11/playback.cpp
+++ b/client/x11/playback.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "playback.h"
 #include "utils.h"
diff --git a/client/x11/record.cpp b/client/x11/record.cpp
index 4ef92285..d799e5ae 100644
--- a/client/x11/record.cpp
+++ b/client/x11/record.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "record.h"
 #include "utils.h"
diff --git a/client/x11/red_drawable.cpp b/client/x11/red_drawable.cpp
index 19dcd92a..3712dfd7 100644
--- a/client/x11/red_drawable.cpp
+++ b/client/x11/red_drawable.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_drawable.h"
diff --git a/client/x11/red_pixmap.cpp b/client/x11/red_pixmap.cpp
index 2a0eb99b..79190a06 100644
--- a/client/x11/red_pixmap.cpp
+++ b/client/x11/red_pixmap.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_pixmap.h"
diff --git a/client/x11/red_pixmap_gl.cpp b/client/x11/red_pixmap_gl.cpp
index 0e7b8c13..011ead97 100644
--- a/client/x11/red_pixmap_gl.cpp
+++ b/client/x11/red_pixmap_gl.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <GL/gl.h>
 #include <GL/glu.h>
diff --git a/client/x11/red_pixmap_sw.cpp b/client/x11/red_pixmap_sw.cpp
index 2b514b7f..a0dea4d0 100644
--- a/client/x11/red_pixmap_sw.cpp
+++ b/client/x11/red_pixmap_sw.cpp
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "red_pixmap_sw.h"
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
index d53a92f2..8af22261 100644
--- a/client/x11/red_window.cpp
+++ b/client/x11/red_window.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include <X11/Xlib.h>
diff --git a/client/x11/res.cpp b/client/x11/res.cpp
index b2d3f71a..f73e5404 100644
--- a/client/x11/res.cpp
+++ b/client/x11/res.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "common.h"
 #include "resource.h"
diff --git a/client/x11/x_icon.cpp b/client/x11/x_icon.cpp
index 937eecc2..8931d05f 100644
--- a/client/x11/x_icon.cpp
+++ b/client/x11/x_icon.cpp
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "x_icon.h"
 #include "platform.h"
diff --git a/client/zlib_decoder.cpp b/client/zlib_decoder.cpp
index 9cdadb3c..6c154fef 100644
--- a/client/zlib_decoder.cpp
+++ b/client/zlib_decoder.cpp
@@ -14,6 +14,10 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "common.h"
 #include "zlib_decoder.h"
 #include "debug.h"
diff --git a/common/canvas_base.c b/common/canvas_base.c
index fe650feb..272c7e86 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -20,6 +20,10 @@
 #error "This file shouldn't be compiled directly"
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <setjmp.h>
diff --git a/common/canvas_utils.c b/common/canvas_utils.c
index 020b23cc..1b81d548 100644
--- a/common/canvas_utils.c
+++ b/common/canvas_utils.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "canvas_utils.h"
 
diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c
index 27f644c1..f67aadf5 100644
--- a/common/gdi_canvas.c
+++ b/common/gdi_canvas.c
@@ -15,7 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifndef SPICE_CANVAS_INTERNAL
 #error "This file shouldn't be compiled directly"
diff --git a/common/gl_canvas.c b/common/gl_canvas.c
index 844fc07e..a04740b3 100644
--- a/common/gl_canvas.c
+++ b/common/gl_canvas.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifndef SPICE_CANVAS_INTERNAL
 #error "This file shouldn't be compiled directly"
diff --git a/common/glc.c b/common/glc.c
index e58718f1..d90e3836 100644
--- a/common/glc.c
+++ b/common/glc.c
@@ -17,6 +17,9 @@
 
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/common/lines.c b/common/lines.c
index 1a14c188..baf1ce91 100644
--- a/common/lines.c
+++ b/common/lines.c
@@ -45,7 +45,9 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <spice/macros.h>
diff --git a/common/lz.c b/common/lz.c
index d0d95115..2e3a1365 100644
--- a/common/lz.c
+++ b/common/lz.c
@@ -43,6 +43,9 @@
    SOFTWARE.
 
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "lz.h"
 
diff --git a/common/lz_compress_tmpl.c b/common/lz_compress_tmpl.c
index 18d66976..865a30a8 100644
--- a/common/lz_compress_tmpl.c
+++ b/common/lz_compress_tmpl.c
@@ -40,6 +40,9 @@
    SOFTWARE.
 
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #define DJB2_START 5381;
 #define DJB2_HASH(hash, c) (hash = ((hash << 5) + hash) ^ (c)) //|{hash = ((hash << 5) + hash) + c;}
diff --git a/common/lz_decompress_tmpl.c b/common/lz_decompress_tmpl.c
index aa403f6d..6d520744 100644
--- a/common/lz_decompress_tmpl.c
+++ b/common/lz_decompress_tmpl.c
@@ -59,6 +59,10 @@
     COPY_COMP_PIXEL(encoder, out) - copies pixel from the compressed buffer to the decompressed
                                     buffer. Increases out.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #if !defined(LZ_RGB_ALPHA)
 #define COPY_PIXEL(p, out) (*out++ = p)
 #define COPY_REF_PIXEL(ref, out) (*out++ = *ref++)
diff --git a/common/marshaller.c b/common/marshaller.c
index 6ee7b6ab..2d62cd84 100644
--- a/common/marshaller.c
+++ b/common/marshaller.c
@@ -15,8 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "marshaller.h"
 #include "mem.h"
diff --git a/common/mem.c b/common/mem.c
index a9bd6cc2..96be351c 100644
--- a/common/mem.c
+++ b/common/mem.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "mem.h"
 #include <stdlib.h>
diff --git a/common/ogl_ctx.c b/common/ogl_ctx.c
index ae25c2d5..072a0c0e 100644
--- a/common/ogl_ctx.c
+++ b/common/ogl_ctx.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/common/pixman_utils.c b/common/pixman_utils.c
index 5daee27b..e876fe69 100644
--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@@ -15,8 +15,10 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include "pixman_utils.h"
 #include <spice/macros.h>
 
diff --git a/common/quic.c b/common/quic.c
index cd3aee8b..8f8d7262 100644
--- a/common/quic.c
+++ b/common/quic.c
@@ -19,6 +19,10 @@
 // Red Hat image compression based on SFALIC by Roman Starosolski
 // http://sun.iinf.polsl.gliwice.pl/~rstaros/sfalic/index.html
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "quic.h"
 #include <spice/macros.h>
 
diff --git a/common/quic_family_tmpl.c b/common/quic_family_tmpl.c
index 5547c4d1..7a32f2da 100644
--- a/common/quic_family_tmpl.c
+++ b/common/quic_family_tmpl.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef QUIC_FAMILY_8BPC
 #undef QUIC_FAMILY_8BPC
diff --git a/common/quic_rgb_tmpl.c b/common/quic_rgb_tmpl.c
index 681493a8..814fa5af 100644
--- a/common/quic_rgb_tmpl.c
+++ b/common/quic_rgb_tmpl.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef QUIC_RGB32
 #undef QUIC_RGB32
diff --git a/common/quic_tmpl.c b/common/quic_tmpl.c
index 47a6a230..d300fa97 100644
--- a/common/quic_tmpl.c
+++ b/common/quic_tmpl.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef ONE_BYTE
 #undef ONE_BYTE
diff --git a/common/region.c b/common/region.c
index 3f51f7b7..0e1613c0 100644
--- a/common/region.c
+++ b/common/region.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/common/rop3.c b/common/rop3.c
index 83880fe4..53e8a6da 100644
--- a/common/rop3.c
+++ b/common/rop3.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 
diff --git a/common/sw_canvas.c b/common/sw_canvas.c
index e1b13e0b..651c52bc 100644
--- a/common/sw_canvas.c
+++ b/common/sw_canvas.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifndef SPICE_CANVAS_INTERNAL
 #error "This file shouldn't be compiled directly"
diff --git a/server/agent-msg-filter.c b/server/agent-msg-filter.c
index cd1f78c3..71ff49b7 100644
--- a/server/agent-msg-filter.c
+++ b/server/agent-msg-filter.c
@@ -17,6 +17,9 @@
    Red Hat Authors:
         hdegoede@redhat.com
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
 #include "red_common.h"
diff --git a/server/glz_encode_match_tmpl.c b/server/glz_encode_match_tmpl.c
index bba44dcd..b793e7f0 100644
--- a/server/glz_encode_match_tmpl.c
+++ b/server/glz_encode_match_tmpl.c
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #define SHORT_PIX_IMAGE_DIST_LEVEL_1 64 //(1 << 6)
 #define SHORT_PIX_IMAGE_DIST_LEVEL_2 16384 // (1 << 14)
diff --git a/server/glz_encode_tmpl.c b/server/glz_encode_tmpl.c
index 359a25b1..d5144215 100644
--- a/server/glz_encode_tmpl.c
+++ b/server/glz_encode_tmpl.c
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #define DJB2_START 5381;
 #define DJB2_HASH(hash, c) (hash = ((hash << 5) + hash) ^ (c)) //|{hash = ((hash << 5) + hash) + c;}
diff --git a/server/glz_encoder.c b/server/glz_encoder.c
index 89b759c3..8d20807f 100644
--- a/server/glz_encoder.c
+++ b/server/glz_encoder.c
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/server/glz_encoder_dictionary.c b/server/glz_encoder_dictionary.c
index de8963df..7cadc492 100644
--- a/server/glz_encoder_dictionary.c
+++ b/server/glz_encoder_dictionary.c
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <pthread.h>
 #include <string.h>
diff --git a/server/inputs_channel.c b/server/inputs_channel.c
index 213f8a0b..0cc53a2b 100644
--- a/server/inputs_channel.c
+++ b/server/inputs_channel.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <netinet/in.h> // IPPROTO_TCP
 #include <netinet/tcp.h> // TCP_NODELAY
diff --git a/server/jpeg_encoder.c b/server/jpeg_encoder.c
index 44dad866..85ef54ef 100644
--- a/server/jpeg_encoder.c
+++ b/server/jpeg_encoder.c
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "red_common.h"
 #include "jpeg_encoder.h"
diff --git a/server/main_channel.c b/server/main_channel.c
index 4ddd38b1..e0fa1e43 100644
--- a/server/main_channel.c
+++ b/server/main_channel.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
index bfd7f922..bae7bd27 100644
--- a/server/mjpeg_encoder.c
+++ b/server/mjpeg_encoder.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "red_common.h"
 #include "mjpeg_encoder.h"
diff --git a/server/red_channel.c b/server/red_channel.c
index fe4c614f..9012b0da 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -18,6 +18,9 @@
     Author:
         yhalperi@redhat.com
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c
index c5cac589..8b3d0ffc 100644
--- a/server/red_dispatcher.c
+++ b/server/red_dispatcher.c
@@ -14,6 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/red_memslots.c b/server/red_memslots.c
index 8c9810d8..d98f38c1 100644
--- a/server/red_memslots.c
+++ b/server/red_memslots.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "red_common.h"
 #include "red_memslots.h"
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 380765de..258a541d 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdbool.h>
 #include <inttypes.h>
diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c
index b27fdeee..636f71ed 100644
--- a/server/red_tunnel_worker.c
+++ b/server/red_tunnel_worker.c
@@ -18,6 +18,9 @@
     Author:
         yhalperi@redhat.com
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/server/red_worker.c b/server/red_worker.c
index 8082139b..856b66aa 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/server/reds.c b/server/reds.c
index fe4c6031..99a31763 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -15,8 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/server/reds.h b/server/reds.h
index b286471e..07f0a11f 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -18,8 +18,6 @@
 #ifndef _H_REDS
 #define _H_REDS
 
-#include "config.h"
-
 #include <stdint.h>
 #include <openssl/ssl.h>
 #include <sys/uio.h>
diff --git a/server/reds_gl_canvas.c b/server/reds_gl_canvas.c
index 4855a203..bf5244f1 100644
--- a/server/reds_gl_canvas.c
+++ b/server/reds_gl_canvas.c
@@ -14,7 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "reds_gl_canvas.h"
 #define SPICE_CANVAS_INTERNAL
diff --git a/server/reds_sw_canvas.c b/server/reds_sw_canvas.c
index 428a9dce..6df63e62 100644
--- a/server/reds_sw_canvas.c
+++ b/server/reds_sw_canvas.c
@@ -14,7 +14,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "reds_sw_canvas.h"
 #define SPICE_CANVAS_INTERNAL
diff --git a/server/smartcard.c b/server/smartcard.c
index d201f5f0..fed88a5e 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -15,6 +15,10 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <arpa/inet.h>
 
 #include "server/char_device.h"
diff --git a/server/snd_worker.c b/server/snd_worker.c
index c8e9d12f..8da11e1a 100644
--- a/server/snd_worker.c
+++ b/server/snd_worker.c
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <fcntl.h>
 #include <errno.h>
diff --git a/server/zlib_encoder.c b/server/zlib_encoder.c
index 214180ed..c51466b1 100644
--- a/server/zlib_encoder.c
+++ b/server/zlib_encoder.c
@@ -15,6 +15,10 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "red_common.h"
 #include "zlib_encoder.h"
 #include <zlib.h>