diff --git a/common/Makefile.am b/common/Makefile.am
index 4eac2816..25efcd2e 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -165,6 +165,8 @@ noinst_LTLIBRARIES += libp11-asn1.la
 libp11_asn1_la_SOURCES = \
 	common/asn1.c common/asn1.h \
 	common/oid.c common/oid.h \
+	common/persist.c common/persist.h \
+	common/types.h \
 	$(asn_h) \
 	$(NULL)
 
diff --git a/common/meson.build b/common/meson.build
index 621af8f2..90ad78ea 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -71,6 +71,7 @@ if with_asn1
   libp11_asn1_sources = [
     'asn1.c',
     'oid.c',
+    'persist.c',
   ]
 
   basic_asn_h = custom_target(
diff --git a/trust/persist.c b/common/persist.c
similarity index 100%
rename from trust/persist.c
rename to common/persist.c
diff --git a/trust/persist.h b/common/persist.h
similarity index 100%
rename from trust/persist.h
rename to common/persist.h
diff --git a/trust/types.h b/common/types.h
similarity index 100%
rename from trust/types.h
rename to common/types.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c902f33a..aa3e37b2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
 # List of source files which contain translatable strings.
+common/persist.c
 common/tool.c
 p11-kit/add-profile.c
 p11-kit/conf.c
@@ -34,7 +35,6 @@ trust/extract-pem.c
 trust/list.c
 trust/module.c
 trust/parser.c
-trust/persist.c
 trust/save.c
 trust/token.c
 trust/trust.c
diff --git a/trust/Makefile.am b/trust/Makefile.am
index e7685a1f..77f3faae 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -25,12 +25,10 @@ TRUST_SRCS = \
 	trust/digest.c trust/digest.h \
 	trust/index.c trust/index.h \
 	trust/parser.c trust/parser.h \
-	trust/persist.c trust/persist.h \
 	trust/module.c trust/module.h \
 	trust/save.c trust/save.h \
 	trust/session.c trust/session.h \
 	trust/token.c trust/token.h \
-	trust/types.h \
 	$(NULL)
 
 configdir = $(p11_package_config_modules)
@@ -98,7 +96,6 @@ trust_trust_CFLAGS = \
 trust_trust_SOURCES = \
 	trust/anchor.c trust/anchor.h \
 	trust/parser.c trust/parser.h \
-	trust/persist.c trust/persist.h \
 	trust/digest.c trust/digest.h \
 	trust/dump.c trust/dump.h \
 	trust/enumerate.c trust/enumerate.h \
diff --git a/trust/meson.build b/trust/meson.build
index 9f9e11f3..6178a7eb 100644
--- a/trust/meson.build
+++ b/trust/meson.build
@@ -13,7 +13,6 @@ libtrust_sources = [
   'digest.c',
   'index.c',
   'parser.c',
-  'persist.c',
   'module.c',
   'save.c',
   'session.c',
@@ -57,7 +56,6 @@ trust_sources = [
   'anchor.c',
   'check-format.c',
   'parser.c',
-  'persist.c',
   'digest.c',
   'dump.c',
   'enumerate.c',