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"
 
7f3d5483e2e2e5c4b6c70b0b93c82'>README</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/README?id=174e3a0d1247f3d5483e2e2e5c4b6c70b0b93c82&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-23 12:57:20 -0400'>2020-10-23</span></td><td><a href='/guix/commit/README?id=b5aaa3a4fb985d21e21e2a67f48b52f13ebd4728'>doc: Update README.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-10-22 22:47:54 -0400'>2020-10-22</span></td><td><a href='/guix/commit/README?id=503d2bfde08f9bf97bbf430516d2f19faedd4319'>README: Refer to the manual for building from Git.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-06-02 18:55:53 +0200'>2020-06-02</span></td><td><a href='/guix/commit/README?id=c75a80189fc19f6ff8b4c82d1d1801be6763b6d2'>doc: Update README to refer to the manual.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-11-09 23:04:14 +0100'>2019-11-09</span></td><td><a href='/guix/commit/README?id=0758a70cc008171f31c848128deca9803536fe60'>doc: Mention value /var to localstatedir option.</a><span class='msg-avail'>...</span></td><td>zimoun</td></tr>
<tr><td><span title='2019-09-04 23:41:07 +0200'>2019-09-04</span></td><td><a href='/guix/commit/README?id=f475c6e53e5b6912cc45663d50f1d03dadfb60b8'>doc: Update 'README'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
r>
<tr><td><span title='2024-04-06 08:40:50 -0300'>2024-04-06</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=2d62d08e45eaf1d60841582963c9143a680adef9'>gnu: opencolorio: Update to 2.3.2.</a><span class='msg-avail'>...</span></td><td>Vinicius Monego</td></tr>
<tr><td><span title='2024-03-27 10:17:45 +0100'>2024-03-27</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=232796ce60288b877d6908de06c02b4861cd53bf'>gnu: insight-toolkit: Build and install Python bindings.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2024-03-25 20:42:20 +0000'>2024-03-25</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=82fe02130e5bb09c4c2d6aa36071caa8ee973f09'>gnu: opencv: Update to 4.9.0.</a><span class='msg-avail'>...</span></td><td>Andy Tai</td></tr>
<tr><td><span title='2024-03-23 09:30:45 -0300'>2024-03-23</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=c89248cc50e1ede4ecdae7a6cd71a4d25ec80f74'>gnu: gmic: Update to 3.3.5.</a><span class='msg-avail'>...</span></td><td>Vinicius Monego</td></tr>
<tr><td><span title='2024-02-13 11:03:55 +0000'>2024-02-13</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=68bc23a5ba7d92d67744a24a24a3cfdd30bfe453'>gnu: opencv: Update to 4.8.1.</a><span class='msg-avail'>...</span></td><td>Andy Tai</td></tr>
<tr><td><span title='2024-02-09 22:19:08 +0000'>2024-02-09</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=249eded280d87d9d6f489bb742c1678e2584a961'>gnu: vxl: Update to 3.5.0.</a><span class='msg-avail'>...</span></td><td>Felix Gruber</td></tr>
<tr><td><span title='2024-01-19 22:01:30 -0300'>2024-01-19</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=50731875243428cb11cc17fa712fa8079b307622'>gnu: gmic: Update to 3.3.3.</a><span class='msg-avail'>...</span></td><td>Vinicius Monego</td></tr>
<tr><td><span title='2023-12-05 13:43:42 +0200'>2023-12-05</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=7e795eae155a0fea0739584020fb0945c4d1a1d0'>gnu: python-imgviz: Adjust for newer python.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2023-11-14 08:57:48 +0200'>2023-11-14</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=3d15e9e5bcd7cdad33f9832e4956f494c47e1937'>gnu: insight-toolkit-4.12: Fix building.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2023-09-24 19:32:12 +0200'>2023-09-24</span></td><td><a href='/guix/commit/gnu/packages/image-processing.scm?id=be5bec47f7942a5e4d2a30eadd9a6fa4c715e88b'>gnu: opencv: Add descriptors for xfeatures2d.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>