diff --git a/src/Makefile.am b/src/Makefile.am
index e56a8a2..4adcc48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = $(top_builddir)/bin/vsearch
 if TARGET_PPC
 AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -mcpu=power8
 else
-AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -march=x86-64 -mtune=generic
+AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -lcityhash
 endif
 
 AM_CFLAGS=$(AM_CXXFLAGS)
@@ -18,8 +18,6 @@ allpairs.h \
 arch.h \
 bitmap.h \
 chimera.h \
-city.h \
-citycrc.h \
 cluster.h \
 cpu.h \
 db.h \
@@ -59,31 +57,26 @@ xstring.h
 
 if TARGET_PPC
 libcpu_a_SOURCES = cpu.cc $(VSEARCHHEADERS)
-noinst_LIBRARIES = libcpu.a libcityhash.a
+noinst_LIBRARIES = libcpu.a
 else
 libcpu_sse2_a_SOURCES = cpu.cc $(VSEARCHHEADERS)
 libcpu_sse2_a_CXXFLAGS = $(AM_CXXFLAGS) -msse2
 libcpu_ssse3_a_SOURCES = cpu.cc $(VSEARCHHEADERS)
 libcpu_ssse3_a_CXXFLAGS = $(AM_CXXFLAGS) -mssse3 -DSSSE3
-noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a libcityhash.a
+noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a
 endif
 
-libcityhash_a_SOURCES = city.cc city.h
-
 if TARGET_WIN
 
-libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare -D_MSC_VER
-__top_builddir__bin_vsearch_LDFLAGS = -static
-__top_builddir__bin_vsearch_LDADD = libregex.a libcityhash.a libcpu_ssse3.a libcpu_sse2.a
+__top_builddir__bin_vsearch_LDFLAGS = -static -lcityhash
+__top_builddir__bin_vsearch_LDADD = libregex.a libcpu_ssse3.a libcpu_sse2.a
 
 else
 
-libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare
-
 if TARGET_PPC
-__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu.a
+__top_builddir__bin_vsearch_LDADD = libcpu.a
 else
-__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu_ssse3.a libcpu_sse2.a
+__top_builddir__bin_vsearch_LDADD = libcpu_ssse3.a libcpu_sse2.a
 endif
 
 endif
diff --git a/src/vsearch.h b/src/vsearch.h
index f2c244b..5f51bbe 100644
--- a/src/vsearch.h
+++ b/src/vsearch.h
@@ -148,7 +148,7 @@
 #include <bzlib.h>
 #endif
 
-#include "city.h"
+#include <city.h>
 #include "md5.h"
 #include "sha1.h"
 
class='path'>path: <a href='/guix/log/?id=9619504c8161c6a4f691bff96064e1700dc4d21d'>root</a>/<a href='/guix/log/tests?id=9619504c8161c6a4f691bff96064e1700dc4d21d'>tests</a>/<a href='/guix/log/tests/boot-parameters.scm?id=9619504c8161c6a4f691bff96064e1700dc4d21d'>boot-parameters.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/boot-parameters.scm?id=9619504c8161c6a4f691bff96064e1700dc4d21d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-08-28 23:37:28 +0200'>2022-08-28</span></td><td><a href='/guix/commit/tests/boot-parameters.scm?id=3294fa2ba451c7d5ef42a5d9fac780877f364bc7'>tests: Add test for menu-entry roundtrips as sexps.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/boot-parameters.scm (%uuid-menu-entry,
%file-system-label-menu-entry): New variables.
("menu-entry roundtrip, uuid", "menu-entry roundtrip,
file-system-label"): New tests.

Signed-off-by: Marius Bakke &lt;marius@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2022-03-16 15:48:52 +0100'>2022-03-16</span></td><td><a href='/guix/commit/tests/boot-parameters.scm?id=47960b55268220ca1cb7d2fed41c53873181d816'>system: Improve 'read-boot-parameters' incompatibility diagnostic.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, when reading an incompatible "parameters" file, 'guix
system' would print a warning and then crash with a wrong-type-arg
backtrace because code expects 'read-boot-parameters' to always return a
&lt;boot-parameters&gt; record.

* gnu/system.scm (read-boot-parameters): Upon incompatibility, raise an
error instead of returning #f.  Also raise a '&amp;fix-hint' condition.
* tests/boot-parameters.scm ("read, construction, mandatory fields"):
Define 'test-read-boot-parameters' as a macro; expect
'formatted-message?' exceptions rather than #f returns.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-03-01 10:30:17 -0500'>2022-03-01</span></td><td><a href='/guix/commit/tests/boot-parameters.scm?id=4a3b8f4d5981de444b3590fca8dfa1facb768933'>system: Add a version field to the &lt;boot-parameters&gt; record.</a><span class='msg-avail'>...<span class='msg-tooltip'>This version field exposes the (already present) version information of a boot
parameters file.

* gnu/system.scm (%boot-parameters-version): New variable.
(&lt;boot-parameters&gt;)[version]: New field.
(read-boot-parameters): Use it.
(operating-system-boot-parameters-file): Likewise.
* tests/boot-parameters.scm (test-read-boot-parameters): Use
%boot-parameters-version as the default version value in the template.
</span></span></td><td>Maxim Cournoyer</td></tr>