diff --git a/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java b/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java
index 1c0242a..037df7c 100644
--- a/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java
+++ b/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java
@@ -6,6 +6,4 @@
  * @param leftId The left-hand ID of the relation.
  * @param rightId The right-hand ID of the relation.
  */
-// XXX: Workaround for https://github.com/google/error-prone/issues/2321
-@SuppressWarnings("InvalidParam")
-record IdPair(long leftId, long rightId) {}
+public record IdPair(long leftId, long rightId) {}
diff --git a/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java b/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java
index ba0c3d3..b22daf3 100644
--- a/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java
+++ b/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java
@@ -12,6 +12,5 @@
  * @param toSuccessors A map of all {@link L} objects to their related {@link R} objects.
  * @param toPredecessors A reverse map of all {@link R} objects to their related {@link L} objects.
  */
-// XXX: Workaround for https://github.com/google/error-prone/issues/2321
-@SuppressWarnings({"ImmutableMemberCollection", "InvalidParam"})
+@SuppressWarnings("ImmutableMemberCollection")
 record ObjectMapping<L, R>(Map<L, List<R>> toSuccessors, Map<R, List<L>> toPredecessors) {}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..2721b31
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+module io.github.ferdinandswoboda.folo {
+  requires java.compiler;
+  requires transitive org.jooq;
+  requires static com.google.errorprone.annotations;
+  requires static org.jetbrains.annotations;
+
+  exports io.github.ferdinandswoboda.folo;
+
+  uses org.jooq.Field;
+  uses org.jooq.Record;
+  uses org.jooq.Table;
+  uses org.jooq.TableField;
+  uses org.jooq.ForeignKey;
+  uses org.jooq.UniqueKey;
+}