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
+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 = -Wall -Wno-sign-compare -O3 -g -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 = -Wall -Wno-sign-compare -O3 -g
-
 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"
 
</tr></table>
<div class='path'>path: <a href='/guix/log/?id=72a0706f44e615b139ff4170634b95a05c461a30'>root</a>/<a href='/guix/log/gnu?id=72a0706f44e615b139ff4170634b95a05c461a30'>gnu</a>/<a href='/guix/log/gnu/packages?id=72a0706f44e615b139ff4170634b95a05c461a30'>packages</a>/<a href='/guix/log/gnu/packages/vulkan.scm?id=72a0706f44e615b139ff4170634b95a05c461a30'>vulkan.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/gnu/packages/vulkan.scm?id=72a0706f44e615b139ff4170634b95a05c461a30&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-10-08 19:24:34 +0200'>2019-10-08</span></td><td><a href='/guix/commit/gnu/packages/vulkan.scm?id=d1f3b333e6176a7879ab3742bbebb2a99f61a528'>Merge branch 'master' into staging</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-09-27 19:11:27 +0200'>2019-09-27</span></td><td><a href='/guix/commit/gnu/packages/vulkan.scm?id=e7f62a41b245ca30404c54f3f77930336627c2f7'>Merge branch 'master' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-09-25 17:50:48 +0200'>2019-09-25</span></td><td><a href='/guix/commit/gnu/packages/vulkan.scm?id=d7a7d255c4566652a79210ca1d6b9b1d8fe9f9b7'>gnu: spirv-tools: Use GIT-FILE-NAME.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-09-25 17:50:48 +0200'>2019-09-25</span></td><td><a href='/guix/commit/gnu/packages/vulkan.scm?id=aa1c7b4914fc7aeb31b2953388d3041dbf0b0ac6'>gnu: spirv-tools: Update to 2019.2.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-09-17 16:27:15 +0200'>2019-09-17</span></td><td><a href='/guix/commit/gnu/packages/vulkan.scm?id=9ff87bb99614923fa3336ab4bbf22e3444709b48'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>