diff --git a/openide.filesystems/nbproject/project.xml b/openide.filesystems/nbproject/project.xml
--- a/openide.filesystems/nbproject/project.xml
+++ b/openide.filesystems/nbproject/project.xml
@@ -47,6 +47,14 @@
             <code-name-base>org.openide.filesystems</code-name-base>
             <module-dependencies>
                 <dependency>
+                    <code-name-base>org.openide.modules</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.7</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git a/openide.filesystems/src/META-INF/services/org.netbeans.modules.openide.util.NamedServicesProvider b/openide.filesystems/src/META-INF/services/org.netbeans.modules.openide.util.NamedServicesProvider
deleted file mode 100644
--- a/openide.filesystems/src/META-INF/services/org.netbeans.modules.openide.util.NamedServicesProvider
+++ /dev/null
@@ -1,2 +0,0 @@
-org.netbeans.modules.openide.filesystems.RecognizeInstanceFiles
-#position=500
diff --git a/openide.filesystems/src/META-INF/services/org.openide.filesystems.URLMapper b/openide.filesystems/src/META-INF/services/org.openide.filesystems.URLMapper
deleted file mode 100644
--- a/openide.filesystems/src/META-INF/services/org.openide.filesystems.URLMapper
+++ /dev/null
@@ -1,1 +0,0 @@
-org.netbeans.modules.openide.filesystems.DefaultURLMapperProxy
diff --git a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/DefaultURLMapperProxy.java b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/DefaultURLMapperProxy.java
--- a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/DefaultURLMapperProxy.java
+++ b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/DefaultURLMapperProxy.java
@@ -44,10 +44,12 @@
 import java.net.URL;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.URLMapper;
+import org.openide.modules.Service;
 
 /**
  * Default URLMapper for public lookup.
  */
+@Service(URLMapper.class)
 public final class DefaultURLMapperProxy extends URLMapper {
 
     private static URLMapper DEFAULT;
diff --git a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
--- a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
+++ b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
@@ -51,6 +51,7 @@
 import org.openide.filesystems.FileSystem;
 import org.openide.filesystems.FileUtil;
 import org.openide.filesystems.Repository;
+import org.openide.modules.Service;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.SharedClassObject;
@@ -63,6 +64,7 @@
  *
  * @author Jaroslav Tulach
  */
+@Service(value=NamedServicesProvider.class, position=500)
 public final class RecognizeInstanceFiles extends NamedServicesProvider {
     private static final Logger LOG = Logger.getLogger(RecognizeInstanceFiles.class.getName());