--- qemu-server/Makefile.alt	2021-09-09 15:46:02.000000000 +0000
+++ qemu-server/Makefile	2021-09-27 08:42:35.207422578 +0000
@@ -36,23 +36,23 @@ dinstall: deb
 	dpkg -i ${DEB}
 
 qm.bash-completion:
-	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
+	PVE_GENERATING_DOCS=1 perl -I../pve-firewall/src -I../pve-guest-common/src -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 qmrestore.bash-completion:
-	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
+	PVE_GENERATING_DOCS=1 perl -I../pve-firewall/src -I../pve-guest-common/src -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 qm.zsh-completion:
-	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_zsh_completions();" >$@.tmp
+	PVE_GENERATING_DOCS=1 perl -I../pve-firewall/src -I../pve-guest-common/src -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_zsh_completions();" >$@.tmp
 	mv $@.tmp $@
 
 qmrestore.zsh-completion:
-	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_zsh_completions();" >$@.tmp
+	PVE_GENERATING_DOCS=1 perl -I../pve-firewall/src -I../pve-guest-common/src -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_zsh_completions();" >$@.tmp
 	mv $@.tmp $@
 
 PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion \
-	    qm.zsh-completion qmrestore.zsh-completion cpu-models.conf.5
+	    qm.zsh-completion qmrestore.zsh-completion
 
 .PHONY: install
 install: ${PKGSOURCES}
@@ -76,7 +76,6 @@ install: ${PKGSOURCES}
 	install -m 0755 qmextract ${DESTDIR}${LIBDIR}
 	install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
 	install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR}
-	install -m 0644 cpu-models.conf.5 ${DESTDIR}/${MAN5DIR}
 	install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
 	cd ${DESTDIR}/${MAN5DIR}; ln -s -f qm.conf.5.gz vm.conf.5.gz
 
@@ -100,7 +99,7 @@ ${DSC}: ${BUILDDIR}
 
 .PHONY: test
 test:
-	PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi
+	PVE_GENERATING_DOCS=1 perl -I../pve-guest-common/src -I. ./qm verifyapi
 	$(MAKE) -C test
 
 .PHONY: upload
--- qemu-server/PVE/QemuServer.pm.alt	2021-09-09 15:46:02.000000000 +0000
+++ qemu-server/PVE/QemuServer.pm	2021-09-27 08:42:35.208422582 +0000
@@ -851,7 +851,7 @@ my $nic_model_list = [
 my $nic_model_list_txt = join(' ', sort @$nic_model_list);
 
 my $net_fmt_bridge_descr = <<__EOD__;
-Bridge to attach the network device to. The Proxmox VE standard bridge
+Bridge to attach the network device to. The PVE standard bridge
 is called 'vmbr0'.
 
 If you do not specify a bridge, we create a kvm user (NATed) network
@@ -5344,7 +5344,7 @@ sub vm_start_nolock {
 
     my $run_qemu = sub {
 	PVE::Tools::run_fork sub {
-	    PVE::Systemd::enter_systemd_scope($vmid, "Proxmox VE VM $vmid", %properties);
+	    PVE::Systemd::enter_systemd_scope($vmid, "PVE VE VM $vmid", %properties);
 
 	    my $exitcode = run_command($cmd, %run_params);
 	    die "QEMU exited with code $exitcode\n" if $exitcode;
--- qemu-server/qmeventd/Makefile.alt	2021-09-27 08:42:35.208422582 +0000
+++ qemu-server/qmeventd/Makefile	2021-09-27 08:45:12.992974534 +0000
@@ -8,7 +8,7 @@ export NOVIEW=1
 include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
 CC ?= gcc
-CFLAGS += -O2 -Werror -Wall -Wextra -Wpedantic -Wtype-limits -Wl,-z,relro -std=gnu11
+CFLAGS += -O2 -Wall -Wextra -Wpedantic -Wtype-limits -Wl,-z,relro -std=gnu11
 CFLAGS += $(shell pkg-config --cflags json-c glib-2.0)
 LDFLAGS += $(shell pkg-config --libs json-c glib-2.0)