--- a/dwt/internal/cocoa/OS.d	Tue Dec 30 17:01:10 2008 +0100
+++ b/dwt/internal/cocoa/OS.d	Tue Dec 30 18:54:31 2008 +0100
@@ -57,6 +57,7 @@
 import dwt.internal.cocoa.NSGradient;
 import dwt.internal.cocoa.NSGraphicsContext;
 import dwt.internal.cocoa.NSImage;
+import dwt.internal.cocoa.NSNumberFormatter;
 import dwt.internal.cocoa.NSParagraphStyle;
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRange;
@@ -65,6 +66,7 @@
 import dwt.internal.cocoa.NSScroller;
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSString;
+import dwt.internal.cocoa.NSTabView;
 import dwt.internal.cocoa.NSTableView;
 import dwt.internal.cocoa.NSText;
 import dwt.internal.cocoa.NSView;
@@ -2739,7 +2741,7 @@
 public static const int NSApplicationDelegateReplySuccess = 0;
 public static const int NSAscendingPageOrder = 1;
 public static const int NSAtBottom = 5;
-alias NSTitlePosition.NSAtTop NSAtTop;
+alias Cocoa.NSTitlePosition.NSAtTop NSAtTop;
 public static const int NSAttachmentCharacter = 65532;
 public static const int NSAutoPagination = 0;
 public static const int NSAutosaveOperation = 3;
@@ -2763,7 +2765,7 @@
 public static const int NSBlueControlTint = 1;
 public static const int NSBoldFontMask = 2;
 alias Cocoa.NSBorderlessWindowMask NSBorderlessWindowMask;
-public static const int NSBottomTabsBezelBorder = 2;
+alias NSTabViewType.NSBottomTabsBezelBorder NSBottomTabsBezelBorder;
 public static const int NSBoxCustom = 4;
 public static const int NSBoxOldStyle = 3;
 public static const int NSBoxPrimary = 0;
@@ -2817,7 +2819,7 @@
 public static const int NSClearDisplayFunctionKey = 63290;
 public static const int NSClearLineFunctionKey = 63289;
 public static const int NSClipPagination = 2;
-public static const int NSClockAndCalendarDatePickerStyle = 1;
+alias NSDatePickerStyle.NSClockAndCalendarDatePickerStyle NSClockAndCalendarDatePickerStyle;
 public static const int NSClosableWindowMask = 2;
 alias Cocoa.NSBezierPathElement.NSClosePathBezierPathElement NSClosePathBezierPathElement;
 public static const int NSColorListModeColorPanel = 5;
@@ -3050,12 +3052,12 @@
 public static const int NSIdentityMappingCharacterCollection = 0;
 public static const int NSIllegalTextMovement = 0;
 alias Cocoa.NSCellImagePosition.NSImageAbove NSImageAbove;
-public static const int NSImageAlignBottom = 5;
-public static const int NSImageAlignBottomLeft = 6;
-public static const int NSImageAlignBottomRight = 7;
-public static const int NSImageAlignCenter = 0;
-public static const int NSImageAlignLeft = 4;
-public static const int NSImageAlignRight = 8;
+alias Cocoa.NSImageAlignment.NSImageAlignBottom NSImageAlignBottom;
+alias Cocoa.NSImageAlignment.NSImageAlignBottomLeft NSImageAlignBottomLeft;
+alias Cocoa.NSImageAlignment.NSImageAlignBottomRight NSImageAlignBottomRight;
+alias Cocoa.NSImageAlignment.NSImageAlignCenter NSImageAlignCenter;
+alias Cocoa.NSImageAlignment.NSImageAlignLeft NSImageAlignLeft;
+alias Cocoa.NSImageAlignment.NSImageAlignRight NSImageAlignRight;
 public static const int NSImageAlignTop = 1;
 public static const int NSImageAlignTopLeft = 2;
 public static const int NSImageAlignTopRight = 3;
@@ -3181,7 +3183,7 @@
 public static const int NSNoTabsBezelBorder = 4;
 public static const int NSNoTabsLineBorder = 5;
 public static const int NSNoTabsNoBorder = 6;
-alias NSTitlePosition.NSNoTitle NSNoTitle;
+alias Cocoa.NSTitlePosition.NSNoTitle NSNoTitle;
 public static const int NSNoUnderlineStyle = 0;
 public static const int NSNonStandardCharacterSetFontMask = 8;
 alias Cocoa.NSWindingRule.NSNonZeroWindingRule NSNonZeroWindingRule;
@@ -3351,7 +3353,7 @@
 public static const int NSSaveAsOperation = 1;
 public static const int NSSaveOperation = 0;
 public static const int NSSaveToOperation = 2;
-public static const int NSScaleNone = 2;
+alias Cocoa.NSImageScaling.NSImageScaleNone NSScaleNone;
 public static const int NSScaleProportionally = 0;
 public static const int NSScaleToFit = 1;
 public static const int NSScreenChangedEventType = 8;
@@ -3861,7 +3863,7 @@
 public static const int NSNumberFormatterBehavior10_4 = 1040;
 public static const int NSNumberFormatterBehaviorDefault = 0;
 public static const int NSNumberFormatterCurrencyStyle = 2;
-public static const int NSNumberFormatterDecimalStyle = 1;
+alias NSNumberFormatterStyle.NSNumberFormatterDecimalStyle NSNumberFormatterDecimalStyle;
 public static const int NSNumberFormatterNoStyle = 0;
 public static const int NSNumberFormatterPadAfterPrefix = 1;
 public static const int NSNumberFormatterPadAfterSuffix = 3;