@@ -31,11 +31,11 @@
 #import "OFInvalidArgumentException.h"
 
 @implementation OFTimer
 @synthesize timeInterval = _interval, repeating = _repeats, valid = _valid;
 
-+ (instancetype)scheduledTimerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)scheduledTimerWithTimeInterval: (OFTimeInterval)timeInterval
 					target: (id)target
 				      selector: (SEL)selector
 				       repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -52,11 +52,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)scheduledTimerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)scheduledTimerWithTimeInterval: (OFTimeInterval)timeInterval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object
 				       repeats: (bool)repeats
 {
@@ -75,11 +75,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)scheduledTimerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)scheduledTimerWithTimeInterval: (OFTimeInterval)timeInterval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object1
 					object: (id)object2
 				       repeats: (bool)repeats
@@ -100,11 +100,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)scheduledTimerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)scheduledTimerWithTimeInterval: (OFTimeInterval)timeInterval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object1
 					object: (id)object2
 					object: (id)object3
@@ -127,11 +127,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)scheduledTimerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)scheduledTimerWithTimeInterval: (OFTimeInterval)timeInterval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object1
 					object: (id)object2
 					object: (id)object3
@@ -157,11 +157,11 @@
 
 	return [timer autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-+ (instancetype)scheduledTimerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)scheduledTimerWithTimeInterval: (OFTimeInterval)timeInterval
 				       repeats: (bool)repeats
 					 block: (of_timer_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: timeInterval];
@@ -177,11 +177,11 @@
 
 	return [timer autorelease];
 }
 #endif
 
-+ (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)timerWithTimeInterval: (OFTimeInterval)timeInterval
 			       target: (id)target
 			     selector: (SEL)selector
 			      repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -196,11 +196,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)timerWithTimeInterval: (OFTimeInterval)timeInterval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object
 			      repeats: (bool)repeats
 {
@@ -217,11 +217,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)timerWithTimeInterval: (OFTimeInterval)timeInterval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object1
 			       object: (id)object2
 			      repeats: (bool)repeats
@@ -240,11 +240,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)timerWithTimeInterval: (OFTimeInterval)timeInterval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object1
 			       object: (id)object2
 			       object: (id)object3
@@ -265,11 +265,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)timerWithTimeInterval: (OFTimeInterval)timeInterval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object1
 			       object: (id)object2
 			       object: (id)object3
@@ -293,11 +293,11 @@
 
 	return [timer autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-+ (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval
++ (instancetype)timerWithTimeInterval: (OFTimeInterval)timeInterval
 			      repeats: (bool)repeats
 				block: (of_timer_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: timeInterval];
@@ -317,11 +317,11 @@
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)of_initWithFireDate: (OFDate *)fireDate
-			   interval: (of_time_interval_t)interval
+			   interval: (OFTimeInterval)interval
 			     target: (id)target
 			   selector: (SEL)selector
 			     object: (id)object1
 			     object: (id)object2
 			     object: (id)object3
@@ -354,11 +354,11 @@
 
 	return self;
 }
 
 - (instancetype)initWithFireDate: (OFDate *)fireDate
-			interval: (of_time_interval_t)interval
+			interval: (OFTimeInterval)interval
 			  target: (id)target
 			selector: (SEL)selector
 			 repeats: (bool)repeats
 {
 	return [self of_initWithFireDate: fireDate
@@ -372,11 +372,11 @@
 			       arguments: 0
 				 repeats: repeats];
 }
 
 - (instancetype)initWithFireDate: (OFDate *)fireDate
-			interval: (of_time_interval_t)interval
+			interval: (OFTimeInterval)interval
 			  target: (id)target
 			selector: (SEL)selector
 			  object: (id)object
 			 repeats: (bool)repeats
 {
@@ -391,11 +391,11 @@
 			       arguments: 1
 				 repeats: repeats];
 }
 
 - (instancetype)initWithFireDate: (OFDate *)fireDate
-			interval: (of_time_interval_t)interval
+			interval: (OFTimeInterval)interval
 			  target: (id)target
 			selector: (SEL)selector
 			  object: (id)object1
 			  object: (id)object2
 			 repeats: (bool)repeats
@@ -411,11 +411,11 @@
 			       arguments: 2
 				 repeats: repeats];
 }
 
 - (instancetype)initWithFireDate: (OFDate *)fireDate
-			interval: (of_time_interval_t)interval
+			interval: (OFTimeInterval)interval
 			  target: (id)target
 			selector: (SEL)selector
 			  object: (id)object1
 			  object: (id)object2
 			  object: (id)object3
@@ -432,11 +432,11 @@
 			       arguments: 3
 				 repeats: repeats];
 }
 
 - (instancetype)initWithFireDate: (OFDate *)fireDate
-			interval: (of_time_interval_t)interval
+			interval: (OFTimeInterval)interval
 			  target: (id)target
 			selector: (SEL)selector
 			  object: (id)object1
 			  object: (id)object2
 			  object: (id)object3
@@ -455,11 +455,11 @@
 				 repeats: repeats];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (instancetype)initWithFireDate: (OFDate *)fireDate
-			interval: (of_time_interval_t)interval
+			interval: (OFTimeInterval)interval
 			 repeats: (bool)repeats
 			   block: (of_timer_block_t)block
 {
 	self = [super init];
 
@@ -538,11 +538,11 @@
 	OF_ENSURE(_arguments <= 4);
 
 	if (_repeats && _valid) {
 		int64_t missedIntervals =
 		    -_fireDate.timeIntervalSinceNow / _interval;
-		of_time_interval_t newFireDate;
+		OFTimeInterval newFireDate;
 		OFRunLoop *runLoop;
 
 		/* In case the clock was changed backwards */
 		if (missedIntervals < 0)
 			missedIntervals = 0;