46 files changed, 37 insertions, 29 deletions

diff --git a/src/Makefile b/src/Makefile
index 3d5e6fbd79..58d0b2b0c8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,9 +38,9 @@ nested.subdirs += grp-system
 nested.subdirs += grp-timedate
 nested.subdirs += grp-udev
 nested.subdirs += grp-utils
-nested.subdirs += libfirewall
 nested.subdirs += libsystemd
 nested.subdirs += libsystemd-basic
+nested.subdirs += libsystemd-firewall
 nested.subdirs += libsystemd-network
 nested.subdirs += libsystemd-shared
 nested.subdirs += libudev
diff --git a/src/grp-journal/libjournal-core/journald-gperf.gperf b/src/grp-journal/libjournal-core/src/journald-gperf.gperf
index b56872918d..b56872918d 100644
--- a/src/grp-journal/libjournal-core/journald-gperf.gperf
+++ b/src/grp-journal/libjournal-core/src/journald-gperf.gperf
diff --git a/src/grp-journal/catalog/.gitignore b/src/grp-journal/systemd-journald/.gitignore
index ff695342e3..ff695342e3 100644
--- a/src/grp-journal/catalog/.gitignore
+++ b/src/grp-journal/systemd-journald/.gitignore
diff --git a/src/grp-journal/catalog/systemd.be.catalog.in b/src/grp-journal/systemd-journald/systemd.be.catalog.in
index 5b237f0558..5b237f0558 100644
--- a/src/grp-journal/catalog/systemd.be.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.be.catalog.in
diff --git a/src/grp-journal/catalog/systemd.be@latin.catalog.in b/src/grp-journal/systemd-journald/systemd.be@latin.catalog.in
index fc9f7cad16..fc9f7cad16 100644
--- a/src/grp-journal/catalog/systemd.be@latin.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.be@latin.catalog.in
diff --git a/src/grp-journal/catalog/systemd.bg.catalog.in b/src/grp-journal/systemd-journald/systemd.bg.catalog.in
index 76b0ce8f17..76b0ce8f17 100644
--- a/src/grp-journal/catalog/systemd.bg.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.bg.catalog.in
diff --git a/src/grp-journal/catalog/systemd.catalog.in b/src/grp-journal/systemd-journald/systemd.catalog.in
index 8de8597fe9..8de8597fe9 100644
--- a/src/grp-journal/catalog/systemd.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.catalog.in
diff --git a/src/grp-journal/catalog/systemd.da.catalog.in b/src/grp-journal/systemd-journald/systemd.da.catalog.in
index bc7d94476f..bc7d94476f 100644
--- a/src/grp-journal/catalog/systemd.da.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.da.catalog.in
diff --git a/src/grp-journal/catalog/systemd.fr.catalog.in b/src/grp-journal/systemd-journald/systemd.fr.catalog.in
index 573b288e74..573b288e74 100644
--- a/src/grp-journal/catalog/systemd.fr.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.fr.catalog.in
diff --git a/src/grp-journal/catalog/systemd.hr.catalog.in b/src/grp-journal/systemd-journald/systemd.hr.catalog.in
index 7502aed741..7502aed741 100644
--- a/src/grp-journal/catalog/systemd.hr.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.hr.catalog.in
diff --git a/src/grp-journal/catalog/systemd.hu.catalog.in b/src/grp-journal/systemd-journald/systemd.hu.catalog.in
index f538b7f958..f538b7f958 100644
--- a/src/grp-journal/catalog/systemd.hu.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.hu.catalog.in
diff --git a/src/grp-journal/catalog/systemd.it.catalog.in b/src/grp-journal/systemd-journald/systemd.it.catalog.in
index 86e44a604d..86e44a604d 100644
--- a/src/grp-journal/catalog/systemd.it.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.it.catalog.in
diff --git a/src/grp-journal/catalog/systemd.ko.catalog.in b/src/grp-journal/systemd-journald/systemd.ko.catalog.in
index 8a053254ee..8a053254ee 100644
--- a/src/grp-journal/catalog/systemd.ko.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.ko.catalog.in
diff --git a/src/grp-journal/catalog/systemd.pl.catalog.in b/src/grp-journal/systemd-journald/systemd.pl.catalog.in
index 33c2122974..33c2122974 100644
--- a/src/grp-journal/catalog/systemd.pl.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.pl.catalog.in
diff --git a/src/grp-journal/catalog/systemd.pt_BR.catalog.in b/src/grp-journal/systemd-journald/systemd.pt_BR.catalog.in
index e461c2b2ba..e461c2b2ba 100644
--- a/src/grp-journal/catalog/systemd.pt_BR.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.pt_BR.catalog.in
diff --git a/src/grp-journal/catalog/systemd.ru.catalog.in b/src/grp-journal/systemd-journald/systemd.ru.catalog.in
index df55478592..df55478592 100644
--- a/src/grp-journal/catalog/systemd.ru.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.ru.catalog.in
diff --git a/src/grp-journal/catalog/systemd.sr.catalog.in b/src/grp-journal/systemd-journald/systemd.sr.catalog.in
index 06a0ff648c..06a0ff648c 100644
--- a/src/grp-journal/catalog/systemd.sr.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.sr.catalog.in
diff --git a/src/grp-journal/catalog/systemd.zh_CN.catalog.in b/src/grp-journal/systemd-journald/systemd.zh_CN.catalog.in
index ba7c697c16..ba7c697c16 100644
--- a/src/grp-journal/catalog/systemd.zh_CN.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.zh_CN.catalog.in
diff --git a/src/grp-journal/catalog/systemd.zh_TW.catalog.in b/src/grp-journal/systemd-journald/systemd.zh_TW.catalog.in
index f7b42fa1c7..f7b42fa1c7 100644
--- a/src/grp-journal/catalog/systemd.zh_TW.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.zh_TW.catalog.in
diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile
index 3313eb989e..504395e39d 100644
--- a/src/grp-network/Makefile
+++ b/src/grp-network/Makefile
@@ -44,7 +44,7 @@ test_network_LDADD = \
 
 ifneq ($(HAVE_LIBIPTC),)
 test_network_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 test_network_tables_SOURCES = \
