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"
 
>/<a href='/guix/log/etc?id=95f6e6dad80aa198b5b8d02851050bcfe0928c26'>etc</a>/<a href='/guix/log/etc/snippets?id=95f6e6dad80aa198b5b8d02851050bcfe0928c26'>snippets</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/etc/snippets?id=95f6e6dad80aa198b5b8d02851050bcfe0928c26&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-09 00:22:37 -0400'>2019-05-09</span></td><td><a href='/guix/commit/etc/snippets?id=4ac69ea10f54384ac893313ef738e5ad554ac328'>Add (guix bzr-download).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/bzr-download.scm, guix/build/bzr.scm,
etc/snippets/scheme-mode/guix-bzr-reference: New files.
* Makefile.am (MODULES): Add them.
* etc/snippets/scheme-mode/guix-origin: Add "bzr-fetch" to the origin choices.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-03-26 14:18:12 +0100'>2019-03-26</span></td><td><a href='/guix/commit/etc/snippets?id=6994e6743603ab73cc32d32786a55672f4fa46f0'>etc: Add "rename" snippet.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/text-mode/guix-commit-message-rename-package: New file.
</span></span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2019-03-08 00:17:30 +0100'>2019-03-08</span></td><td><a href='/guix/commit/etc/snippets?id=95803946c7dbdff88db09fa5fe98e70d607712a7'>etc: snippets: Prefill package name.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/text-mode/guix-commit-message-add-package: Extract package
name from diff.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-03-07 23:55:24 +0100'>2019-03-07</span></td><td><a href='/guix/commit/etc/snippets?id=d6234620ace1863d8102b065311ef3d94e0931da'>etc: snippets: Prefill package name and version.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/text-mode/guix-commit-message-update-package: Extract package
name and version from git diff output.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2018-10-10 17:33:42 +0200'>2018-10-10</span></td><td><a href='/guix/commit/etc/snippets?id=d634db9401ac320383d45e24431442259cf6a2a4'>etc: Use git-file-name if origin is git-fetch.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/scheme-mode/guix-origin: Use git-file-name.
</span></span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2018-07-13 12:45:11 +0530'>2018-07-13</span></td><td><a href='/guix/commit/etc/snippets?id=9286c2950494b110e12d58d4ebd693d614120afe'>etc: snippets: Add guix-commit-message-use-https-home-page.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/text-mode/guix-commit-message-use-https-home-page: New file.
* doc/contributing.texi (The Perfect Setup): Document new snippet.
</span></span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2018-07-13 09:27:31 +0530'>2018-07-13</span></td><td><a href='/guix/commit/etc/snippets?id=202befb4ae775cfdab1566f4a69ec184406a56be'>etc: snippets: Add new build systems to package snippet.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/scheme-mode/guix-package: Add android-ndk-build-system and
scons-build-system as possibilities for the build-system field.
</span></span></td><td>Arun Isaac</td></tr>