3 files changed, 9 insertions, 9 deletions
diff --git a/CyteKit/TableViewCell.h b/CyteKit/TableViewCell.h
index 27fd650..719b16b 100644
--- a/CyteKit/TableViewCell.h
+++ b/CyteKit/TableViewCell.h
@@ -44,7 +44,7 @@
 
 #include <UIKit/UIKit.h>
 
-#include <CydiaSubstrate/CydiaSubstrate.h>
+#include <Menes/ObjectHandle.h>
 
 @protocol CyteTableViewCellDelegate
 - (void) drawContentRect:(CGRect)rect;
@@ -57,7 +57,7 @@
 @end
 
 @interface CYTableViewCell : UITableViewCell {
-    _H<CyteTableViewCellContentView> content_;
+    _H<CyteTableViewCellContentView, 1> content_;
     bool highlighted_;
 }
 
diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index 0954b38..76bdd82 100644
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -46,7 +46,7 @@
 #include <UIKit/UIKit.h>
 #include <MessageUI/MessageUI.h>
 
-#include <CydiaSubstrate/CydiaSubstrate.h>
+#include <Menes/ObjectHandle.h>
 
 @class IndirectDelegate;
 
@@ -62,11 +62,11 @@
     MFMailComposeViewControllerDelegate,
     UIWebViewDelegate
 > {
-    _transient CyteWebView *webview_;
+    _H<CyteWebView, 1> webview_;
     _transient UIScrollView *scroller_;
 
     _H<UIActivityIndicatorView> indicator_;
-    _H<IndirectDelegate> indirect_;
+    _H<IndirectDelegate, 1> indirect_;
     _H<NSURLAuthenticationChallenge> challenge_;
 
     bool error_;
diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 03f0b95..ca2f89a 100644
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -25,6 +25,9 @@ extern NSString * const kCAFilterNearest;
 #include <WebKit/DOMHTMLBodyElement.h>
 #include <WebKit/DOMRGBColor.h>
 
+#include <dlfcn.h>
+#include <objc/runtime.h>
+
 #define ForSaurik 0
 #define DefaultTimeout_ 120.0
 
@@ -138,9 +141,6 @@ float CYScrollViewDecelerationRateNormal;
     NSLog(@"[CyteWebViewController dealloc]");
 #endif
 
-    [webview_ setDelegate:nil];
-    [indirect_ setDelegate:nil];
-
     if ([loading_ count] != 0)
         [delegate_ releaseNetworkActivityIndicator];
 
@@ -919,7 +919,7 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) dispatchEvent:(NSString *)event {
-    [webview_ dispatchEvent:event];
+    [(CyteWebView *) webview_ dispatchEvent:event];
 }
 
 - (bool) hidesNavigationBar {