--- old/src/jdk.vm.ci/share/classes/module-info.java	2016-05-04 09:42:44.000000000 -1000
+++ new/src/jdk.vm.ci/share/classes/module-info.java	2016-05-04 09:42:44.000000000 -1000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,18 @@
  */
 
 module jdk.vm.ci {
-    uses jdk.vm.ci.hotspot.HotSpotVMEventListener;
-    uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
-    uses jdk.vm.ci.runtime.JVMCICompilerFactory;
+    exports jdk.vm.ci.code       to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.code.site  to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.code.stack to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.common     to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.inittimer  to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.meta       to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.runtime    to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.services   to jdk.vm.ci.hotspot;
+
+    exports jdk.vm.ci.aarch64    to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.amd64      to jdk.vm.ci.hotspot;
+    exports jdk.vm.ci.sparc      to jdk.vm.ci.hotspot;
 
-    provides jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory with
-        jdk.vm.ci.hotspot.aarch64.AArch64HotSpotJVMCIBackendFactory;
-    provides jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory with
-        jdk.vm.ci.hotspot.amd64.AMD64HotSpotJVMCIBackendFactory;
-    provides jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory with
-        jdk.vm.ci.hotspot.sparc.SPARCHotSpotJVMCIBackendFactory;
+    uses jdk.vm.ci.runtime.JVMCICompilerFactory;
 }