diff --git a/jollyday-core/pom.xml b/jollyday-core/pom.xml
index 442c841d4..56113f9bc 100644
--- a/jollyday-core/pom.xml
+++ b/jollyday-core/pom.xml
@@ -101,7 +101,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>de.focus_shift.jollyday-core</Bundle-SymbolicName>
-            <Export-Package>de.focus_shift.jollyday.core.*</Export-Package>
+            <Export-Package>
+              de.focus_shift.jollyday.core,
+              de.focus_shift.jollyday.core.spi,
+              de.focus_shift.jollyday.core.util
+            </Export-Package>
             <Require-Capability>
               osgi.serviceloader;filter:="(osgi.serviceloader=de.focus_shift.jollyday.core.spi.HolidayCalendarConfigurationService)";cardinality:=multiple,osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)"
             </Require-Capability>
diff --git a/jollyday-jackson/pom.xml b/jollyday-jackson/pom.xml
index 2584c7def..6d1ce487f 100644
--- a/jollyday-jackson/pom.xml
+++ b/jollyday-jackson/pom.xml
@@ -108,7 +108,7 @@
               com.fasterxml.jackson.annotation.*;version="[2.0,3)",
               *
             </Import-Package>
-            <Export-Package>de.focus_shift.jollyday.jackson.*</Export-Package>
+            <Export-Package>!*</Export-Package>
             <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
             <Provide-Capability>osgi.serviceloader;osgi.serviceloader=de.focus_shift.jollyday.core.spi.HolidayCalendarConfigurationService</Provide-Capability>
           </instructions>
diff --git a/jollyday-jackson/src/main/java/module-info.java b/jollyday-jackson/src/main/java/module-info.java
index 0d283acef..3101028dc 100644
--- a/jollyday-jackson/src/main/java/module-info.java
+++ b/jollyday-jackson/src/main/java/module-info.java
@@ -17,8 +17,6 @@
   requires org.threeten.extra;
   requires org.jspecify;
 
-  exports de.focus_shift.jollyday.jackson to
-    de.focus_shift.jollyday.core;
   exports de.focus_shift.jollyday.jackson.mapping to
     tools.jackson.databind;
 }
diff --git a/jollyday-jaxb/pom.xml b/jollyday-jaxb/pom.xml
index e337a4854..3bd049cf9 100644
--- a/jollyday-jaxb/pom.xml
+++ b/jollyday-jaxb/pom.xml
@@ -99,7 +99,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>de.focus_shift.jollyday-jaxb</Bundle-SymbolicName>
-            <Export-Package>de.focus_shift.jollyday.jaxb.*</Export-Package>
+            <Export-Package>!*</Export-Package>
             <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
             <Provide-Capability>osgi.serviceloader;osgi.serviceloader=de.focus_shift.jollyday.core.spi.HolidayCalendarConfigurationService</Provide-Capability>
           </instructions>
diff --git a/jollyday-jaxb/src/main/java/module-info.java b/jollyday-jaxb/src/main/java/module-info.java
index e70ff4f67..ab73122ca 100644
--- a/jollyday-jaxb/src/main/java/module-info.java
+++ b/jollyday-jaxb/src/main/java/module-info.java
@@ -14,7 +14,4 @@
   requires org.slf4j;
   requires org.threeten.extra;
   requires org.jspecify;
-
-  exports de.focus_shift.jollyday.jaxb to
-    de.focus_shift.jollyday.core;
 }