@@ -57,7 +57,7 @@ test_network_tables_LDADD = \
 
 ifneq ($(HAVE_LIBIPTC),)
 test_network_tables_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 tests += \
diff --git a/src/grp-network/libnetworkd-core/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c
index e18afc6ea3..4481e57ef2 100644
--- a/src/grp-network/libnetworkd-core/networkd-address.c
+++ b/src/grp-network/libnetworkd-core/networkd-address.c
@@ -19,7 +19,6 @@
 
 #include <net/if.h>
 
-#include "firewall-util.h"
 #include "sd-netlink/netlink-util.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/parse-util.h"
@@ -28,6 +27,7 @@
 #include "systemd-basic/string-util.h"
 #include "systemd-basic/utf8.h"
 #include "systemd-basic/util.h"
+#include "systemd-firewall/firewall-util.h"
 #include "systemd-shared/conf-parser.h"
 
 #include "networkd-address.h"
diff --git a/src/grp-network/systemd-networkd/Makefile b/src/grp-network/systemd-networkd/Makefile
index 5a4845ab73..118f627c16 100644
--- a/src/grp-network/systemd-networkd/Makefile
+++ b/src/grp-network/systemd-networkd/Makefile
@@ -34,7 +34,7 @@ systemd_networkd_LDADD = \
 
 ifneq ($(HAVE_LIBIPTC),)
 systemd_networkd_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 dist_systemunit_DATA += \
