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"
 
/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=add37404d9ef23018df059ae0de76bd62d0a443a'>root</a>/<a href='/guix/log/gnu?id=add37404d9ef23018df059ae0de76bd62d0a443a'>gnu</a>/<a href='/guix/log/gnu/packages?id=add37404d9ef23018df059ae0de76bd62d0a443a'>packages</a>/<a href='/guix/log/gnu/packages/haskell-check.scm?id=add37404d9ef23018df059ae0de76bd62d0a443a'>haskell-check.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohov<tr><td><span title='2020-03-10 20:26:52 +0100'>2020-03-10</span></td><td><a href='/guix/commit/doc/fdl-1.3.texi?id=21656ffa3b6d78a610f0befced20cc9b4b3baab6'>doc: Use HTTPS for external links.</a><span class='msg-avail'>.<tr><td><span title='2022-10-31 18:13:48 -0700'>2022-10-31</span></td><td><a href='/guix/commit/gnu/packages/haskell-check.scm?id=15ff5eebb6109159a9ea4afd8cc942d9e0113148'>gnu: Fix various lint issues in synopsis and descriptions.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/android.scm (etc1tool)[synopsis]: Drop trailing period.
* gnu/packages/bioinformatics.scm (mudskipper)[synopsis]: Likewise.
* gnu/packages/crates-io.scm (rust-async-log-attributes-1)[synopsis]: Likewise.
  (rust-atomic-polyfill-1)[synopsis]: Likewise.
  (rust-modifier-0.1)[synopsis]: Likewise.
  (rust-openssl-macros-0.1)[synopsis]: Likewise.
  (rust-syn-mid-0.5)[synopsis]: Likewise.
  (rust-toml-edit-0.14)[synopsis]: Likewise.
  (rust-valuable-derive-0.1)[synopsis]: Likewise.
  (rust-inflections-1)[synopsis]: Likewise.
* gnu/packages/databases.scm (python-databases)[synopsis]: Likewise.
* gnu/packages/games.scm (liquidwar6)[synopsis]: Likewise.
* gnu/packages/golang.scm (go-golang.org-x-sync-errgroup)[synopsis]: Likewise.
* gnu/packages/guile-xyz.scm (guile-config)[synopsis]: Likewise.
* gnu/packages/haskell-web.scm (ghc-hxt-xpath)[synopsis]: Likewise.
* gnu/packages/haskell-xyz.scm (ghc-string-qq)[synopsis]: Likewise.
* gnu/packages/machine-learning.scm (python-lap)[synopsis]: Likewise.
  (python-pyro-api)[synopsis]: Likewise.
* gnu/packages/messaging.scm (python-librecaptcha)[synopsis]: Likewise.
* gnu/packages/python-check.scm (python-pytest-cram)[synopsis]: Likewise.
* gnu/packages/python-web.scm (python-jschema-to-python)[synopsis]: Likewise.
  (python-sarif-om)[synopsis]: Likewise.
  (python-socksio)[synopsis]: Likewise.
  (python-msrest)[synopsis]: Likewise.
* gnu/packages/tor.scm (torsocks)[synopsis]: Likewise.
* gnu/packages/cran.scm (r-rlist)[synopsis]: Remove leading article.
* gnu/packages/crates-io.scm (rust-clippy-lints-0.0.153)[synopsis]: Likewise.
  (rust-simplelog-0.11)[synopsis]: Likewise.
* gnu/packages/samba.scm (wsdd)[synopsis]: Likewise.
* gnu/packages/crates-io.scm (rust-spki-0.4)[synopsis]: Remove trailing
  whitespace.
* gnu/packages/golang.scm (go-github-com-mattn-go-zglob)[description]: Remove
  leading whitespace.
* gnu/packages/haskell-check.scm (ghc-crypto-cipher-tests)[description]:
  Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-ctype)[synopsis]: Remove trailing
  whitespace.
* gnu/packages/mpi.scm (openmpi-thread-multiple)[description]: Remove leading
  whitespace.
* gnu/packages/node-xyz.scm (node-string-decoder)[synopsis]: Remove trailing
  whitespace.
</span></span></td><td>Vagrant Cascadian</td></tr>