diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index 18afec8f6..9e655d796 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -19,6 +19,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+ 
+#import "../Foundation/Ref.h"
 
 @import "CPFont.j"
 @import "CPShadow.j"
@@ -526,7 +528,7 @@ var CPControlBlackColor = [CPColor blackColor];
     if (_formatter)
     {
         var formattedValue = nil;
-        if ([_formatter getObjectValue:@ref(formattedValue) forString:value errorDescription:NULL])
+        if ([_formatter getObjectValue:AT_REF(formattedValue) forString:value errorDescription:NULL])
             value = formattedValue;
     }
 
diff --git a/Foundation/CPNumberFormatter.j b/Foundation/CPNumberFormatter.j
index 2e0921d4b..18d70b900 100644
--- a/Foundation/CPNumberFormatter.j
+++ b/Foundation/CPNumberFormatter.j
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#import "Ref.h"
 
 @import <Foundation/CPString.j>
 @import <Foundation/CPFormatter.j>
@@ -126,7 +127,8 @@ CPNumberFormatterRoundHalfUp        = CPRoundPlain;
 {
     // TODO Error handling.
     var value = [self numberFromString:aString];
-    @deref(anObject, value);
+    AT_DEREF(anObject, value);
+
     return YES;
 }