diff --git a/src/grp-resolve/libbasic-dns/test-data/_443._tcp.fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test/test-data/_443._tcp.fedoraproject.org.pkts
index a383c6286d..a383c6286d 100644
--- a/src/grp-resolve/libbasic-dns/test-data/_443._tcp.fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/_443._tcp.fedoraproject.org.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/_openpgpkey.fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test/test-data/_openpgpkey.fedoraproject.org.pkts
index 15de02e997..15de02e997 100644
--- a/src/grp-resolve/libbasic-dns/test-data/_openpgpkey.fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/_openpgpkey.fedoraproject.org.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/fake-caa.pkts b/src/grp-resolve/libbasic-dns/test/test-data/fake-caa.pkts
index 1c3ecc5491..1c3ecc5491 100644
--- a/src/grp-resolve/libbasic-dns/test-data/fake-caa.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/fake-caa.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test/test-data/fedoraproject.org.pkts
index 17874844d9..17874844d9 100644
--- a/src/grp-resolve/libbasic-dns/test-data/fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/fedoraproject.org.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/gandi.net.pkts b/src/grp-resolve/libbasic-dns/test/test-data/gandi.net.pkts
index 5ef51e0c8e..5ef51e0c8e 100644
--- a/src/grp-resolve/libbasic-dns/test-data/gandi.net.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/gandi.net.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/google.com.pkts b/src/grp-resolve/libbasic-dns/test/test-data/google.com.pkts
index f98c4cd855..f98c4cd855 100644
--- a/src/grp-resolve/libbasic-dns/test-data/google.com.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/google.com.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/kyhwana.org.pkts b/src/grp-resolve/libbasic-dns/test/test-data/kyhwana.org.pkts
index e28a725c9a..e28a725c9a 100644
--- a/src/grp-resolve/libbasic-dns/test-data/kyhwana.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/kyhwana.org.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/root.pkts b/src/grp-resolve/libbasic-dns/test/test-data/root.pkts
index 54ba668c75..54ba668c75 100644
--- a/src/grp-resolve/libbasic-dns/test-data/root.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/root.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts b/src/grp-resolve/libbasic-dns/test/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts
index a854249532..a854249532 100644
--- a/src/grp-resolve/libbasic-dns/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/teamits.com.pkts b/src/grp-resolve/libbasic-dns/test/test-data/teamits.com.pkts
index 11deb39677..11deb39677 100644
--- a/src/grp-resolve/libbasic-dns/test-data/teamits.com.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/teamits.com.pkts
diff --git a/src/grp-resolve/libbasic-dns/test-data/zbyszek@fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test/test-data/zbyszek@fedoraproject.org.pkts
index f0a6f982df..f0a6f982df 100644
--- a/src/grp-resolve/libbasic-dns/test-data/zbyszek@fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test/test-data/zbyszek@fedoraproject.org.pkts
diff --git a/src/grp-resolve/libbasic-dns/src/test-dns-packet.c b/src/grp-resolve/libbasic-dns/test/test-dns-packet.c
index 7a012c13dd..7a012c13dd 100644
--- a/src/grp-resolve/libbasic-dns/src/test-dns-packet.c
+++ b/src/grp-resolve/libbasic-dns/test/test-dns-packet.c
diff --git a/src/grp-resolve/libbasic-dns/src/test-dnssec-complex.c b/src/grp-resolve/libbasic-dns/test/test-dnssec-complex.c
index 2eb4cfe1c2..2eb4cfe1c2 100644
--- a/src/grp-resolve/libbasic-dns/src/test-dnssec-complex.c
+++ b/src/grp-resolve/libbasic-dns/test/test-dnssec-complex.c
diff --git a/src/grp-resolve/libbasic-dns/src/test-dnssec.c b/src/grp-resolve/libbasic-dns/test/test-dnssec.c
index c2b8a74944..c2b8a74944 100644
--- a/src/grp-resolve/libbasic-dns/src/test-dnssec.c
+++ b/src/grp-resolve/libbasic-dns/test/test-dnssec.c
diff --git a/src/grp-resolve/libbasic-dns/src/test-resolve-tables.c b/src/grp-resolve/libbasic-dns/test/test-resolve-tables.c
index 98474b1abf..98474b1abf 100644
--- a/src/grp-resolve/libbasic-dns/src/test-resolve-tables.c
+++ b/src/grp-resolve/libbasic-dns/test/test-resolve-tables.c
diff --git a/src/libfirewall/Makefile b/src/libsystemd-firewall/Makefile
index 6016feec17..07dc865d6f 100644
--- a/src/libfirewall/Makefile
+++ b/src/libsystemd-firewall/Makefile
@@ -25,16 +25,16 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_LIBIPTC),)
 noinst_LTLIBRARIES += \
-	libfirewall.la
+	libsystemd-firewall.la
 
-libfirewall_la_SOURCES = \
+libsystemd-firewall_la_SOURCES = \
 	src/shared/firewall-util.h \
 	src/shared/firewall-util.c
 
-libfirewall_la_CFLAGS = \
+libsystemd-firewall_la_CFLAGS = \
 	$(LIBIPTC_CFLAGS)
 
-libfirewall_la_LIBADD = \
+libsystemd-firewall_la_LIBADD = \
 	$(LIBIPTC_LIBS)
 endif # HAVE_LIBIPTC
 
