diff --git a/cnd.utils/src/org/netbeans/modules/cnd/utils/cache/WeakSharedSet.java b/openide.util/src/org/openide/util/WeakSet.java
rename from cnd.utils/src/org/netbeans/modules/cnd/utils/cache/WeakSharedSet.java
rename to openide.util/src/org/openide/util/WeakSet.java
--- a/cnd.utils/src/org/netbeans/modules/cnd/utils/cache/WeakSharedSet.java
+++ b/openide.util/src/org/openide/util/WeakSet.java
@@ -42,10 +42,10 @@
  * made subject to such option by the copyright holder.
  */
 /*
- *  @(#)WeakSharedSet.java	0.2 07/02/26
+ *  @(#)WeakSet.java	0.2 07/02/26
  */
 
-package org.netbeans.modules.cnd.utils.cache;
+package org.openide.util;
 
 import java.io.IOException;
 import java.lang.ref.ReferenceQueue;
@@ -71,54 +71,54 @@
  * @author Vladimir Voskresensky
  */
 @SuppressWarnings("unchecked")
-public class WeakSharedSet <E> extends AbstractSet<E> implements Set<E> {
+public class WeakSet <E> extends AbstractSet<E> implements Set<E> {
     private final SharedKeyWeakHashMap<E, Boolean> m;  // The backing map
     private transient Set<E> s;       // Its keySet
 
     /**
-     * Constructs a new, empty <tt>WeakSharedSet</tt> with the given initial
+     * Constructs a new, empty <tt>WeakSet</tt> with the given initial
      * capacity and the given load factor.
      *
-     * @param  initialCapacity The initial capacity of the <tt>WeakSharedSet</tt>
-     * @param  loadFactor      The load factor of the <tt>WeakSharedSet</tt>
+     * @param  initialCapacity The initial capacity of the <tt>WeakSet</tt>
+     * @param  loadFactor      The load factor of the <tt>WeakSet</tt>
      * @throws IllegalArgumentException if the initial capacity is negative,
      *         or if the load factor is nonpositive.
      */
-    public WeakSharedSet(int initialCapacity, float loadFactor) {
+    public WeakSet(int initialCapacity, float loadFactor) {
         m = new SharedKeyWeakHashMap<E, Boolean>(initialCapacity, loadFactor);
         s = m.keySet();
     }
 
     /**
-     * Constructs a new, empty <tt>WeakSharedSet</tt> with the given initial
+     * Constructs a new, empty <tt>WeakSet</tt> with the given initial
      * capacity and the default load factor (0.75).
      *
-     * @param  initialCapacity The initial capacity of the <tt>WeakSharedSet</tt>
+     * @param  initialCapacity The initial capacity of the <tt>WeakSet</tt>
      * @throws IllegalArgumentException if the initial capacity is negative
      */
-    public WeakSharedSet(int initialCapacity) {
+    public WeakSet(int initialCapacity) {
         this(initialCapacity, SharedKeyWeakHashMap.DEFAULT_LOAD_FACTOR);
     }
 
     /**
-     * Constructs a new, empty <tt>WeakSharedSet</tt> with the default initial
+     * Constructs a new, empty <tt>WeakSet</tt> with the default initial
      * capacity (16) and load factor (0.75).
      */
-    public WeakSharedSet() {
+    public WeakSet() {
         m = new SharedKeyWeakHashMap<E, Boolean>();
         s = m.keySet();
     }
 
     /**
-     * Constructs a new <tt>WeakSharedSet</tt> with the same mappings as the
-     * specified map.  The <tt>WeakSharedSet</tt> is created with the default
+     * Constructs a new <tt>WeakSet</tt> with the same mappings as the
+     * specified map.  The <tt>WeakSet</tt> is created with the default
      * load factor (0.75) and an initial capacity sufficient to hold the
      * mappings in the specified map.
      *
      * @param   m the map whose mappings are to be placed in this map
      * @throws  NullPointerException if the specified map is null
      */
-    public WeakSharedSet(Set<? extends E> s) {
+    public WeakSet(Set<? extends E> s) {
         this(Math.max((int) (s.size() / SharedKeyWeakHashMap.DEFAULT_LOAD_FACTOR) + 1, 16),
                 SharedKeyWeakHashMap.DEFAULT_LOAD_FACTOR);
         addAll(s);
@@ -140,7 +140,7 @@
     }
 
     /**
-     * it is expected that method putIfAbsent is used instead of add
+     * @see #putIfAbsent
      */
     @Override
     public boolean add(E e) { return m.put(e, null) == null; }