diff --git a/src/denomination.ml b/src/denomination.ml
index 5a07ae5d..4594b6d4 100644
--- a/src/denomination.ml
+++ b/src/denomination.ml
@@ -1,4 +1,5 @@
 open Crypto
+open Time
 
 type t = {
   pub: rsa_pub;
diff --git a/src/keys.ml b/src/keys.ml
index 97b6f86c..41c5e6f0 100644
--- a/src/keys.ml
+++ b/src/keys.ml
@@ -1,5 +1,6 @@
 open Syntax
 open Crypto
+open Time
 
 type 'a result = ('a, string) Result.t
 
diff --git a/src/mte_info.ml b/src/mte_info.ml
index 5ce10b62..6b670c96 100644
--- a/src/mte_info.ml
+++ b/src/mte_info.ml
@@ -1,5 +1,6 @@
 open Syntax
 open Api
+open Time
 module String_map = Stdlib.Map.Make (Stdlib.String)
 
 (* TODO mirage-crypto
diff --git a/src/mte_management.ml b/src/mte_management.ml
index cc453afc..fcde4e67 100644
--- a/src/mte_management.ml
+++ b/src/mte_management.ml
@@ -1,6 +1,7 @@
 open Syntax
 open Api
 open Hash
+open Time
 
 module Keys_get = struct
   let jsont = FutureKeysResponse.jsont
diff --git a/src/pg_type.ml b/src/pg_type.ml
index f58157cc..e7288744 100644
--- a/src/pg_type.ml
+++ b/src/pg_type.ml
@@ -14,7 +14,7 @@ let amount : Amount.t t =
 (* we want to use int64 timestamps,
      not postgresql built-in timestamp type *)
 let ptime : unit t = Caqti_type.unit
-let time = Timestamp.caqti
+let time = Time.Timestamp.caqti
 let time_span = Time.TimeRelative.caqti
 let age_mask : int t = Caqti_type.int
 let rsa_pub = RsaPublicKey.caqti
@@ -356,7 +356,7 @@ module Auditor = struct
     auditor_pub: Crypto.EddsaPublicKey.t;
     auditor_url: string;
     auditor_name: string;
-    last_change: Timestamp.t;
+    last_change: Time.Timestamp.t;
     is_active: bool;
   }
 
diff --git a/src/signkey.ml b/src/signkey.ml
index 2f0763be..cb3f1299 100644
--- a/src/signkey.ml
+++ b/src/signkey.ml
@@ -1,4 +1,5 @@
 open Crypto
+open Time
 
 type t = {
   pub: eddsa_pub;
diff --git a/src/timestamp.ml b/src/timestamp.ml
deleted file mode 100644
index 1a942758..00000000
--- a/src/timestamp.ml
+++ /dev/null
@@ -1 +0,0 @@
-include Time.Timestamp