diff --git a/src/libfirewall/firewall-util.h b/src/libsystemd-firewall/include/systemd-firewall/firewall-util.h
index 9121718bff..9121718bff 100644
--- a/src/libfirewall/firewall-util.h
+++ b/src/libsystemd-firewall/include/systemd-firewall/firewall-util.h
diff --git a/src/libfirewall/firewall-util.c b/src/libsystemd-firewall/src/firewall-util.c
index 49ef53b8d4..5102695c4b 100644
--- a/src/libfirewall/firewall-util.c
+++ b/src/libsystemd-firewall/src/firewall-util.c
@@ -43,8 +43,7 @@
 #include "systemd-basic/in-addr-util.h"
 #include "systemd-basic/macro.h"
 #include "systemd-basic/socket-util.h"
-
-#include "firewall-util.h"
+#include "systemd-firewall/firewall-util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct xtc_handle*, iptc_free);
 
diff --git a/src/libsystemd-shared/src/Makefile b/src/libsystemd-shared/src/Makefile
index 292f6a27a6..5453bec630 100644
--- a/src/libsystemd-shared/src/Makefile
+++ b/src/libsystemd-shared/src/Makefile
@@ -26,7 +26,7 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 noinst_LTLIBRARIES += \
 	libsystemd-shared.la
 
-libsystemd_shared_la_SOURCES = \
+libsystemd-shared_la_SOURCES = \
 	src/shared/output-mode.h \
 	src/shared/output-mode.c \
 	src/shared/gpt.h \
@@ -114,28 +114,28 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/fdset.h
 
 ifneq ($(HAVE_UTMP),)
-libsystemd_shared_la_SOURCES += \
+libsystemd-shared_la_SOURCES += \
 	src/shared/utmp-wtmp.c
 endif # HAVE_UTMP
 
 ifneq ($(HAVE_SECCOMP),)
-libsystemd_shared_la_SOURCES += \
+libsystemd-shared_la_SOURCES += \
 	src/shared/seccomp-util.h \
 	src/shared/seccomp-util.c
 endif # HAVE_SECCOMP
 
 ifneq ($(HAVE_ACL),)
-libsystemd_shared_la_SOURCES += \
+libsystemd-shared_la_SOURCES += \
 	src/shared/acl-util.c \
 	src/shared/acl-util.h
 endif # HAVE_ACL
 
