diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index d1c37fb0..b7d1dc26 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -1,40 +1,36 @@
-EXTRA_DEFINES =
-EXTRA_INCLUDES =
-EXTRA_LIBS =
-EXTRA_FLAGS =
+AM_CPPFLAGS = \
+  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
+  -DXRDP_SBIN_PATH=\"${sbindir}\" \
+  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
+  -I$(top_srcdir)/common
+
+AM_LDFLAGS =
+
+LIBXRDP_EXTRA_LIBS =
 
 if XRDP_DEBUG
-EXTRA_DEFINES += -DXRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
 else
-EXTRA_DEFINES += -DXRDP_NODEBUG
+AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 if XRDP_NEUTRINORDP
-EXTRA_DEFINES += -DXRDP_NEUTRINORDP
-EXTRA_LIBS += $(FREERDP_LIBS)
+AM_CPPFLAGS += -DXRDP_NEUTRINORDP
+LIBXRDP_EXTRA_LIBS += $(FREERDP_LIBS)
 endif
 
 if XRDP_TJPEG
-EXTRA_DEFINES += -DXRDP_JPEG -DXRDP_TJPEG
-EXTRA_INCLUDES += @TurboJpegIncDir@
-EXTRA_FLAGS += @TurboJpegLibDir@
-EXTRA_LIBS += -lturbojpeg
+AM_CPPFLAGS += -DXRDP_JPEG -DXRDP_TJPEG @TurboJpegIncDir@
+AM_LDFLAGS += @TurboJpegLibDir@
+LIBXRDP_EXTRA_LIBS += -lturbojpeg
 else
 if XRDP_JPEG
-EXTRA_DEFINES += -DXRDP_JPEG
-EXTRA_LIBS += -ljpeg
+AM_CPPFLAGS += -DXRDP_JPEG
+LIBXRDP_EXTRA_LIBS += -ljpeg
 endif
 endif
 
-AM_CPPFLAGS = \
-  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-  -DXRDP_SBIN_PATH=\"${sbindir}\" \
-  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES) \
-  -I$(top_srcdir)/common \
-  $(EXTRA_INCLUDES)
-
 module_LTLIBRARIES = \
   libxrdp.la
 
@@ -57,9 +53,6 @@ libxrdp_la_SOURCES = \
   xrdp_rdp.c \
   xrdp_sec.c
 
-libxrdp_la_LDFLAGS = \
-  $(EXTRA_FLAGS)
-
 libxrdp_la_LIBADD = \
   $(top_builddir)/common/libcommon.la \
-  $(EXTRA_LIBS)
+  $(LIBXRDP_EXTRA_LIBS)
diff --git a/neutrinordp/Makefile.am b/neutrinordp/Makefile.am
index 83504b28..d3adc756 100644
--- a/neutrinordp/Makefile.am
+++ b/neutrinordp/Makefile.am
@@ -1,20 +1,17 @@
-EXTRA_DEFINES =
- 
-if XRDP_DEBUG
-EXTRA_DEFINES += -DXRDP_DEBUG
-else
-EXTRA_DEFINES += -DXRDP_NODEBUG
-endif
-
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES) \
   -I$(top_srcdir)/common \
   $(FREERDP_CFLAGS)
 
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+else
+AM_CPPFLAGS += -DXRDP_NODEBUG
+endif
+
 module_LTLIBRARIES = \
   libxrdpneutrinordp.la
 
diff --git a/rdp/Makefile.am b/rdp/Makefile.am
index 5ae15786..30368156 100644
--- a/rdp/Makefile.am
+++ b/rdp/Makefile.am
@@ -1,19 +1,16 @@
-EXTRA_DEFINES =
- 
-if XRDP_DEBUG
-EXTRA_DEFINES += -DXRDP_DEBUG
-else
-EXTRA_DEFINES += -DXRDP_NODEBUG
-endif
-
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES) \
   -I$(top_srcdir)/common
 
+if XRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
+else
+AM_CPPFLAGS += -DXRDP_NODEBUG
+endif
+
 module_LTLIBRARIES = \
   librdp.la
 
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am
index c4cd1a3f..2ecd67b4 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -1,32 +1,27 @@
-EXTRA_DEFINES =
-EXTRA_INCLUDES =
-EXTRA_LIBS =
-EXTRA_FLAGS =
+AM_CPPFLAGS = \
+  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
+  -DXRDP_SBIN_PATH=\"${sbindir}\" \
+  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
+  -I$(top_srcdir)/common
+
+CHANSRV_EXTRA_LIBS =
 
 if XRDP_FUSE
-EXTRA_DEFINES += -DXRDP_FUSE
-EXTRA_LIBS += -lfuse
+AM_CPPFLAGS += -DXRDP_FUSE
+CHANSRV_EXTRA_LIBS += -lfuse
 endif
 
 if XRDP_OPUS
-EXTRA_DEFINES += -DXRDP_OPUS
-EXTRA_LIBS += -lopus
+AM_CPPFLAGS += -DXRDP_OPUS
+CHANSRV_EXTRA_LIBS += -lopus
 endif
 
 if XRDP_MP3LAME
-EXTRA_DEFINES += -DXRDP_MP3LAME
-EXTRA_LIBS += -lmp3lame
+AM_CPPFLAGS += -DXRDP_MP3LAME
+CHANSRV_EXTRA_LIBS += -lmp3lame
 endif
 
