diff --git a/common/Makefile.am b/common/Makefile.am
index fa839e33..6d7a58c6 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,11 +1,11 @@
-
-EXTRA_FILES =
-
 if XRDP_PIXMAN
+  PIXMAN_SOURCES =
 else
-  EXTRA_FILES += pixman-region16.c pixman-region.h
+  PIXMAN_SOURCES = pixman-region16.c pixman-region.h
 endif
 
+EXTRA_DIST = pixman-region.c
+
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
@@ -45,7 +45,7 @@ libcommon_la_SOURCES = \
   xrdp_client_info.h \
   xrdp_constants.h \
   xrdp_rail.h \
-  $(EXTRA_FILES)
+  $(PIXMAN_SOURCES)
 
 libcommon_la_LIBADD = \
   -lcrypto \
diff --git a/common/pixman-region16.c b/common/pixman-region16.c
index 637c8a35..76f0903b 100644
--- a/common/pixman-region16.c
+++ b/common/pixman-region16.c
@@ -26,14 +26,26 @@
 /* taken from pixman 0.34
    altered to compile without all of pixman */
 
+#if defined(HAVE_CONFIG_H)
+#include "config_ac.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
 #include "pixman-region.h"
 
+#if !defined(UINT32_MAX)
 #define UINT32_MAX  (4294967295U)
+#endif
+#if !defined(INT16_MIN)
 #define INT16_MIN   (-32767-1)
+#endif
+#if !defined(INT16_MAX)
 #define INT16_MAX   (32767)
+#endif
 
 #define PIXMAN_EXPORT
 #define FALSE 0