-libsystemd_shared_la_CFLAGS = \
+libsystemd-shared_la_CFLAGS = \
 	$(ACL_CFLAGS) \
 	$(LIBIDN_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
-libsystemd_shared_la_LIBADD = \
+libsystemd-shared_la_LIBADD = \
 	libsystemd-internal.la \
 	libsystemd-basic.la \
 	libsystemd-journal-internal.la \
@@ -149,14 +149,14 @@ rootlibexec_LTLIBRARIES += \
 
 libsystemd_shared_la_SOURCES = \
 	$(libsystemd_basic_la_SOURCES) \
-	$(libsystemd_shared_la_SOURCES) \
+	$(libsystemd-shared_la_SOURCES) \
 	$(libsystemd_internal_la_SOURCES) \
 	$(libsystemd_journal_internal_la_SOURCES) \
 	$(libudev_internal_la_SOURCES)
 
 libsystemd_shared_la_CFLAGS = \
 	$(libsystemd_basic_la_CFLAGS) \
-	$(libsystemd_shared_la_CFLAGS) \
+	$(libsystemd-shared_la_CFLAGS) \
 	$(libsystemd_internal_la_CFLAGS) \
 	$(libsystemd_journal_internal_la_CFLAGS) \
 	$(libudev_internal_la_CFLAGS) \
@@ -165,7 +165,7 @@ libsystemd_shared_la_CFLAGS = \
 	$(SECCOMP_CFLAGS) \
 	-fvisibility=default
 
-# We can't use libsystemd_shared_la_LIBADD here because it would
+# We can't use libsystemd-shared_la_LIBADD here because it would
 # pull in libsystemd*-internal.la
 libsystemd_shared_la_LIBADD = \
 	$(libsystemd_basic_la_LIBADD) \
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index a173fd204a..c0fc3bd98e 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -72,7 +72,7 @@ systemd_nspawn_LDADD = \
 
 ifneq ($(HAVE_LIBIPTC),)
 systemd_nspawn_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 test_patch_uid_SOURCES = \
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 0e6a2cb9a2..9de03b46ba 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "firewall-util.h"
 #include "sd-netlink/local-addresses.h"
 #include "sd-netlink/netlink-util.h"
 #include "sd-netlink/sd-netlink.h"
@@ -28,6 +27,7 @@
 #include "systemd-basic/socket-util.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-basic/util.h"
+#include "systemd-firewall/firewall-util.h"
 
 #include "nspawn-expose-ports.h"
 
diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
index 1a43a5e7f2..b1e679e6b1 100644
--- a/src/test/test-firewall-util.c
+++ b/src/test/test-firewall-util.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "firewall-util.h"
 #include "systemd-basic/log.h"
+#include "systemd-firewall/firewall-util.h"
 
 #define MAKE_IN_ADDR_UNION(a,b,c,d) (union in_addr_union) { .in.s_addr = htobe32((uint32_t) (a) << 24 | (uint32_t) (b) << 16 | (uint32_t) (c) << 8 | (uint32_t) (d))}
 
diff --git a/test/Makefile b/test/Makefile
index d4371f9b44..1d82497508 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -737,7 +737,7 @@ test_firewall_util_CFLAGS = \
 	$(LIBIPTC_CFLAGS)
 
 test_firewall_util_LDADD = \
-	libfirewall.la \
+	libsystemd-firewall.la \
 	libsystemd-shared.la \
 	$(LIBIPTC_LIBS)
 endif # HAVE_LIBIPTC
diff --git a/tools/notsd-move b/tools/notsd-move
index 3b29039883..a861d98c99 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -14,7 +14,7 @@ split_lib() {
 	local d=$1
 
 	local t=("$d"/test-*)
-	if [[ -f ${t[0]} ]]; then
+	if [[ -e ${t[0]} ]]; then
 		mkdir "$d/test"
 		mv "$d"/test-* -t "$d/test"
 	fi
@@ -124,14 +124,15 @@ move_files() (
 
 	mv -T src/lib{systemd-shared,core}/linux
 
-	mkdir src/libfirewall
-	mv -T src/lib{systemd-shared,firewall}/firewall-util.c
-	mv -T src/lib{systemd-shared,firewall}/firewall-util.h
+	mkdir src/libsystemd-firewall
+	mv -T src/libsystemd-{shared,firewall}/firewall-util.c
+	mv -T src/libsystemd-{shared,firewall}/firewall-util.h
 
 	split_lib src/libcore
 	split_lib src/libsystemd-basic
 	split_lib src/libsystemd-shared
 	split_lib src/libsystemd-network
+	split_lib src/libsystemd-firewall
 
 	mv -t src/libcore/src \
 	   src/libcore/linux \
@@ -228,6 +229,7 @@ move_files() (
 	   src/journal/sd-journal.c
 	rmdir src/journal
 	split_lib src/libjournal-core
+	mv -T src/libjournal-core/{,src/}journald-gperf.gperf
 
 	# src/network => src/...
 	mkdir src/systemd-networkd-wait-online
@@ -661,6 +663,11 @@ move_files() (
 	rm src/grp-udev/rules/.gitignore
 	rmdir src/grp-udev/rules
 
+	mv -t src/grp-journal/systemd-journald \
+	   src/grp-journal/catalog/.gitignore \
+	   src/grp-journal/catalog/*
+	rmdir src/grp-journal/catalog
+
 	mv -t src/systemd-timesyncd system-preset/??-timesyncd.preset
 	for file in system-preset/??-*.preset; do
 		base="${file##*/??-}"
@@ -764,9 +771,11 @@ fixup_makefile() {
 	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' \
 	    -e '#### Rename helpers ################' \
 	    -e 's|libbasic_la|libsystemd_basic_la|g' \
-	    -e 's|libshared_la|libsystemd_shared_la|g' \
 	    -e 's|libbasic|libsystemd-basic|g' \
 	    -e 's|libshared|libsystemd-shared|g' \
+	    -e 's|libshared_la|libsystemd_shared_la|g' \
+	    -e 's|libfirewall|libsystemd-firewall|g' \
+	    -e 's|libfirewall_la|libsystemd_firewall_la|g' \
 	    -e 's|libsystemd-basic-dns|libbasic-dns|g'
 }