Support system proxy settings on OS X, fixing bustage (bug 125995)

toolkit/system/osxproxy/Makefile.in

@@ -71,9 +71,4 @@ CMMSRCS = \
         nsOSXSystemProxySettings.mm \
         $(NULL)
 
-LOCAL_INCLUDES = \
-    -I/System/Library/Frameworks/Cocoa.framework/Headers \
-    -I/System/Library/Frameworks/SystemConfiguration.framework/Headers \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk

toolkit/system/osxproxy/nsOSXSystemProxySettings.mm

@@ -42,9 +42,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #import <Cocoa/Cocoa.h>
-#import <CoreFoundation/CoreFoundation.h>
-#import <CFError.h>
-#import <SystemConfiguration.h>
+#import <SystemConfiguration/SystemConfiguration.h>
 
 #include "nsISystemProxySettings.h"
 #include "nsIGenericFactory.h"