diff --git a/cl-quil.asd b/cl-quil.asd
index 6b663e32..e5f814d5 100644
--- a/cl-quil.asd
+++ b/cl-quil.asd
@@ -13,8 +13,7 @@
                (:version #:magicl/core "0.10.0")
                #:qvm
                #:cl-grnm                ; nelder-mead implementation
-               #:org.tfeb.hax.abstract-classes
-               #:org.tfeb.hax.singleton-classes
+               #:clos-encounters
                #:yason                  ; JSON generation
                #:uiop
                #:split-sequence
@@ -101,8 +100,7 @@
                #:yacc                   ; Arithmetic parsing
                #:alexandria             ; Utilities
                #:parse-float            ; Float parsing
-               #:org.tfeb.hax.abstract-classes
-               #:org.tfeb.hax.singleton-classes
+               #:clos-encounters
                #:split-sequence
                #:cl-algebraic-data-type
                #:cl-permutation
diff --git a/src/package.lisp b/src/package.lisp
index 47dca536..b985bbf7 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -27,8 +27,7 @@
 (defpackage #:cl-quil.frontend
   (:use #:cl
         #:parse-float
-        #:org.tfeb.hax.abstract-classes
-        #:org.tfeb.hax.singleton-classes)
+        #:clos-encounters)
   (:local-nicknames (#:a #:alexandria))
   ;; frontend-options.lisp
   (:export
@@ -744,7 +743,7 @@
   (:use #:cl
         #:cl-quil.resource
         #:cl-quil.frontend
-        #:org.tfeb.hax.abstract-classes)
+        #:clos-encounters)
   (:local-nicknames (#:a #:alexandria))
   
   ;; options.lisp
diff --git a/src/quilt/package.lisp b/src/quilt/package.lisp
index 9a52d053..af04ec2f 100644
--- a/src/quilt/package.lisp
+++ b/src/quilt/package.lisp
@@ -11,8 +11,7 @@
   (:nicknames #:quilt)
   (:use #:cl
         #:cl-quil.frontend
-        #:org.tfeb.hax.abstract-classes
-        #:org.tfeb.hax.singleton-classes)
+        #:clos-encounters)
   ;; We define a number of methods on generic functions from
   ;; CL-QUIL. We import these here, as well as other internal symbols
   ;; that we want to get our hands on.