diff --git a/cfg.mk b/cfg.mk
index a7c883830f..3731a2830b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -737,7 +737,7 @@ sc_prohibit_long_lines:
 	halt='Wrap long lines in expected output files' \
 	  $(_sc_search_regexp)
 	@prohibit='.{80}' \
-	in_vc_files='Makefile\.am' \
+	in_vc_files='Makefile(\.inc)?\.am' \
 	halt='Wrap long lines in Makefiles' \
 	  $(_sc_search_regexp)
 
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index a88df0bd11..baa85b4ba9 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -75,10 +75,12 @@ VIRTINTERFACED_UNIT_VARS = \
 	-e 's|[@]sockprefix[@]|virtinterfaced|g' \
 	$(NULL)
 
-virtinterfaced.service: interface/virtinterfaced.service.in $(top_builddir)/config.status
+virtinterfaced.service: interface/virtinterfaced.service.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtinterface%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtinterface%.socket: remote/libvirt%.socket.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 interface/virtinterfaced.conf: remote/libvirtd.conf.in
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index a2151162e6..c53396b7f3 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -80,9 +80,12 @@ SYSTEMD_UNIT_FILES_IN += \
 	libxl/virtxend.service.in \
 	$(NULL)
 
+LIBXL_UNIT_COND = ConditionPathExists=/proc/xen/capabilities
+LIBXL_UNIT_CONFLICT = Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)
+
 VIRTXEND_UNIT_VARS = \
 	$(COMMON_UNIT_VARS) \
-	-e 's|[@]deps[@]|Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)\nConditionPathExists=/proc/xen/capabilities|g' \
+	-e 's|[@]deps[@]|$(LIBXL_UNIT_CONFLICT)\n$(LIBXL_UNIT_COND)|g' \
 	-e 's|[@]name[@]|Libvirt libxl|g' \
 	-e 's|[@]service[@]|virtxend|g' \
 	-e 's|[@]sockprefix[@]|virtxend|g' \
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 9f20dad7b3..17467a65ad 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -82,10 +82,12 @@ VIRTNETWORKD_UNIT_VARS = \
 	-e 's|[@]sockprefix[@]|virtnetworkd|g' \
 	$(NULL)
 
-virtnetworkd.service: network/virtnetworkd.service.in $(top_builddir)/config.status
+virtnetworkd.service: network/virtnetworkd.service.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtnetwork%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtnetwork%.socket: remote/libvirt%.socket.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 network/virtnetworkd.conf: remote/libvirtd.conf.in
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 5a6525d843..eac7f92e88 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -98,10 +98,12 @@ VIRTNODEDEVD_UNIT_VARS = \
 	-e 's|[@]sockprefix[@]|virtnodedevd|g' \
 	$(NULL)
 
-virtnodedevd.service: node_device/virtnodedevd.service.in $(top_builddir)/config.status
+virtnodedevd.service: node_device/virtnodedevd.service.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtnodedev%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtnodedev%.socket: remote/libvirt%.socket.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 node_device/virtnodedevd.conf: remote/libvirtd.conf.in
diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index 7693634e29..6acb45705c 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -83,10 +83,12 @@ VIRTNWFILTERD_UNIT_VARS = \
 	-e 's|[@]sockprefix[@]|virtnwfilterd|g' \
 	$(NULL)
 
-virtnwfilterd.service: nwfilter/virtnwfilterd.service.in $(top_builddir)/config.status
+virtnwfilterd.service: nwfilter/virtnwfilterd.service.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtnwfilter%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtnwfilter%.socket: remote/libvirt%.socket.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 37f816406e..76bc67418c 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -71,10 +71,12 @@ VIRTSECRETD_UNIT_VARS = \
 	-e 's|[@]sockprefix[@]|virtsecretd|g' \
 	$(NULL)
 
-virtsecretd.service: secret/virtsecretd.service.in $(top_builddir)/config.status
+virtsecretd.service: secret/virtsecretd.service.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtsecret%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtsecret%.socket: remote/libvirt%.socket.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 secret/virtsecretd.conf: remote/libvirtd.conf.in
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index fd0d57d2b6..4dccb14ac1 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -175,10 +175,12 @@ VIRTSTORAGED_UNIT_VARS = \
 	-e 's|[@]sockprefix[@]|virtstoraged|g' \
 	$(NULL)
 
