diff --git a/common/pom.xml b/common/pom.xml
index 8de19fba02..76fbe75e63 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -49,8 +49,6 @@
       <artifactId>jctools-core</artifactId>
       <!-- Need compile scope to be taken into account by shade plugin -->
       <scope>compile</scope>
-      <!-- Mark as optional as otherwise the bundle plugin will add strict import statements and so fail in OSGI containers-->
-      <optional>true</optional>
     </dependency>
 
     <!-- Logging frameworks - completely optional -->
@@ -187,6 +185,8 @@
                 <!-- NativeLibraryLoader can be used to manually load native libraries from other bundles that this bundle does not depend on,
                 hence use DynamicImport-Package instruction to ensure the loading is successful -->
                 <DynamicImport-Package>*</DynamicImport-Package>
+                <!-- JCTools is shaded -->
+                <Import-Package>!org.jctools.*;sun.misc;resolution:=optional;*</Import-Package>
               </instructions>
             </configuration>
           </execution>
@@ -195,4 +195,3 @@
     </plugins>
   </build>
 </project>
-
diff --git a/example/pom.xml b/example/pom.xml
index 5be1280798..fc613f9ec7 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -124,14 +124,6 @@
       <artifactId>logback-classic</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jctools</groupId>
-      <artifactId>jctools-core</artifactId>
-      <!-- Need runtime scope as otherwise idea is not able to run the examples -->
-      <!-- This is most likely a bug in idea -->
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 765d0952e5..bfda58188a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -599,13 +599,6 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <!-- Provided dependency for tests inside IDEs -->
-    <dependency>
-      <groupId>org.jctools</groupId>
-      <artifactId>jctools-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
   <build>