--- a/dwt/internal/cocoa/OS.d	Wed Dec 31 16:50:37 2008 +0100
+++ b/dwt/internal/cocoa/OS.d	Wed Dec 31 21:01:13 2008 +0100
@@ -10,6 +10,26 @@
  *******************************************************************************/
 module dwt.internal.cocoa.OS;
 
+// CFString.h
+enum CFStringEncoding // CFStringBuiltInEncodings
+{
+    kCFStringEncodingMacRoman = 0,
+    kCFStringEncodingWindowsLatin1 = 0x0500,
+    kCFStringEncodingISOLatin1 = 0x0201,
+    kCFStringEncodingNextStepLatin = 0x0B01,
+    kCFStringEncodingASCII = 0x0600,
+    kCFStringEncodingUnicode = 0x0100,
+    kCFStringEncodingUTF8 = 0x08000100,
+    kCFStringEncodingNonLossyASCII = 0x0BFF,
+
+    kCFStringEncodingUTF16 = 0x0100,
+    kCFStringEncodingUTF16BE = 0x10000100,
+    kCFStringEncodingUTF16LE = 0x14000100,
+    kCFStringEncodingUTF32 = 0x0c000100,
+    kCFStringEncodingUTF32BE = 0x18000100,
+    kCFStringEncodingUTF32LE = 0x1c000100
+}
+
 // NSScroller.h
 enum NSScrollerPart
 {
@@ -31,6 +51,35 @@
     NSGrooveBorder = 3
 }
 
+enum NSSearchPathDirectory
+{
+NSApplicationDirectory = 1,
+NSDemoApplicationDirectory,
+NSDeveloperApplicationDirectory,
+NSAdminApplicationDirectory,
+NSLibraryDirectory,
+NSDeveloperDirectory,
+NSUserDirectory,
+NSDocumentationDirectory,
+NSDocumentDirectory,
+NSCoreServiceDirectory,
+NSDesktopDirectory = 12,
+NSCachesDirectory = 13,
+NSApplicationSupportDirectory = 14,
+NSDownloadsDirectory = 15,
+NSAllApplicationsDirectory = 100,
+NSAllLibrariesDirectory = 101
+}
+
+enum NSSearchPathDomainMask
+{
+NSUserDomainMask = 1,
+NSLocalDomainMask = 2,
+NSNetworkDomainMask = 4,
+NSSystemDomainMask = 8,
+NSAllDomainsMask = 0x0ffff,
+}
+
 import dwt.dwthelper.utils;
 
 import dwt.internal.C;
@@ -3626,12 +3675,12 @@
 public static const int NSWritingDirectionRightToLeft = 1;
 alias NSDatePickerElementFlags.NSYearMonthDatePickerElementFlag NSYearMonthDatePickerElementFlag;
 alias NSDatePickerElementFlags.NSYearMonthDayDatePickerElementFlag NSYearMonthDayDatePickerElementFlag;
-alias Carbon.CFStringEncoding.kCFStringEncodingUTF8 kCFStringEncodingUTF8;
+alias CFStringEncoding.kCFStringEncodingUTF8 kCFStringEncodingUTF8;
 public static const int NSASCIIStringEncoding = 1;
 public static const int NSAdminApplicationDirectory = 4;
 public static const int NSAggregateExpressionType = 14;
-alias Cocoa.NSSearchPathDirectory.NSAllApplicationsDirectory NSAllApplicationsDirectory;
-alias Cocoa.NSSearchPathDomainMask.NSAllDomainsMask NSAllDomainsMask;
+alias NSSearchPathDirectory.NSAllApplicationsDirectory NSAllApplicationsDirectory;
+alias NSSearchPathDomainMask.NSAllDomainsMask NSAllDomainsMask;
 public static const int NSAllLibrariesDirectory = 101;
 public static const int NSAllPredicateModifier = 1;
 public static const int NSAnchoredSearch = 8;
@@ -4048,7 +4097,7 @@
 public static const int NSUTF32BigEndianStringEncoding = -1744830208;
 public static const int NSUTF32LittleEndianStringEncoding = -1677721344;
 public static const int NSUTF32StringEncoding = -1946156800;
-alias NSStringEncoding.NSUTF8StringEncoding NSUTF8StringEncoding;
+alias Cocoa.NSStringEncoding.NSUTF8StringEncoding NSUTF8StringEncoding;
 public static const int NSUncachedRead = 2;
 public static const int NSUndefinedDateComponent = 2147483647;
 public static const int NSUndoCloseGroupingRunLoopOrdering = 350000;