--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/util/CollectionsAccess.java	Tue Oct 20 18:32:23 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.graph.util;
-
-import java.util.Map;
-import java.util.Set;
-
-import com.oracle.graal.api.collections.CollectionsProvider;
-import com.oracle.graal.api.runtime.Graal;
-import com.oracle.graal.api.runtime.GraalRuntime;
-import com.oracle.graal.graph.Node;
-import com.oracle.graal.graph.NodeCollectionsProvider;
-
-/**
- * Static methods for accessing the methods in the installed {@link GraalRuntime}'s
- * {@link CollectionsProvider} and {@link NodeCollectionsProvider}.
- */
-public class CollectionsAccess {
-
-    private static final NodeCollectionsProvider provider = Graal.getRequiredCapability(NodeCollectionsProvider.class);
-
-    /**
-     * @see CollectionsProvider#newIdentityMap()
-     */
-    public static <K, V> Map<K, V> newIdentityMap() {
-        return provider.newIdentityMap();
-    }
-
-    /**
-     * @see CollectionsProvider#newIdentityMap()
-     */
-    public static <K, V> Map<K, V> newIdentityMap(int expectedMaxSize) {
-        return provider.newIdentityMap(expectedMaxSize);
-    }
-
-    /**
-     * @see CollectionsProvider#newIdentityMap(Map)
-     */
-    public static <K, V> Map<K, V> newIdentityMap(Map<K, V> initFrom) {
-        return provider.newIdentityMap(initFrom);
-    }
-
-    /**
-     * @see NodeCollectionsProvider#newNodeIdentitySet()
-     */
-    public static <E extends Node> Set<E> newNodeIdentitySet() {
-        return provider.newNodeIdentitySet();
-    }
-
-    /**
-     * @see NodeCollectionsProvider#newNodeIdentityMap()
-     */
-    public static <K extends Node, V> Map<K, V> newNodeIdentityMap() {
-        return provider.newNodeIdentityMap();
-    }
-
-    /**
-     * @see NodeCollectionsProvider#newNodeIdentityMap(int)
-     */
-    public static <K extends Node, V> Map<K, V> newNodeIdentityMap(int expectedMaxSize) {
-        return provider.newNodeIdentityMap(expectedMaxSize);
-    }
-
-    /**
-     * @see NodeCollectionsProvider#newNodeIdentityMap(Map)
-     */
-    public static <K extends Node, V> Map<K, V> newNodeIdentityMap(Map<K, V> initFrom) {
-        return provider.newNodeIdentityMap(initFrom);
-    }
-
-    /**
-     * Creates an identity set.
-     */
-    public static <E> Set<E> newIdentitySet() {
-        return provider.newIdentitySet();
-    }
-}

--- a/mx.graal/suite.py	Tue Oct 20 18:32:23 2015 +0200
+++ b/mx.graal/suite.py	Wed Oct 21 12:11:33 2015 +0200
@@ -184,6 +184,7 @@
       "dependencies" : [
         "jvmci:JVMCI_HOTSPOT",
         "jvmci:JVMCI_OPTIONS_PROCESSOR",
+        "com.oracle.graal.api.runtime",
         "com.oracle.graal.replacements",
         "com.oracle.graal.runtime",
         "com.oracle.graal.code",
@@ -283,7 +284,6 @@
         "com.oracle.graal.nodeinfo",
         "com.oracle.graal.compiler.common",
         "com.oracle.graal.api.collections",
-        "com.oracle.graal.api.runtime",
       ],
       "javaCompliance" : "1.8",
       "annotationProcessors" : [
@@ -299,6 +299,7 @@
       "checkstyle" : "com.oracle.graal.graph",
       "dependencies" : [
         "mx:JUNIT",
+        "com.oracle.graal.api.runtime",
         "com.oracle.graal.graph",
       ],
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
@@ -570,6 +571,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : [
+        "com.oracle.graal.api.runtime",
         "com.oracle.graal.runtime",
         "mx:JUNIT",
       ],
@@ -606,6 +608,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "JMH",
+        "com.oracle.graal.api.runtime",
         "com.oracle.graal.java",
         "com.oracle.graal.runtime",
       ],
@@ -820,6 +823,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "truffle:TRUFFLE_API",
+        "com.oracle.graal.api.runtime",
         "com.oracle.graal.runtime",
         "com.oracle.graal.replacements",
       ],
@@ -912,6 +916,7 @@
       "subDir" : "graal",
       "dependencies" : [
         "com.oracle.graal.api.replacements",
+        "com.oracle.graal.api.runtime",
         "com.oracle.graal.graph",
       ],
       "distDependencies" : [