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"
 
ref='/guix/log/?id=ab46af12660d76a616e11c72768fa0a8142b8d72'>root</a>/<a href='/guix/log/po?id=ab46af12660d76a616e11c72768fa0a8142b8d72'>po</a>/<a href='/guix/log/po/packages?id=ab46af12660d76a616e11c72768fa0a8142b8d72'>packages</a>/<a href='/guix/log/po/packages/da.po?id=ab46af12660d76a616e11c72768fa0a8142b8d72'>da.po</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/po/packages/da.po?id=ab46af12660d76a616e11c72768fa0a8142b8d72&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-03 17:47:30 +0200'>2019-05-03</span></td><td><a href='/guix/commit/po/packages/da.po?id=adb5506b2cfb47f696d66a03ede897e9bfa829bb'>nls: Update da translations.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-13 21:40:02 +0100'>2019-02-13</span></td><td><a href='/guix/commit/po/packages/da.po?id=d093f3e4a4dd155969499ac2dc5fdb069a611c75'>nls: Update 'da' translation.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2018-06-18 23:19:51 +0200'>2018-06-18</span></td><td><a href='/guix/commit/po/packages/da.po?id=f202292217c0a5588d1c281014e9453ff0343c19'>nls: Update 'da' translation.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-23 13:36:58 -0400'>2017-05-23</span></td><td><a href='/guix/commit/po/packages/da.po?id=db375739dac31360f5ca945ff06edfd952595cc5'>nls: Update 'da' translation.</a></td><td>Leo Famulari</td></tr>
<tr><td><span title='2016-12-19 14:38:25 +0100'>2016-12-19</span></td><td><a href='/guix/commit/po/packages/da.po?id=42539a84097122ce7c78f397722cde9f97f9bcd1'>nls: Update 'da' package translation.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-12-04 21:41:50 +0100'>2016-12-04</span></td><td><a href='/guix/commit/po/packages/da.po?id=58786f55e52a08f6f7b66c8578ec99c8840e5311'>nls: Update 'da' package translation.</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2016-03-28 22:25:42 +0200'>2016-03-28</span></td><td><a href='/guix/commit/po/packages/da.po?id=c3cfb7e330032c51cdf26df9664327ea5a75e893'>nls: Update 'da' translation.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-11-01 22:24:20 +0100'>2015-11-01</span></td><td><a href='/guix/commit/po/packages/da.po?id=b8d2eda4a37a7e4c9fb529bd48899d87cefaf345'>nls: Add Danish translation for packages.</a></td><td>Ludovic Courtès</td></tr>