From 9806965016577cd595685a95a8a1183409e69a82 Mon Sep 17 00:00:00 2001
From: Tim Burks <tim@radtastical.com>
Date: Sun, 24 Apr 2016 21:20:29 -0700
Subject: [PATCH] Restructure some includes.

---
 objc/NSNumber+Nu.m      |  1 +
 objc/NSObject+Nu.m      |  2 ++
 objc/NSString+Nu.m      |  1 +
 objc/Nu.m               |  1 +
 objc/NuBlock.m          |  1 +
 objc/NuBridge.h         | 11 +----------
 objc/NuBridge.m         |  3 +++
 objc/NuEnumerable.m     |  1 +
 objc/NuMarkupOperator.m |  1 +
 objc/NuOperators.m      |  1 +
 objc/NuSymbol.m         |  1 +
 11 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/objc/NSNumber+Nu.m b/objc/NSNumber+Nu.m
index b5085f3..3f94132 100644
--- a/objc/NSNumber+Nu.m
+++ b/objc/NSNumber+Nu.m
@@ -9,6 +9,7 @@
 #import "NSNumber+Nu.h"
 #import "NuInternals.h"
 #import "NuBlock.h"
+#import "NuCell.h"
 
 @implementation NSNumber(Nu)
 
diff --git a/objc/NSObject+Nu.m b/objc/NSObject+Nu.m
index 09a65cd..54c9846 100644
--- a/objc/NSObject+Nu.m
+++ b/objc/NSObject+Nu.m
@@ -11,6 +11,8 @@
 #import "NSDictionary+Nu.h"
 #import "NuEnumerable.h"
 #import "NuMethod.h"
+#import "NuClass.h"
+#import "NuCell.h"
 
 @protocol NuCanSetAction
 - (void) setAction:(SEL) action;
diff --git a/objc/NSString+Nu.m b/objc/NSString+Nu.m
index f414f6d..f2056b9 100644
--- a/objc/NSString+Nu.m
+++ b/objc/NSString+Nu.m
@@ -10,6 +10,7 @@
 #import "NuInternals.h"
 #import "NSDictionary+Nu.h"
 #import "NSData+Nu.h"
+#import "NuCell.h"
 
 @interface NuStringEnumerator : NSEnumerator
 {
diff --git a/objc/Nu.m b/objc/Nu.m
index 90a8fec..69eb5a6 100644
--- a/objc/Nu.m
+++ b/objc/Nu.m
@@ -71,6 +71,7 @@
 #import "NuException.h"
 #import "NuBridge.h"
 #import "NuBridgedFunction.h"
+#import "NuClass.h"
 
 #ifdef LINUX
 id loadNuLibraryFile(NSString *nuFileName, id parser, id context, id symbolTable);
diff --git a/objc/NuBlock.m b/objc/NuBlock.m
index 85cd9ce..fbfe562 100644
--- a/objc/NuBlock.m
+++ b/objc/NuBlock.m
@@ -11,6 +11,7 @@
 #import "NuSuper.h"
 #import "NSDictionary+Nu.h"
 #import "NuCell.h"
+#import "NuClass.h"
 
 @interface NuBlock ()
 {
diff --git a/objc/NuBridge.h b/objc/NuBridge.h
index bb748ee..f6bf166 100644
--- a/objc/NuBridge.h
+++ b/objc/NuBridge.h
@@ -23,13 +23,4 @@
 #endif
 
 
-ffi_type *ffi_type_for_objc_type(const char *typeString);
-
-
-#import "NuMethod.h"
-
-#pragma mark -
-#pragma mark Interacting with the Objective-C Runtime
-
-#import "NuClass.h"
-
+ffi_type *ffi_type_for_objc_type(const char *typeString);
\ No newline at end of file
diff --git a/objc/NuBridge.m b/objc/NuBridge.m
index b6af5e0..eed3cfb 100644
--- a/objc/NuBridge.m
+++ b/objc/NuBridge.m
@@ -43,6 +43,9 @@
 #import "NuHandler.h"
 #import "NuReference.h"
 #import "NuPointer.h"
+#import "NuClass.h"
+#import "NSMethodSignature+Nu.h"
+#import "NSDictionary+Nu.h"
 
 /*
  * types:
diff --git a/objc/NuEnumerable.m b/objc/NuEnumerable.m
index 3c8758f..84d7f19 100644
--- a/objc/NuEnumerable.m
+++ b/objc/NuEnumerable.m
@@ -9,6 +9,7 @@
 #import "NuEnumerable.h"
 #import "NuInternals.h"
 #import "NuCell.h"
+#import "NuBlock.h"
 
 #pragma mark - NuEnumerable.m
 
diff --git a/objc/NuMarkupOperator.m b/objc/NuMarkupOperator.m
index 7ecc98d..c1477cb 100644
--- a/objc/NuMarkupOperator.m
+++ b/objc/NuMarkupOperator.m
@@ -9,6 +9,7 @@
 #import "Nu.h"
 #import "NuInternals.h"
 #import "NuMarkupOperator.h"
+#import "NuCell.h"
 
 @implementation NuMarkupOperator
 
diff --git a/objc/NuOperators.m b/objc/NuOperators.m
index ca15218..8e380ea 100644
--- a/objc/NuOperators.m
+++ b/objc/NuOperators.m
@@ -16,6 +16,7 @@
 #import "NSArray+Nu.h"
 #import "NuBridge.h"
 #import "NuBridgedFunction.h"
+#import "NuClass.h"
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
diff --git a/objc/NuSymbol.m b/objc/NuSymbol.m
index b57a611..b4c1df1 100644
--- a/objc/NuSymbol.m
+++ b/objc/NuSymbol.m
@@ -12,6 +12,7 @@
 #import "NuBridge.h"
 #import "NuBridgedFunction.h"
 #import "NuBridgedConstant.h"
+#import "NuClass.h"
 
 #pragma mark - NuSymbol.m