diff --git a/pop/POPAnimationInternal.h b/pop/POPAnimationInternal.h
index 777d441e..c888c434 100644
--- a/pop/POPAnimationInternal.h
+++ b/pop/POPAnimationInternal.h
@@ -11,12 +11,9 @@
 
 #import "POPAnimation.h"
 #import "POPAnimationRuntime.h"
-#import "POPAnimationTracer.h"
 #import "POPAnimationTracerInternal.h"
 #import "POPSpringSolver.h"
-#import "POPVector.h"
 #import "POPAction.h"
-#import "POPMath.h"
 
 using namespace POP;
 
diff --git a/pop/POPAnimationRuntime.h b/pop/POPAnimationRuntime.h
index bc02e9b5..ac39c836 100644
--- a/pop/POPAnimationRuntime.h
+++ b/pop/POPAnimationRuntime.h
@@ -12,7 +12,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "POPMath.h"
 #import "POPVector.h"
 
 enum POPValueType
diff --git a/pop/POPAnimator.mm b/pop/POPAnimator.mm
index e2074724..7b5da6c1 100644
--- a/pop/POPAnimator.mm
+++ b/pop/POPAnimator.mm
@@ -16,14 +16,8 @@
 
 #import <QuartzCore/QuartzCore.h>
 
-#import "POPAnimation.h"
 #import "POPAnimationExtras.h"
-#import "POPAnimationInternal.h"
-#import "POPAnimationRuntime.h"
 #import "POPBasicAnimationInternal.h"
-#import "POPDecayAnimationInternal.h"
-#import "POPSpringAnimationInternal.h"
-#import "POPSpringSolver.h"
 
 using namespace std;
 using namespace POP;
diff --git a/pop/POPMath.h b/pop/POPMath.h
index a5142f94..ae92994c 100644
--- a/pop/POPMath.h
+++ b/pop/POPMath.h
@@ -12,8 +12,6 @@
 
 #import <POP/POPDefines.h>
 
-#import "POPVector.h"
-
 NS_INLINE CGFloat sqrtr(CGFloat f)
 {
 #if CGFLOAT_IS_DOUBLE
diff --git a/pop/POPSpringAnimationInternal.h b/pop/POPSpringAnimationInternal.h
index 82df1ac1..6d17c3ce 100644
--- a/pop/POPSpringAnimationInternal.h
+++ b/pop/POPSpringAnimationInternal.h
@@ -9,7 +9,6 @@
 
 #import "POPAnimationExtras.h"
 #import "POPPropertyAnimationInternal.h"
-#import "POPSpringAnimation.h"
 
 struct _POPSpringAnimationState : _POPPropertyAnimationState
 {
diff --git a/pop/POPVector.mm b/pop/POPVector.mm
index fcaa7ab6..b1027b9d 100644
--- a/pop/POPVector.mm
+++ b/pop/POPVector.mm
@@ -8,7 +8,6 @@
  */
 
 #import "POPVector.h"
-#import "POPAnimationRuntime.h"
 #import "POPCGUtils.h"
 
 namespace POP