-AM_CPPFLAGS = \
-  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-  -DXRDP_SBIN_PATH=\"${sbindir}\" \
-  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  $(EXTRA_DEFINES) \
-  -I$(top_srcdir)/common \
-  $(EXTRA_INCLUDES)
-
 AM_CFLAGS = $(X_CFLAGS)
 
 sbin_PROGRAMS = \
@@ -65,10 +60,9 @@ xrdp_chansrv_SOURCES = \
   xcommon.h
 
 xrdp_chansrv_LDFLAGS = \
-  $(X_LIBS) \
-  $(EXTRA_FLAGS)
+  $(X_LIBS)
 
 xrdp_chansrv_LDADD = \
   $(top_builddir)/common/libcommon.la \
   $(X_PRE_LIBS) -lXfixes -lXrandr -lX11 $(X_EXTRA_LIBS) \
-  $(EXTRA_LIBS)
+  $(CHANSRV_EXTRA_LIBS)
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index 9c6d0f76..e24f22e2 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -1,37 +1,33 @@
-EXTRA_INCLUDES =
-EXTRA_LIBS =
-EXTRA_FLAGS =
+AM_CPPFLAGS = \
+  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
+  -DXRDP_SBIN_PATH=\"${sbindir}\" \
+  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
+  -DXRDP_MODULE_PATH=\"${moduledir}\" \
+  -I$(top_builddir) \
+  -I$(top_srcdir)/common \
+  -I$(top_srcdir)/libxrdp
+
+XRDP_EXTRA_LIBS =
 
 if XRDP_DEBUG
-EXTRA_DEFINES = -DXRDP_DEBUG
+AM_CPPFLAGS += -DXRDP_DEBUG
 else
-EXTRA_DEFINES = -DXRDP_NODEBUG
+AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 if XRDP_RFXCODEC
-EXTRA_DEFINES += -DXRDP_RFXCODEC
-EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include
-EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
+AM_CPPFLAGS += -DXRDP_RFXCODEC
+AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
+XRDP_EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
 endif
 
 if XRDP_PIXMAN
-EXTRA_DEFINES += -DXRDP_PIXMAN
-EXTRA_INCLUDES += $(XRDP_PIXMAN_CFLAGS)
-EXTRA_LIBS += $(XRDP_PIXMAN_LIBS)
+AM_CPPFLAGS += -DXRDP_PIXMAN
+AM_CPPFLAGS += $(XRDP_PIXMAN_CFLAGS)
+XRDP_EXTRA_LIBS += $(XRDP_PIXMAN_LIBS)
 endif
 
-AM_CPPFLAGS = \
-  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-  -DXRDP_SBIN_PATH=\"${sbindir}\" \
-  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-  -DXRDP_MODULE_PATH=\"${moduledir}\" \
-  $(EXTRA_DEFINES) \
-  -I$(top_builddir) \
-  -I$(top_srcdir)/common \
-  -I$(top_srcdir)/libxrdp \
-  $(EXTRA_INCLUDES)
-
 sbin_PROGRAMS = \
   xrdp
 
@@ -57,10 +53,7 @@ xrdp_SOURCES = \
 xrdp_LDADD = \
   $(top_builddir)/common/libcommon.la \
   $(top_builddir)/libxrdp/libxrdp.la \
-  $(EXTRA_LIBS)
-
-xrdp_LDFLAGS = \
-  $(EXTRA_FLAGS)
+  $(XRDP_EXTRA_LIBS)
 
 xrdpsysconfdir=$(sysconfdir)/xrdp
 
diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am
index 59f58b52..920f3d1a 100644
--- a/xrdpapi/Makefile.am
+++ b/xrdpapi/Makefile.am
@@ -1,21 +1,6 @@
-EXTRA_DEFINES =
-EXTRA_INCLUDES =
-EXTRA_LIBS =
-EXTRA_FLAGS =
-
-AM_CPPFLAGS = \
-  $(EXTRA_DEFINES) \
-  $(EXTRA_INCLUDES)
-
 module_LTLIBRARIES = \
   libxrdpapi.la
 
 libxrdpapi_la_SOURCES = \
   xrdpapi.c \
   xrdpapi.h
-
-libxrdpapi_la_LDFLAGS = \
-  $(EXTRA_FLAGS)
-
-libxrdpapi_la_LIBADD = \
-  $(EXTRA_LIBS)
diff --git a/xrdpvr/Makefile.am b/xrdpvr/Makefile.am
index dd7b5601..f9b8d421 100644
--- a/xrdpvr/Makefile.am
+++ b/xrdpvr/Makefile.am
@@ -1,21 +1,6 @@
-EXTRA_DEFINES =
-EXTRA_INCLUDES =
-EXTRA_LIBS =
-EXTRA_FLAGS =
-
-AM_CPPFLAGS = \
-  $(EXTRA_DEFINES) \
-  $(EXTRA_INCLUDES)
-
 module_LTLIBRARIES = \
   libxrdpvr.la
 
 libxrdpvr_la_SOURCES = \
   xrdpvr.c \
   xrdpvr.h
-
-libxrdpvr_la_LDFLAGS = \
-  $(EXTRA_FLAGS)
-
-libxrdpvr_la_LIBADD = \
-  $(EXTRA_LIBS)