-virtstoraged.service: storage/virtstoraged.service.in $(top_builddir)/config.status
+virtstoraged.service: storage/virtstoraged.service.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtstorage%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtstorage%.socket: remote/libvirt%.socket.in \
+		$(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 storage/virtstoraged.conf: remote/libvirtd.conf.in
@@ -264,7 +266,8 @@ libvirt_storage_backend_iscsi_la_LIBADD = \
 endif WITH_STORAGE_ISCSI
 
 if WITH_STORAGE_ISCSI_DIRECT
-libvirt_storage_backend_iscsi_direct_la_SOURCES = $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES)
+libvirt_storage_backend_iscsi_direct_la_SOURCES = \
+	$(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES)
 libvirt_storage_backend_iscsi_direct_la_CFLAGS = \
 	-I$(srcdir)/conf \
 	-I$(srcdir)/secret \
@@ -346,13 +349,15 @@ libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD)
 endif WITH_STORAGE_RBD
 
 if WITH_STORAGE_SHEEPDOG
-libvirt_storage_backend_sheepdog_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
+libvirt_storage_backend_sheepdog_la_SOURCES = \
+	$(STORAGE_DRIVER_SHEEPDOG_SOURCES)
 libvirt_storage_backend_sheepdog_la_CFLAGS = \
 	-I$(srcdir)/conf \
 	$(AM_CFLAGS) \
 	$(NULL)
 
-libvirt_storage_backend_sheepdog_priv_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
+libvirt_storage_backend_sheepdog_priv_la_SOURCES = \
+	$(STORAGE_DRIVER_SHEEPDOG_SOURCES)
 libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \
 	-I$(srcdir)/conf \
 	$(AM_CFLAGS) \
@@ -368,7 +373,8 @@ libvirt_storage_backend_sheepdog_la_LIBADD = \
 endif WITH_STORAGE_SHEEPDOG
 
 if WITH_STORAGE_GLUSTER
-libvirt_storage_backend_gluster_la_SOURCES = $(STORAGE_DRIVER_GLUSTER_SOURCES)
+libvirt_storage_backend_gluster_la_SOURCES = \
+	$(STORAGE_DRIVER_GLUSTER_SOURCES)
 libvirt_storage_backend_gluster_la_LIBADD = \
 	libvirt.la \
 	$(GLUSTERFS_LIBS) \
@@ -384,7 +390,8 @@ storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la
 libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
 
 
-libvirt_storage_file_gluster_la_SOURCES = $(STORAGE_FILE_GLUSTER_SOURCES)
+libvirt_storage_file_gluster_la_SOURCES = \
+	$(STORAGE_FILE_GLUSTER_SOURCES)
 libvirt_storage_file_gluster_la_LIBADD = \
 	libvirt.la \
 	$(GLUSTERFS_LIBS) \
@@ -401,7 +408,8 @@ libvirt_storage_file_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
 endif WITH_STORAGE_GLUSTER
 
 if WITH_STORAGE_ZFS
-libvirt_storage_backend_zfs_la_SOURCES = $(STORAGE_DRIVER_ZFS_SOURCES)
+libvirt_storage_backend_zfs_la_SOURCES = \
+	$(STORAGE_DRIVER_ZFS_SOURCES)
 libvirt_storage_backend_zfs_la_CFLAGS = \
 	-I$(srcdir)/conf \
 	$(AM_CFLAGS) \
@@ -416,7 +424,8 @@ libvirt_storage_backend_zfs_la_LIBADD = \
 endif WITH_STORAGE_ZFS
 
 if WITH_STORAGE_VSTORAGE
-libvirt_storage_backend_vstorage_la_SOURCES = $(STORAGE_DRIVER_VSTORAGE_SOURCES)
+libvirt_storage_backend_vstorage_la_SOURCES = \
+	$(STORAGE_DRIVER_VSTORAGE_SOURCES)
 libvirt_storage_backend_vstorage_la_CFLAGS = \
 	-I$(srcdir)/conf \
 	$(AM_CFLAGS) \