diff --git a/AppKit/CPTextView/CPFontPanel.j b/AppKit/CPTextView/CPFontPanel.j
index d8385cb73..46cba7dbc 100755
--- a/AppKit/CPTextView/CPFontPanel.j
+++ b/AppKit/CPTextView/CPFontPanel.j
@@ -30,11 +30,17 @@
  */
 
 
-@import "CPTextStorage.j"
-@import "CPFontManager.j"
 @import "CPPanel.j"
 @import "CPColorWell.j"
 @import "CPColorPanel.j"
+@import "CPBrowser.j"
+@import "CPText.j"
+
+
+@class CPTextStorage
+@class CPLayoutManager
+@class CPTextContainer
+@class CPFontManager
 
 /*
     Collection indexes
diff --git a/AppKit/CPTextView/CPLayoutManager.j b/AppKit/CPTextView/CPLayoutManager.j
index 040e2ec1c..75d226f54 100755
--- a/AppKit/CPTextView/CPLayoutManager.j
+++ b/AppKit/CPTextView/CPLayoutManager.j
@@ -28,7 +28,7 @@
 
 @import "CPTextStorage.j"
 @import "CPTextContainer.j"
-@import "CPTextView.j"
+@import "CGContext.j"
 
 function _RectEqualToRectHorizontally(lhsRect, rhsRect)
 {
diff --git a/AppKit/CPTextView/CPTextStorage.j b/AppKit/CPTextView/CPTextStorage.j
index ecb3306c6..3ddf4173b 100755
--- a/AppKit/CPTextView/CPTextStorage.j
+++ b/AppKit/CPTextView/CPTextStorage.j
@@ -23,7 +23,8 @@
 
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPAttributedString.j>
-@import "CPLayoutManager.j"
+
+@class CPLayoutManager;
 
 
 CPTextStorageEditedAttributes = 1;
diff --git a/AppKit/CPTextView/CPTextView.j b/AppKit/CPTextView/CPTextView.j
index 326fbec8b..3e321f613 100755
--- a/AppKit/CPTextView/CPTextView.j
+++ b/AppKit/CPTextView/CPTextView.j
@@ -27,10 +27,14 @@
 @import "CPTextStorage.j"
 @import "CPTextContainer.j"
 @import "CPFontManager.j"
-@import "_CPRTFProducer.j"
-@import "_CPRTFParser.j"
+//@import "_CPRTFProducer.j"
+//@import "_CPRTFParser.j"
 @import "CPLayoutManager.j"
 
+@class _CPRTFProducer;
+@class _CPRTFParser;
+
+
 _MakeRangeFromAbs = function(a1, a2)
 {
     return (a1 < a2) ? CPMakeRange(a1, a2 - a1) : CPMakeRange(a2, a1 - a2);
diff --git a/AppKit/CPTextView/_CPRTFParser.j b/AppKit/CPTextView/_CPRTFParser.j
index 996b5a863..b7a94790a 100755
--- a/AppKit/CPTextView/_CPRTFParser.j
+++ b/AppKit/CPTextView/_CPRTFParser.j
@@ -26,8 +26,8 @@ e.g. using zaach/jison on github
 
 @import <Foundation/CPAttributedString.j>
 @import <Foundation/CPGeometry.j>
-@import "CPControl.j"
 @import "CPFontManager.j"
+@import "CPTextStorage.j"
 
 var hexTable = [];
 
@@ -143,8 +143,8 @@ var hexTable = [];
 
 - (void)addTab:(float)location type:(CPTextTabType)type
 {
-    var tab = [[CPTextTab alloc] initWithType: CPLeftTabStopType 
-				      location: location];
+    var tab = [[CPTextTab alloc] initWithType:CPLeftTabStopType 
+				      location:location];
 
     if (!_tabChanged)
     {