diff --git a/Foundation/CPException.j b/Foundation/CPException.j
index 392cbe1b0..d11efcb77 100755
--- a/Foundation/CPException.j
+++ b/Foundation/CPException.j
@@ -20,11 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPCoder.j"
 @import "CPObject.j"
 @import "CPString.j"
 
-@class CPString
+@class CPCoder
 
 CPInvalidArgumentException          = @"CPInvalidArgumentException";
 CPUnsupportedMethodException        = @"CPUnsupportedMethodException";
diff --git a/Foundation/CPString.j b/Foundation/CPString.j
index e642bab49..b4413ddaf 100644
--- a/Foundation/CPString.j
+++ b/Foundation/CPString.j
@@ -20,17 +20,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPException.j"
 @import "CPObject.j"
 @import "CPObjJRuntime.j"
 @import "CPRange.j"
-@import "CPSortDescriptor.j"
-@import "CPURL.j"
 @import "CPValue.j"
 @import "CPNull.j"
 
 @class CPException
 @class CPURL
+@class CPSortDescriptor
 
 @global CPInvalidArgumentException
 @global CPRangeException
diff --git a/Foundation/CPValue.j b/Foundation/CPValue.j
index e19f5baa3..40d0aedc2 100644
--- a/Foundation/CPValue.j
+++ b/Foundation/CPValue.j
@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPCoder.j"
 @import "CPObject.j"
 
+@class CPCoder
+
 /*!
     @class CPValue
     @ingroup foundation