diff --git a/src/config/discover.ml b/src/config/discover.ml
deleted file mode 100644
index ae7fb0081..000000000
--- a/src/config/discover.ml
+++ /dev/null
@@ -1,25 +0,0 @@
-module C = Configurator.V1
-
-let () =
-  (* Extend the pkg-config path rather than overwriting it.
-     See #25 *)
-  let prepend = try Unix.getenv "OPAM_PKG_CONFIG_PATH" ^ ":" with _ -> "" in
-  let onto = try Unix.getenv "PKG_CONFIG_PATH" with _ -> "" in
-  let combined = prepend ^ onto in
-  if not(String.equal combined "") then Unix.putenv "PKG_CONFIG_PATH" combined;
-
-  C.main ~name:"mirage-xen-ocaml" (fun c ->
-    let default : C.Pkg_config.package_conf =
-      { libs   = []
-      ; cflags = []
-      }
-    in
-    let conf =
-      match C.Pkg_config.get c with
-      | None -> default
-      | Some pc ->
-        (match C.Pkg_config.query pc ~package:"mirage-xen-ocaml" with
-         | None -> default
-         | Some c -> c)
-    in
-    C.Flags.write_sexp "c_flags_xen.sexp" conf.cflags)
diff --git a/src/config/dune b/src/config/dune
deleted file mode 100644
index 21a5f9a54..000000000
--- a/src/config/dune
+++ /dev/null
@@ -1,3 +0,0 @@
-(executable
- (name discover)
- (libraries dune.configurator))
diff --git a/src/stack-direct/dune b/src/stack-direct/dune
index 6d8e46b50..f6dbf7163 100644
--- a/src/stack-direct/dune
+++ b/src/stack-direct/dune
@@ -1,5 +1,5 @@
 (library
  (name tcpip_stack_direct)
  (public_name tcpip.stack-direct)
- (libraries logs ipaddr lwt result fmt mirage-time mirage-random
+ (libraries logs ipaddr lwt fmt mirage-time mirage-random
    mirage-protocols mirage-stack mirage-net ethernet))
diff --git a/src/tcpip_checksum/dune b/src/tcpip_checksum/dune
index f678570fc..8c28b96cf 100644
--- a/src/tcpip_checksum/dune
+++ b/src/tcpip_checksum/dune
@@ -2,32 +2,9 @@
  (name tcpip)
  (public_name tcpip)
  (modules tcpip_checksum)
- (libraries cstruct tcpip.unix)
+ (libraries cstruct)
  (wrapped false))
 
-(library
- (name tcpip_xen)
- (public_name tcpip.xen)
- (libraries tcpip)
- (modules tcpip_xen)
- (c_names checksum_stubs_xen)
- (c_flags
-  (:include c_flags_xen.sexp))
- (wrapped false))
-
-(rule
- (targets c_flags_xen.sexp)
- (deps
-  (:< ../config/discover.exe))
- (action (run %{<})))
-
-(rule
- (targets checksum_stubs_xen.c)
- (deps
-  (:< checksum_stubs.c))
- (action
-  (copy# %{<} %{targets})))
-
 (library
  (name tcpip_unix)
  (public_name tcpip.unix)
diff --git a/src/tcpip_checksum/tcpip_xen.ml b/src/tcpip_checksum/tcpip_xen.ml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tcpip.opam b/tcpip.opam
index dc12aea9b..eaf0d008d 100644
--- a/tcpip.opam
+++ b/tcpip.opam
@@ -14,14 +14,12 @@ tags: ["org:mirage"]
 
 build: [
   ["dune" "subst"] {pinned}
-  ["env" "OPAM_PKG_CONFIG_PATH=%{prefix}%/lib/pkgconfig" "dune" "build" "-p" name "-j" jobs]
-  ["env" "OPAM_PKG_CONFIG_PATH=%{prefix}%/lib/pkgconfig" "dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-
-depopts: ["mirage-xen-ocaml"]
+conflicts: [ "mirage-xen" {< "6.0.0"} ]
 depends: [
   "dune"
-  "dune-configurator"
   "ocaml" {>= "4.06.0"}
   "rresult" {>= "0.5.0"}
   "cstruct" {>= "3.2.0"}
diff --git a/test/dune b/test/dune
index 8ea600105..8aa4ca180 100644
--- a/test/dune
+++ b/test/dune
@@ -6,7 +6,7 @@
    mirage-stack arp arp-mirage ethernet tcpip.ipv4 tcpip.tcp tcpip.udp
    tcpip.stack-direct tcpip.icmpv4 tcpip.udpv4-socket tcpip.tcpv4-socket
    tcpip.icmpv4-socket tcpip.stack-socket tcpip.ipv6 ipaddr-cstruct
-   macaddr-cstruct))
+   macaddr-cstruct tcpip.unix))
 
 (alias
  (name runtest)