diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j
index d38e465fe..02520e29c 100644
--- a/AppKit/CPScroller.j
+++ b/AppKit/CPScroller.j
@@ -26,13 +26,10 @@
 #include "../Foundation/Foundation.h"
 
 @import "CPControl.j"
+@import "CPViewAnimation.j"
 
-@class CPViewAnimation
-
-@global CPViewAnimationFadeOutEffect
-@global CPViewAnimationTargetKey
-@global CPViewAnimationEffectKey
-
+@global CPWindowAbove
+@global CPWindowBelow
 
 // CPScroller Constants
 CPScrollerNoPart            = 0;
diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j
index 1c459247b..d6ed7cd95 100644
--- a/AppKit/CPTableHeaderView.j
+++ b/AppKit/CPTableHeaderView.j
@@ -25,10 +25,12 @@
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPView.j"
+@import "CPPasteboard.j"
 
 @class CPCursor
 
 @global CPTableColumnUserResizingMask
+@global CPApp
 
 
 @implementation _CPTableColumnHeaderView : CPView
diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 1b0a149ec..3db27ee91 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -30,10 +30,16 @@
 @import "_CPCornerView.j"
 @import "CPScroller.j"
 @import "CPCompatibility.j"
+@import "CPPasteboard.j"
+@import "CPImageView.j"
 
 @class CPScrollView
 @class CPUserDefaults
 @class CPTableHeaderView
+@class CPClipView
+@class CPButton
+
+@global CPApp
 @global CPTableColumnAutoresizingMask