From 5b6ae9567d8710ff66f897f4d5352df58d0ce171 Mon Sep 17 00:00:00 2001
From: Robert Widmann <devteam.codafi@gmail.com>
Date: Mon, 13 Jun 2016 16:48:14 -0700
Subject: [PATCH] Fileprivate updates

---
 Foundation/NSAffineTransform.swift           |  2 +-
 Foundation/NSArray.swift                     |  2 +-
 Foundation/NSAttributedString.swift          |  8 +-
 Foundation/NSBundle.swift                    |  4 +-
 Foundation/NSCFDictionary.swift              |  2 +-
 Foundation/NSCache.swift                     | 14 ++--
 Foundation/NSCalendar.swift                  | 30 ++++----
 Foundation/NSCharacterSet.swift              | 10 +--
 Foundation/NSConcreteValue.swift             | 14 ++--
 Foundation/NSData.swift                      | 46 +++++------
 Foundation/NSDateFormatter.swift             |  8 +-
 Foundation/NSDictionary.swift                |  2 +-
 Foundation/NSError.swift                     |  2 +-
 Foundation/NSFileHandle.swift                |  4 +-
 Foundation/NSGeometry.swift                  |  6 +-
 Foundation/NSIndexPath.swift                 |  2 +-
 Foundation/NSJSONSerialization.swift         |  4 +-
 Foundation/NSKeyedArchiver.swift             | 74 +++++++++---------
 Foundation/NSKeyedCoderOldStyleArray.swift   | 10 +--
 Foundation/NSKeyedUnarchiver.swift           | 80 ++++++++++----------
 Foundation/NSLocale.swift                    | 14 ++--
 Foundation/NSNotification.swift              | 20 ++---
 Foundation/NSNotificationQueue.swift         | 16 ++--
 Foundation/NSNumber.swift                    |  4 +-
 Foundation/NSNumberFormatter.swift           |  4 +-
 Foundation/NSObjCRuntime.swift               |  6 +-
 Foundation/NSOrderedSet.swift                |  6 +-
 Foundation/NSPredicate.swift                 |  4 +-
 Foundation/NSScanner.swift                   |  8 +-
 Foundation/NSSet.swift                       |  2 +-
 Foundation/NSSpecialValue.swift              |  8 +-
 Foundation/NSString.swift                    |  2 +-
 Foundation/NSSwiftRuntime.swift              |  2 +-
 Foundation/NSTask.swift                      | 38 +++++-----
 Foundation/NSThread.swift                    | 16 ++--
 Foundation/NSTimeZone.swift                  | 10 +--
 Foundation/NSURL.swift                       |  4 +-
 Foundation/NSURLCredential.swift             |  6 +-
 Foundation/NSURLRequest.swift                |  8 +-
 Foundation/NSURLResponse.swift               | 12 +--
 Foundation/NSUserDefaults.swift              |  6 +-
 Foundation/NSValue.swift                     |  6 +-
 Foundation/NSXMLDocument.swift               |  2 +-
 Foundation/NSXMLElement.swift                |  2 +-
 Foundation/NSXMLNode.swift                   | 10 +--
 Foundation/NSXMLParser.swift                 |  6 +-
 TestFoundation/TestNSAffineTransform.swift   |  2 +-
 TestFoundation/TestNSBundle.swift            | 14 ++--
 TestFoundation/TestNSCompoundPredicate.swift |  2 +-
 TestFoundation/TestNSKeyedArchiver.swift     |  8 +-
 TestFoundation/TestNSKeyedUnarchiver.swift   |  2 +-
 TestFoundation/TestNSNotificationQueue.swift |  4 +-
 TestFoundation/TestNSString.swift            |  4 +-
 TestFoundation/TestNSTask.swift              |  8 +-
 TestFoundation/TestNSURL.swift               |  4 +-
 55 files changed, 297 insertions(+), 297 deletions(-)

diff --git a/Foundation/NSAffineTransform.swift b/Foundation/NSAffineTransform.swift
index 38ffb82c79..6aa5d16731 100644
--- a/Foundation/NSAffineTransform.swift
+++ b/Foundation/NSAffineTransform.swift
@@ -132,7 +132,7 @@ public class NSAffineTransform : NSObject, NSCopying, NSSecureCoding {
      [ m21  m22  0 ]
      [  tX   tY  1 ]
  */
-private extension NSAffineTransformStruct {
+fileprivate extension NSAffineTransformStruct {
     /**
      Creates an affine transformation matrix from translation values.
      The matrix takes the following form:
diff --git a/Foundation/NSArray.swift b/Foundation/NSArray.swift
index 0cf69dee51..d1c64698ee 100644
--- a/Foundation/NSArray.swift
+++ b/Foundation/NSArray.swift
@@ -35,7 +35,7 @@ extension Array : _ObjectTypeBridgeable {
 }
 
 public class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCoding {
-    private let _cfinfo = _CFInfo(typeID: CFArrayGetTypeID())
+    fileprivate let _cfinfo = _CFInfo(typeID: CFArrayGetTypeID())
     internal var _storage = [AnyObject]()
     
     public var count: Int {
diff --git a/Foundation/NSAttributedString.swift b/Foundation/NSAttributedString.swift
index 49cca6c0ed..991db159c4 100644
--- a/Foundation/NSAttributedString.swift
+++ b/Foundation/NSAttributedString.swift
@@ -11,9 +11,9 @@ import CoreFoundation
 
 public class NSAttributedString : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
     
-    private let _cfinfo = _CFInfo(typeID: CFAttributedStringGetTypeID())
-    private let _string: NSString
-    private let _attributeArray: CFRunArrayRef
+    fileprivate let _cfinfo = _CFInfo(typeID: CFAttributedStringGetTypeID())
+    fileprivate let _string: NSString
+    fileprivate let _attributeArray: CFRunArrayRef
     
     public required init?(coder aDecoder: NSCoder) {
         NSUnimplemented()
@@ -120,7 +120,7 @@ public class NSAttributedString : NSObject, NSCopying, NSMutableCopying, NSSecur
     
     public init(attributedString attrStr: NSAttributedString) { NSUnimplemented() }
     
-    private func addAttributesToAttributeArray(attrs: [String : AnyObject]?) {
+    fileprivate func addAttributesToAttributeArray(attrs: [String : AnyObject]?) {
         guard _string.length > 0 else {
             return
         }
diff --git a/Foundation/NSBundle.swift b/Foundation/NSBundle.swift
index de768911ca..15a9c7ce2b 100644
--- a/Foundation/NSBundle.swift
+++ b/Foundation/NSBundle.swift
@@ -10,9 +10,9 @@
 import CoreFoundation
 
 public class NSBundle : NSObject {
-    private var _bundle : CFBundle!
+    fileprivate var _bundle : CFBundle!
 
-    private static var _mainBundle : NSBundle = {
+    fileprivate static var _mainBundle : NSBundle = {
         return NSBundle(cfBundle: CFBundleGetMainBundle())
     }()
     
diff --git a/Foundation/NSCFDictionary.swift b/Foundation/NSCFDictionary.swift
index 5d69d316e4..787339a1ce 100644
--- a/Foundation/NSCFDictionary.swift
+++ b/Foundation/NSCFDictionary.swift
@@ -46,7 +46,7 @@ internal final class _NSCFDictionary : NSMutableDictionary {
     }
     
     // This doesn't feel like a particularly efficient generator of CFDictionary keys, but it works for now. We should probably put a function into CF that allows us to simply iterate the keys directly from the underlying CF storage.
-    private struct _NSCFKeyGenerator : IteratorProtocol {
+    fileprivate struct _NSCFKeyGenerator : IteratorProtocol {
         var keyArray : [NSObject] = []
         var index : Int = 0
         let count : Int
diff --git a/Foundation/NSCache.swift b/Foundation/NSCache.swift
index 9588fbb1af..e242f31b46 100644
--- a/Foundation/NSCache.swift
+++ b/Foundation/NSCache.swift
@@ -9,7 +9,7 @@
 
 
 public class NSCache : NSObject {
-    private class NSCacheEntry {
+    fileprivate class NSCacheEntry {
         var key: AnyObject
         var value: AnyObject
         var cost: Int
@@ -22,10 +22,10 @@ public class NSCache : NSObject {
         }
     }
     
-    private var _entries = Dictionary<UnsafePointer<Void>, NSCacheEntry>()
-    private let _lock = NSLock()
-    private var _totalCost = 0
-    private var _byCost: NSCacheEntry?
+    fileprivate var _entries = Dictionary<UnsafePointer<Void>, NSCacheEntry>()
+    fileprivate let _lock = NSLock()
+    fileprivate var _totalCost = 0
+    fileprivate var _byCost: NSCacheEntry?
     
     public var name: String = ""
     public var totalCostLimit: Int = -1 // limits are imprecise/not strict
@@ -56,7 +56,7 @@ public class NSCache : NSObject {
         setObject(obj, forKey: key, cost: 0)
     }
     
-    private func remove(_ entry: NSCacheEntry) {
+    fileprivate func remove(_ entry: NSCacheEntry) {
         let oldPrev = entry.prevByCost
         let oldNext = entry.nextByCost
         oldPrev?.nextByCost = oldNext
@@ -66,7 +66,7 @@ public class NSCache : NSObject {
         }
     }
    
-    private func insert(_ entry: NSCacheEntry) {
+    fileprivate func insert(_ entry: NSCacheEntry) {
         if _byCost == nil {
             _byCost = entry
         } else {
diff --git a/Foundation/NSCalendar.swift b/Foundation/NSCalendar.swift
index 0d18213d2a..8e89d64425 100644
--- a/Foundation/NSCalendar.swift
+++ b/Foundation/NSCalendar.swift
@@ -95,12 +95,12 @@ public struct NSCalendarOptions : OptionSet {
 
 public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
     typealias CFType = CFCalendar
-    private var _base = _CFInfo(typeID: CFCalendarGetTypeID())
-    private var _identifier: UnsafeMutablePointer<Void>? = nil
-    private var _locale: UnsafeMutablePointer<Void>? = nil
-    private var _localeID: UnsafeMutablePointer<Void>? = nil
-    private var _tz: UnsafeMutablePointer<Void>? = nil
-    private var _cal: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _base = _CFInfo(typeID: CFCalendarGetTypeID())
+    fileprivate var _identifier: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _locale: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _localeID: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _tz: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _cal: UnsafeMutablePointer<Void>? = nil
     
     internal var _cfObject: CFType {
         return unsafeBitCast(self, to: CFCalendar.self)
@@ -130,7 +130,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
         }
     }
     
-    private var _startDate : NSDate? {
+    fileprivate var _startDate : NSDate? {
         get {
             return CFCalendarCopyGregorianStartDate(self._cfObject)?._nsObject
         }
@@ -250,7 +250,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
     
     // Methods to return component name strings localized to the calendar's locale
     
-    private func _symbols(_ key: CFString) -> [String] {
+    fileprivate func _symbols(_ key: CFString) -> [String] {
         let dateFormatter = CFDateFormatterCreate(kCFAllocatorSystemDefault, locale?._cfObject, kCFDateFormatterNoStyle, kCFDateFormatterNoStyle)
         CFDateFormatterSetProperty(dateFormatter, kCFDateFormatterCalendarKey, _cfObject)
         let result = (CFDateFormatterCopyProperty(dateFormatter, key) as! CFArray)._swiftObject
@@ -259,7 +259,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
         }
     }
     
-    private func _symbol(_ key: CFString) -> String {
+    fileprivate func _symbol(_ key: CFString) -> String {
         let dateFormatter = CFDateFormatterCreate(kCFAllocatorSystemDefault, locale?._cfObject, kCFDateFormatterNoStyle, kCFDateFormatterNoStyle)
         CFDateFormatterSetProperty(dateFormatter, kCFDateFormatterCalendarKey, self._cfObject)
         return (CFDateFormatterCopyProperty(dateFormatter, key) as! CFString)._swiftObject
@@ -394,14 +394,14 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
         return nil
     }
     
-    private func _convert(_ component: Int, type: String, vector: inout [Int32], compDesc: inout [Int8]) {
+    fileprivate func _convert(_ component: Int, type: String, vector: inout [Int32], compDesc: inout [Int8]) {
         if component != NSDateComponentUndefined {
             vector.append(Int32(component))
             compDesc.append(Int8(type.utf8[type.utf8.startIndex]))
         }
     }
     
-    private func _convert(_ comps: NSDateComponents) -> (Array<Int32>, Array<Int8>) {
+    fileprivate func _convert(_ comps: NSDateComponents) -> (Array<Int32>, Array<Int8>) {
         var vector = [Int32]()
         var compDesc = [Int8]()
         _convert(comps.era, type: "E", vector: &vector, compDesc: &compDesc)
@@ -446,13 +446,13 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
         }
     }
     
-    private func _setup(_ unitFlags: NSCalendarUnit, field: NSCalendarUnit, type: String, compDesc: inout [Int8]) {
+    fileprivate func _setup(_ unitFlags: NSCalendarUnit, field: NSCalendarUnit, type: String, compDesc: inout [Int8]) {
         if unitFlags.contains(field) {
             compDesc.append(Int8(type.utf8[type.utf8.startIndex]))
         }
     }
     
-    private func _setup(_ unitFlags: NSCalendarUnit) -> [Int8] {
+    fileprivate func _setup(_ unitFlags: NSCalendarUnit) -> [Int8] {
         var compDesc = [Int8]()
         _setup(unitFlags, field: .era, type: "G", compDesc: &compDesc)
         _setup(unitFlags, field: .year, type: "y", compDesc: &compDesc)
@@ -473,14 +473,14 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
         return compDesc
     }
     
-    private func _setComp(_ unitFlags: NSCalendarUnit, field: NSCalendarUnit, vector: [Int32], compIndex: inout Int, setter: (Int32) -> Void) {
+    fileprivate func _setComp(_ unitFlags: NSCalendarUnit, field: NSCalendarUnit, vector: [Int32], compIndex: inout Int, setter: (Int32) -> Void) {
         if unitFlags.contains(field) {
             setter(vector[compIndex])
             compIndex += 1
         }
     }
     
-    private func _components(_ unitFlags: NSCalendarUnit, vector: [Int32]) -> NSDateComponents {
+    fileprivate func _components(_ unitFlags: NSCalendarUnit, vector: [Int32]) -> NSDateComponents {
         var compIdx = 0
         let comps = NSDateComponents()
         _setComp(unitFlags, field: .era, vector: vector, compIndex: &compIdx) { comps.era = Int($0) }
diff --git a/Foundation/NSCharacterSet.swift b/Foundation/NSCharacterSet.swift
index 8a3eca2821..7eb9690571 100644
--- a/Foundation/NSCharacterSet.swift
+++ b/Foundation/NSCharacterSet.swift
@@ -31,11 +31,11 @@ let kCFCharacterSetIllegal = CFCharacterSetPredefinedSet.illegal
 
 public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
     typealias CFType = CFCharacterSet
-    private var _base = _CFInfo(typeID: CFCharacterSetGetTypeID())
-    private var _hashValue = CFHashCode(0)
-    private var _buffer: UnsafeMutablePointer<Void>? = nil
-    private var _length = CFIndex(0)
-    private var _annex: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _base = _CFInfo(typeID: CFCharacterSetGetTypeID())
+    fileprivate var _hashValue = CFHashCode(0)
+    fileprivate var _buffer: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _length = CFIndex(0)
+    fileprivate var _annex: UnsafeMutablePointer<Void>? = nil
     
     internal var _cfObject: CFType {
         return unsafeBitCast(self, to: CFType.self)
diff --git a/Foundation/NSConcreteValue.swift b/Foundation/NSConcreteValue.swift
index 3d1a52b46a..cedee1dbce 100644
--- a/Foundation/NSConcreteValue.swift
+++ b/Foundation/NSConcreteValue.swift
@@ -67,11 +67,11 @@ internal class NSConcreteValue : NSValue {
         }
     }
     
-    private static var _cachedTypeInfo = Dictionary<String, TypeInfo>()
-    private static var _cachedTypeInfoLock = NSLock()
+    fileprivate static var _cachedTypeInfo = Dictionary<String, TypeInfo>()
+    fileprivate static var _cachedTypeInfoLock = NSLock()
     
-    private var _typeInfo : TypeInfo
-    private var _storage : UnsafeMutablePointer<UInt8>
+    fileprivate var _typeInfo : TypeInfo
+    fileprivate var _storage : UnsafeMutablePointer<UInt8>
       
     required init(bytes value: UnsafePointer<Void>, objCType type: UnsafePointer<Int8>) {
         let spec = String(cString: type)
@@ -141,15 +141,15 @@ internal class NSConcreteValue : NSValue {
         }
     }
     
-    private var _size : Int {
+    fileprivate var _size : Int {
         return self._typeInfo.size
     }
     
-    private var value : UnsafeMutablePointer<Void> {
+    fileprivate var value : UnsafeMutablePointer<Void> {
         return unsafeBitCast(self._storage, to: UnsafeMutablePointer<Void>.self)
     }
     
-    private func _isEqualToValue(_ other: NSConcreteValue) -> Bool {
+    fileprivate func _isEqualToValue(_ other: NSConcreteValue) -> Bool {
         if self === other {
             return true
         }
diff --git a/Foundation/NSData.swift b/Foundation/NSData.swift
index 4da7464ea5..d26a9979fc 100644
--- a/Foundation/NSData.swift
+++ b/Foundation/NSData.swift
@@ -58,26 +58,26 @@ public struct NSDataBase64DecodingOptions : OptionSet {
     public static let anchored = NSDataSearchOptions(rawValue: UInt(1 << 1))
 }
 
-private final class _NSDataDeallocator {
+fileprivate final class _NSDataDeallocator {
     var handler: (UnsafeMutablePointer<Void>, Int) -> Void = {_,_ in }
 }
 
-private let __kCFMutable: CFOptionFlags = 0x01
-private let __kCFGrowable: CFOptionFlags = 0x02
-private let __kCFMutableVarietyMask: CFOptionFlags = 0x03
-private let __kCFBytesInline: CFOptionFlags = 0x04
-private let __kCFUseAllocator: CFOptionFlags = 0x08
-private let __kCFDontDeallocate: CFOptionFlags = 0x10
-private let __kCFAllocatesCollectable: CFOptionFlags = 0x20
+fileprivate let __kCFMutable: CFOptionFlags = 0x01
+fileprivate let __kCFGrowable: CFOptionFlags = 0x02
+fileprivate let __kCFMutableVarietyMask: CFOptionFlags = 0x03
+fileprivate let __kCFBytesInline: CFOptionFlags = 0x04
+fileprivate let __kCFUseAllocator: CFOptionFlags = 0x08
+fileprivate let __kCFDontDeallocate: CFOptionFlags = 0x10
+fileprivate let __kCFAllocatesCollectable: CFOptionFlags = 0x20
 
 public class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
     typealias CFType = CFData
-    private var _base = _CFInfo(typeID: CFDataGetTypeID())
-    private var _length: CFIndex = 0
-    private var _capacity: CFIndex = 0
-    private var _deallocator: UnsafeMutablePointer<Void>? = nil // for CF only
-    private var _deallocHandler: _NSDataDeallocator? = _NSDataDeallocator() // for Swift
-    private var _bytes: UnsafeMutablePointer<UInt8>? = nil
+    fileprivate var _base = _CFInfo(typeID: CFDataGetTypeID())
+    fileprivate var _length: CFIndex = 0
+    fileprivate var _capacity: CFIndex = 0
+    fileprivate var _deallocator: UnsafeMutablePointer<Void>? = nil // for CF only
+    fileprivate var _deallocHandler: _NSDataDeallocator? = _NSDataDeallocator() // for Swift
+    fileprivate var _bytes: UnsafeMutablePointer<UInt8>? = nil
     
     internal var _cfObject: CFType {
         if self.dynamicType === NSData.self || self.dynamicType === NSMutableData.self {
@@ -185,7 +185,7 @@ public class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
         return true
     }
     
-    private func byteDescription(limit: Int? = nil) -> String {
+    fileprivate func byteDescription(limit: Int? = nil) -> String {
         var s = ""
         let buffer = UnsafePointer<UInt8>(bytes)
         var i = 0
@@ -539,7 +539,7 @@ extension NSData {
         }
         return location.map {NSRange(location: $0, length: search.count)} ?? NSRange(location: NSNotFound, length: 0)
     }
-    private static func searchSubSequence<T : Collection, T2 : Sequence where T.Iterator.Element : Equatable, T.Iterator.Element == T2.Iterator.Element, T.SubSequence.Iterator.Element == T.Iterator.Element, T.Indices.Iterator.Element == T.Index>(_ subSequence : T2, inSequence seq: T,anchored : Bool) -> T.Index? {
+    fileprivate static func searchSubSequence<T : Collection, T2 : Sequence where T.Iterator.Element : Equatable, T.Iterator.Element == T2.Iterator.Element, T.SubSequence.Iterator.Element == T.Iterator.Element, T.Indices.Iterator.Element == T.Index>(_ subSequence : T2, inSequence seq: T,anchored : Bool) -> T.Index? {
         for index in seq.indices {
             if seq.suffix(from: index).starts(with: subSequence) {
                 return index
@@ -655,7 +655,7 @@ extension NSData {
     /**
       The ranges of ASCII characters that are used to encode data in Base64.
       */
-    private static let base64ByteMappings: [Range<UInt8>] = [
+    fileprivate static let base64ByteMappings: [Range<UInt8>] = [
         65 ..< 91,      // A-Z
         97 ..< 123,     // a-z
         48 ..< 58,      // 0-9
@@ -665,7 +665,7 @@ extension NSData {
     /**
      Padding character used when the number of bytes to encode is not divisible by 3
      */
-    private static let base64Padding : UInt8 = 61 // =
+    fileprivate static let base64Padding : UInt8 = 61 // =
     
     /**
         This method takes a byte with a character from Base64-encoded string
@@ -674,12 +674,12 @@ extension NSData {
         - parameter byte:       The byte with the Base64 character.
         - returns:              Base64DecodedByte value containing the result (Valid , Invalid, Padding)
         */
-    private enum Base64DecodedByte {
+    fileprivate enum Base64DecodedByte {
         case Valid(UInt8)
         case Invalid
         case Padding
     }
-    private static func base64DecodeByte(_ byte: UInt8) -> Base64DecodedByte {
+    fileprivate static func base64DecodeByte(_ byte: UInt8) -> Base64DecodedByte {
         guard byte != base64Padding else {return .Padding}
         var decodedStart: UInt8 = 0
         for range in base64ByteMappings {
@@ -702,7 +702,7 @@ extension NSData {
         - parameter byte:       The byte to encode
         - returns:              The ASCII value for the encoded character.
         */
-    private static func base64EncodeByte(_ byte: UInt8) -> UInt8 {
+    fileprivate static func base64EncodeByte(_ byte: UInt8) -> UInt8 {
         assert(byte < 64)
         var decodedStart: UInt8 = 0
         for range in base64ByteMappings {
@@ -726,7 +726,7 @@ extension NSData {
         - parameter options:    Options for handling invalid input
         - returns:              The decoded bytes.
         */
-    private static func base64DecodeBytes(_ bytes: [UInt8], options: NSDataBase64DecodingOptions = []) -> [UInt8]? {
+    fileprivate static func base64DecodeBytes(_ bytes: [UInt8], options: NSDataBase64DecodingOptions = []) -> [UInt8]? {
         var decodedBytes = [UInt8]()
         decodedBytes.reserveCapacity((bytes.count/3)*2)
 
@@ -796,7 +796,7 @@ extension NSData {
         - parameter options:    Options for formatting the result
         - returns:              The Base64-encoding for those bytes.
         */
-    private static func base64EncodeBytes(_ bytes: [UInt8], options: NSDataBase64EncodingOptions = []) -> [UInt8] {
+    fileprivate static func base64EncodeBytes(_ bytes: [UInt8], options: NSDataBase64EncodingOptions = []) -> [UInt8] {
         var result = [UInt8]()
         result.reserveCapacity((bytes.count/3)*4)
         
diff --git a/Foundation/NSDateFormatter.swift b/Foundation/NSDateFormatter.swift
index 6b0a41b649..b92d5e14ee 100644
--- a/Foundation/NSDateFormatter.swift
+++ b/Foundation/NSDateFormatter.swift
@@ -11,8 +11,8 @@ import CoreFoundation
 
 public class NSDateFormatter : NSFormatter {
     typealias CFType = CFDateFormatter
-    private var __cfObject: CFType?
-    private var _cfObject: CFType {
+    fileprivate var __cfObject: CFType?
+    fileprivate var _cfObject: CFType {
         guard let obj = __cfObject else {
             #if os(OSX) || os(iOS)
                 let dateStyle = CFDateFormatterStyle(rawValue: CFIndex(self.dateStyle.rawValue))!
@@ -83,7 +83,7 @@ public class NSDateFormatter : NSFormatter {
         NSUnimplemented()
     }
 
-    private func _reset() {
+    fileprivate func _reset() {
         __cfObject = nil
     }
 
@@ -123,7 +123,7 @@ public class NSDateFormatter : NSFormatter {
         }
     }
 
-    private var _dateFormat: String? { willSet { _reset() } }
+    fileprivate var _dateFormat: String? { willSet { _reset() } }
     public var dateFormat: String! {
         get {
             guard let format = _dateFormat else {
diff --git a/Foundation/NSDictionary.swift b/Foundation/NSDictionary.swift
index c880856910..909ed2599a 100644
--- a/Foundation/NSDictionary.swift
+++ b/Foundation/NSDictionary.swift
@@ -83,7 +83,7 @@ extension Dictionary : _ObjectTypeBridgeable {
 }
 
 public class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCoding {
-    private let _cfinfo = _CFInfo(typeID: CFDictionaryGetTypeID())
+    fileprivate let _cfinfo = _CFInfo(typeID: CFDictionaryGetTypeID())
     internal var _storage = [NSObject: AnyObject]()
     
     public var count: Int {
diff --git a/Foundation/NSError.swift b/Foundation/NSError.swift
index 019cfced4d..286914e2c0 100644
--- a/Foundation/NSError.swift
+++ b/Foundation/NSError.swift
@@ -42,7 +42,7 @@ public class NSError : NSObject, NSCopying, NSSecureCoding, NSCoding {
     public var _code: Int
     /// - Experiment: This is a draft API currently under consideration for official import into Foundation
     /// - Note: This API differs from Darwin because it uses [String : Any] as a type instead of [String : AnyObject]. This allows the use of Swift value types.
-    private var _userInfo: [String : Any]?
+    fileprivate var _userInfo: [String : Any]?
     
     /// - Experiment: This is a draft API currently under consideration for official import into Foundation
     /// - Note: This API differs from Darwin because it uses [String : Any] as a type instead of [String : AnyObject]. This allows the use of Swift value types.
diff --git a/Foundation/NSFileHandle.swift b/Foundation/NSFileHandle.swift
index fb5d4a0689..12386b0659 100644
--- a/Foundation/NSFileHandle.swift
+++ b/Foundation/NSFileHandle.swift
@@ -325,8 +325,8 @@ extension NSFileHandle {
 
 public class NSPipe : NSObject {
     
-    private let readHandle: NSFileHandle
-    private let writeHandle: NSFileHandle
+    fileprivate let readHandle: NSFileHandle
+    fileprivate let writeHandle: NSFileHandle
     
     public override init() {
         /// the `pipe` system call creates two `fd` in a malloc'ed area
diff --git a/Foundation/NSGeometry.swift b/Foundation/NSGeometry.swift
index 096a664dcb..2e029d92f1 100644
--- a/Foundation/NSGeometry.swift
+++ b/Foundation/NSGeometry.swift
@@ -32,7 +32,7 @@ public struct CGFloat {
     /// The native value.
     public var native: NativeType
     
-    private var hash: Int {
+    fileprivate var hash: Int {
 #if arch(i386) || arch(arm)
         return Int(Float(self.native).bitPattern)
 #else
@@ -780,7 +780,7 @@ public func NSStringFromRect(_ aRect: NSRect) -> String {
     return "{\(originString), \(sizeString)}"
 }
 
-private func _scanDoublesFromString(_ aString: String, number: Int) -> [Double] {
+fileprivate func _scanDoublesFromString(_ aString: String, number: Int) -> [Double] {
     let scanner = NSScanner(string: aString)
     let digitSet = NSMutableCharacterSet.decimalDigits()
     digitSet.addCharacters(in: "-")
@@ -954,7 +954,7 @@ extension NSCoder {
     }
 }
 
-private extension NSCoder {
+fileprivate extension NSCoder {
     func _encodeCGFloat(_ value: CGFloat) {
         if let keyedArchiver = self as? NSKeyedArchiver {
             keyedArchiver._encodeValue(NSNumber(value: value.native))
diff --git a/Foundation/NSIndexPath.swift b/Foundation/NSIndexPath.swift
index 69076f050f..3e050ad2e3 100644
--- a/Foundation/NSIndexPath.swift
+++ b/Foundation/NSIndexPath.swift
@@ -18,7 +18,7 @@ public class NSIndexPath : NSObject, NSCopying, NSSecureCoding {
         _indexes = Array(UnsafeBufferPointer(start: indexes, count: length))
     }
     
-    private init(indexes: [Int]) {
+    fileprivate init(indexes: [Int]) {
         _indexes = indexes
     }
     
diff --git a/Foundation/NSJSONSerialization.swift b/Foundation/NSJSONSerialization.swift
index 3a26bffdbf..dffb9a3ab0 100644
--- a/Foundation/NSJSONSerialization.swift
+++ b/Foundation/NSJSONSerialization.swift
@@ -227,7 +227,7 @@ internal extension NSJSONSerialization {
 }
 
 //MARK: - JSONSerializer
-private struct JSONWriter {
+fileprivate struct JSONWriter {
     
     var indent = 0
     let pretty: Bool
@@ -385,7 +385,7 @@ private struct JSONWriter {
 }
 
 //MARK: - JSONDeserializer
-private struct JSONReader {
+fileprivate struct JSONReader {
 
     static let whitespaceASCII: [UInt8] = [
         0x09, // Horizontal tab
diff --git a/Foundation/NSKeyedArchiver.swift b/Foundation/NSKeyedArchiver.swift
index 5d943339fb..f54e303cb8 100644
--- a/Foundation/NSKeyedArchiver.swift
+++ b/Foundation/NSKeyedArchiver.swift
@@ -92,25 +92,25 @@ public class NSKeyedArchiver : NSCoder {
         static let RequiresSecureCoding = ArchiverFlags(rawValue: 2)
     }
     
-    private class EncodingContext {
+    fileprivate class EncodingContext {
         // the object container that is being encoded
         var dict = Dictionary<String, Any>()
         // the index used for non-keyed objects (encodeObject: vs encodeObject:forKey:)
         var genericKey : UInt = 0
     }
 
-    private static var _classNameMap = Dictionary<String, String>()
-    private static var _classNameMapLock = NSLock()
+    fileprivate static var _classNameMap = Dictionary<String, String>()
+    fileprivate static var _classNameMapLock = NSLock()
     
-    private var _stream : AnyObject
-    private var _flags = ArchiverFlags(rawValue: 0)
-    private var _containers : Array<EncodingContext> = [EncodingContext()]
-    private var _objects : Array<Any> = [NSKeyedArchiveNullObjectReferenceName]
-    private var _objRefMap : Dictionary<NSUniqueObject, UInt32> = [:]
-    private var _replacementMap : Dictionary<NSUniqueObject, AnyObject> = [:]
-    private var _classNameMap : Dictionary<String, String> = [:]
-    private var _classes : Dictionary<String, CFKeyedArchiverUID> = [:]
-    private var _cache : Array<CFKeyedArchiverUID> = []
+    fileprivate var _stream : AnyObject
+    fileprivate var _flags = ArchiverFlags(rawValue: 0)
+    fileprivate var _containers : Array<EncodingContext> = [EncodingContext()]
+    fileprivate var _objects : Array<Any> = [NSKeyedArchiveNullObjectReferenceName]
+    fileprivate var _objRefMap : Dictionary<NSUniqueObject, UInt32> = [:]
+    fileprivate var _replacementMap : Dictionary<NSUniqueObject, AnyObject> = [:]
+    fileprivate var _classNameMap : Dictionary<String, String> = [:]
+    fileprivate var _classes : Dictionary<String, CFKeyedArchiverUID> = [:]
+    fileprivate var _cache : Array<CFKeyedArchiverUID> = []
 
     public weak var delegate: NSKeyedArchiverDelegate?
     public var outputFormat = NSPropertyListFormat.BinaryFormat_v1_0 {
@@ -171,7 +171,7 @@ public class NSKeyedArchiver : NSCoder {
         return finishedEncoding
     }
     
-    private init(output: AnyObject) {
+    fileprivate init(output: AnyObject) {
         self._stream = output
         super.init()
     }
@@ -180,7 +180,7 @@ public class NSKeyedArchiver : NSCoder {
         self.init(output: data)
     }
     
-    private func _writeXMLData(_ plist : NSDictionary) -> Bool {
+    fileprivate func _writeXMLData(_ plist : NSDictionary) -> Bool {
         var success = false
         
         if let data = self._stream as? NSMutableData {
@@ -199,7 +199,7 @@ public class NSKeyedArchiver : NSCoder {
         return success
     }
     
-    private func _writeBinaryData(_ plist : NSDictionary) -> Bool {
+    fileprivate func _writeBinaryData(_ plist : NSDictionary) -> Bool {
         return __CFBinaryPlistWriteToStream(plist, self._stream) > 0
     }
 
@@ -257,7 +257,7 @@ public class NSKeyedArchiver : NSCoder {
         return true
     }
     
-    private func _validateStillEncoding() -> Bool {
+    fileprivate func _validateStillEncoding() -> Bool {
         if self._flags.contains(ArchiverFlags.FinishedEncoding) {
             fatalError("Encoder already finished")
         }
@@ -265,7 +265,7 @@ public class NSKeyedArchiver : NSCoder {
         return true
     }
     
-    private class func _supportsSecureCoding(_ objv : AnyObject?) -> Bool {
+    fileprivate class func _supportsSecureCoding(_ objv : AnyObject?) -> Bool {
         var supportsSecureCoding : Bool = false
         
         if let secureCodable = objv as? NSSecureCoding {
@@ -275,7 +275,7 @@ public class NSKeyedArchiver : NSCoder {
         return supportsSecureCoding
     }
     
-    private func _validateObjectSupportsSecureCoding(_ objv : AnyObject?) {
+    fileprivate func _validateObjectSupportsSecureCoding(_ objv : AnyObject?) {
         if objv != nil &&
             self.requiresSecureCoding &&
             !NSKeyedArchiver._supportsSecureCoding(objv) {
@@ -283,12 +283,12 @@ public class NSKeyedArchiver : NSCoder {
         }
     }
     
-    private static func _createObjectRef(_ uid : UInt32) -> CFKeyedArchiverUID {
+    fileprivate static func _createObjectRef(_ uid : UInt32) -> CFKeyedArchiverUID {
         return Unmanaged<CFKeyedArchiverUID>.fromOpaque(
             UnsafePointer<Void>(_CFKeyedArchiverUIDCreate(kCFAllocatorSystemDefault, uid))).takeUnretainedValue()
     }
     
-    private func _createObjectRefCached(_ uid : UInt32) -> CFKeyedArchiverUID {
+    fileprivate func _createObjectRefCached(_ uid : UInt32) -> CFKeyedArchiverUID {
         if uid == 0 {
             return NSKeyedArchiveNullObjectReference
         } else if Int(uid) <= self._cache.count {
@@ -304,7 +304,7 @@ public class NSKeyedArchiver : NSCoder {
         Return a new object identifier, freshly allocated if need be. A placeholder null
         object is associated with the reference.
      */
-    private func _referenceObject(_ objv: AnyObject?, conditional: Bool = false) -> CFKeyedArchiverUID? {
+    fileprivate func _referenceObject(_ objv: AnyObject?, conditional: Bool = false) -> CFKeyedArchiverUID? {
         var uid : UInt32?
         
         if objv == nil {
@@ -331,7 +331,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Returns true if the object has already been encoded.
      */ 
-    private func _haveVisited(_ objv: AnyObject?) -> Bool {
+    fileprivate func _haveVisited(_ objv: AnyObject?) -> Bool {
         if objv == nil {
             return true // always have a null reference
         } else {
@@ -344,7 +344,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Get or create an object reference, and associate the object.
      */
-    private func _addObject(_ objv: AnyObject?) -> CFKeyedArchiverUID? {
+    fileprivate func _addObject(_ objv: AnyObject?) -> CFKeyedArchiverUID? {
         let haveVisited = _haveVisited(objv)
         let objectRef = _referenceObject(objv)
         
@@ -355,22 +355,22 @@ public class NSKeyedArchiver : NSCoder {
         return objectRef
     }
 
-    private func _pushEncodingContext(_ encodingContext: EncodingContext) {
+    fileprivate func _pushEncodingContext(_ encodingContext: EncodingContext) {
         self._containers.append(encodingContext)
     }
    
-    private func _popEncodingContext() {
+    fileprivate func _popEncodingContext() {
         self._containers.removeLast()
     }
     
-    private var _currentEncodingContext : EncodingContext {
+    fileprivate var _currentEncodingContext : EncodingContext {
         return self._containers.last!
     }
   
     /**
         Associate an encoded object or reference with a key in the current encoding context
      */
-    private func _setObjectInCurrentEncodingContext(_ object : AnyObject?, forKey key: String? = nil, escape: Bool = true) {
+    fileprivate func _setObjectInCurrentEncodingContext(_ object : AnyObject?, forKey key: String? = nil, escape: Bool = true) {
         let encodingContext = self._containers.last!
         var encodingKey : String
  
@@ -395,7 +395,7 @@ public class NSKeyedArchiver : NSCoder {
         The generic key is used for objects that are encoded without a key. It is a per-encoding
         context monotonically increasing integer prefixed with "$".
       */ 
-    private func _nextGenericKey() -> String {
+    fileprivate func _nextGenericKey() -> String {
         let key = "$" + String(_currentEncodingContext.genericKey)
         _currentEncodingContext.genericKey += 1
         return key
@@ -404,7 +404,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Update replacement object mapping
      */
-    private func replaceObject(_ object: AnyObject, withObject replacement: AnyObject?) {
+    fileprivate func replaceObject(_ object: AnyObject, withObject replacement: AnyObject?) {
         let oid = NSUniqueObject(object)
         
         if let unwrappedDelegate = self.delegate {
@@ -417,7 +417,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Returns true if the type cannot be encoded directly (i.e. is a container type)
      */
-    private func _isContainer(_ objv: AnyObject?) -> Bool {
+    fileprivate func _isContainer(_ objv: AnyObject?) -> Bool {
         // Note that we check for class equality rather than membership, because
         // their mutable subclasses are as object references
         let valueType = (objv == nil ||
@@ -432,7 +432,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Associates an object with an existing reference
      */ 
-    private func _setObject(_ objv: Any, forReference reference : CFKeyedArchiverUID) {
+    fileprivate func _setObject(_ objv: Any, forReference reference : CFKeyedArchiverUID) {
         let index = Int(objectRefGetValue(reference))
         self._objects[index] = objv
     }
@@ -440,7 +440,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Returns a dictionary describing class metadata for a class
      */
-    private func _classDictionary(_ clsv: AnyClass) -> Dictionary<String, Any> {
+    fileprivate func _classDictionary(_ clsv: AnyClass) -> Dictionary<String, Any> {
         func _classNameForClass(_ clsv: AnyClass) -> String? {
             var className : String?
             
@@ -491,7 +491,7 @@ public class NSKeyedArchiver : NSCoder {
         different), we maintain a private mapping between class name and
         object reference to avoid redundantly encoding class metadata
      */
-    private func _classReference(_ clsv: AnyClass) -> CFKeyedArchiverUID? {
+    fileprivate func _classReference(_ clsv: AnyClass) -> CFKeyedArchiverUID? {
         let className = NSStringFromClass(clsv)
         var classRef = self._classes[className] // keyed by actual class name
         
@@ -510,7 +510,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Return the object replacing another object (if any)
      */
-    private func _replacementObject(_ object: AnyObject?) -> AnyObject? {
+    fileprivate func _replacementObject(_ object: AnyObject?) -> AnyObject? {
         var objectToEncode : AnyObject? = nil // object to encode after substitution
 
         // nil cannot be mapped
@@ -551,7 +551,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
         Internal function to encode an object. Returns the object reference.
      */
-    private func _encodeObject(_ objv: AnyObject?, conditional: Bool = false) -> CFKeyedArchiverUID? {
+    fileprivate func _encodeObject(_ objv: AnyObject?, conditional: Bool = false) -> CFKeyedArchiverUID? {
         var object : AnyObject? = nil // object to encode after substitution
         var objectRef : CFKeyedArchiverUID? // encoded object reference
         let haveVisited : Bool
@@ -609,7 +609,7 @@ public class NSKeyedArchiver : NSCoder {
     /**
 	Encode an object and associate it with a key in the current encoding context.
      */
-    private func _encodeObject(_ objv: AnyObject?, forKey key: String?, conditional: Bool = false) {
+    fileprivate func _encodeObject(_ objv: AnyObject?, forKey key: String?, conditional: Bool = false) {
         if let objectRef = _encodeObject(objv, conditional: conditional) {
             _setObjectInCurrentEncodingContext(objectRef, forKey: key, escape: key != nil)
         }
@@ -654,7 +654,7 @@ public class NSKeyedArchiver : NSCoder {
         _encodePropertyList(objv, forKey: key)
     }
 
-    private func _encodeValueOfObjCType(_ type: _NSSimpleObjCType, at addr: UnsafePointer<Void>) {
+    fileprivate func _encodeValueOfObjCType(_ type: _NSSimpleObjCType, at addr: UnsafePointer<Void>) {
         switch type {
         case .ID:
             let objectp = unsafeBitCast(addr, to: UnsafePointer<AnyObject>.self)
diff --git a/Foundation/NSKeyedCoderOldStyleArray.swift b/Foundation/NSKeyedCoderOldStyleArray.swift
index afb2a04946..c47a4ed5ad 100644
--- a/Foundation/NSKeyedCoderOldStyleArray.swift
+++ b/Foundation/NSKeyedCoderOldStyleArray.swift
@@ -11,11 +11,11 @@ import CoreFoundation
 
 internal final class _NSKeyedCoderOldStyleArray : NSObject, NSCopying, NSSecureCoding, NSCoding {
 
-    private var _addr : UnsafeMutablePointer<UInt8> // free if decoding
-    private var _count : Int
-    private var _size : Int
-    private var _type : _NSSimpleObjCType
-    private var _decoded : Bool = false
+    fileprivate var _addr : UnsafeMutablePointer<UInt8> // free if decoding
+    fileprivate var _count : Int
+    fileprivate var _size : Int
+    fileprivate var _type : _NSSimpleObjCType
+    fileprivate var _decoded : Bool = false
     
     static func sizeForObjCType(_ type: _NSSimpleObjCType) -> Int? {
         var size : Int = 0
diff --git a/Foundation/NSKeyedUnarchiver.swift b/Foundation/NSKeyedUnarchiver.swift
index 21cd75505f..55c3699aa3 100644
--- a/Foundation/NSKeyedUnarchiver.swift
+++ b/Foundation/NSKeyedUnarchiver.swift
@@ -23,30 +23,30 @@ public class NSKeyedUnarchiver : NSCoder {
     }
     
     class DecodingContext {
-        private var dict : Dictionary<String, Any>
-        private var genericKey : UInt = 0
+        fileprivate var dict : Dictionary<String, Any>
+        fileprivate var genericKey : UInt = 0
         
         init(_ dict : Dictionary<String, Any>) {
             self.dict = dict
         }
     }
     
-    private static var _classNameMap : Dictionary<String, AnyClass> = [:]
-    private static var _classNameMapLock = NSLock()
+    fileprivate static var _classNameMap : Dictionary<String, AnyClass> = [:]
+    fileprivate static var _classNameMapLock = NSLock()
     
     public weak var delegate: NSKeyedUnarchiverDelegate?
     
-    private var _stream : AnyObject
-    private var _flags = UnarchiverFlags(rawValue: 0)
-    private var _containers : Array<DecodingContext>? = nil
-    private var _objects : Array<Any> = []
-    private var _objRefMap : Dictionary<UInt32, AnyObject> = [:]
-    private var _replacementMap : Dictionary<NSUniqueObject, AnyObject> = [:]
-    private var _classNameMap : Dictionary<String, AnyClass> = [:]
-    private var _classes : Dictionary<UInt32, AnyClass> = [:]
-    private var _cache : Array<CFKeyedArchiverUID> = []
-    private var _allowedClasses : Array<[AnyClass]> = []
-    private var _error : NSError? = nil
+    fileprivate var _stream : AnyObject
+    fileprivate var _flags = UnarchiverFlags(rawValue: 0)
+    fileprivate var _containers : Array<DecodingContext>? = nil
+    fileprivate var _objects : Array<Any> = []
+    fileprivate var _objRefMap : Dictionary<UInt32, AnyObject> = [:]
+    fileprivate var _replacementMap : Dictionary<NSUniqueObject, AnyObject> = [:]
+    fileprivate var _classNameMap : Dictionary<String, AnyClass> = [:]
+    fileprivate var _classes : Dictionary<UInt32, AnyClass> = [:]
+    fileprivate var _cache : Array<CFKeyedArchiverUID> = []
+    fileprivate var _allowedClasses : Array<[AnyClass]> = []
+    fileprivate var _error : NSError? = nil
     
     internal override var error: NSError? {
         return _error
@@ -85,7 +85,7 @@ public class NSKeyedUnarchiver : NSCoder {
         self.init(stream: data)
     }
     
-    private init(stream: AnyObject) {
+    fileprivate init(stream: AnyObject) {
         self._stream = stream
         super.init()
         
@@ -97,7 +97,7 @@ public class NSKeyedUnarchiver : NSCoder {
         }
     }
   
-    private func _readPropertyList() throws {
+    fileprivate func _readPropertyList() throws {
         var plist : Any? = nil
         var format = NSPropertyListFormat.BinaryFormat_v1_0
         
@@ -143,25 +143,25 @@ public class NSKeyedUnarchiver : NSCoder {
         self._containers = [DecodingContext(top!)]
     }
     
-    private func _pushDecodingContext(_ decodingContext: DecodingContext) {
+    fileprivate func _pushDecodingContext(_ decodingContext: DecodingContext) {
         self._containers!.append(decodingContext)
     }
     
-    private func _popDecodingContext() {
+    fileprivate func _popDecodingContext() {
         self._containers!.removeLast()
     }
     
-    private var _currentDecodingContext : DecodingContext {
+    fileprivate var _currentDecodingContext : DecodingContext {
         return self._containers!.last!
     }
     
-    private func _nextGenericKey() -> String {
+    fileprivate func _nextGenericKey() -> String {
         let key = "$" + String(_currentDecodingContext.genericKey)
         _currentDecodingContext.genericKey += 1
         return key
     }
     
-    private func _objectInCurrentDecodingContext<T>(forKey key: String?) -> T? {
+    fileprivate func _objectInCurrentDecodingContext<T>(forKey key: String?) -> T? {
         var unwrappedKey = key
         
         if key != nil {
@@ -176,7 +176,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Dereferences, but does not decode, an object reference
      */
-    private func _dereferenceObjectReference(_ unwrappedObjectRef: CFKeyedArchiverUID) -> Any? {
+    fileprivate func _dereferenceObjectReference(_ unwrappedObjectRef: CFKeyedArchiverUID) -> Any? {
         let uid = Int(objectRefGetValue(unwrappedObjectRef))
         
         guard uid < self._objects.count else {
@@ -196,7 +196,7 @@ public class NSKeyedUnarchiver : NSCoder {
         }
     }
     
-    private func _validateStillDecoding() -> Bool {
+    fileprivate func _validateStillDecoding() -> Bool {
         if self._flags.contains(UnarchiverFlags.FinishedDecoding) {
             fatalError("Decoder already finished")
         }
@@ -204,7 +204,7 @@ public class NSKeyedUnarchiver : NSCoder {
         return true
     }
     
-    private static func _supportsSecureCoding(_ clsv : AnyClass) -> Bool {
+    fileprivate static func _supportsSecureCoding(_ clsv : AnyClass) -> Bool {
         if let secureCodable = clsv as? NSSecureCoding.Type {
             return secureCodable.supportsSecureCoding()
         }
@@ -213,7 +213,7 @@ public class NSKeyedUnarchiver : NSCoder {
     }
     
     // FIXME is there a better way to do this with Swift stdlib?
-    private static func _classIsKindOfClass(_ assertedClass : AnyClass, _ allowedClass : AnyClass) -> Bool {
+    fileprivate static func _classIsKindOfClass(_ assertedClass : AnyClass, _ allowedClass : AnyClass) -> Bool {
         var superClass : AnyClass? = assertedClass
         
         repeat {
@@ -227,7 +227,7 @@ public class NSKeyedUnarchiver : NSCoder {
         return false
     }
     
-    private func _isClassAllowed(_ assertedClass: AnyClass?, allowedClasses: [AnyClass]?) -> Bool {
+    fileprivate func _isClassAllowed(_ assertedClass: AnyClass?, allowedClasses: [AnyClass]?) -> Bool {
         if assertedClass == nil {
             return false
         }
@@ -248,7 +248,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Validate a dictionary with class type information, mapping to a class if allowed
      */ 
-    private func _validateAndMapClassDictionary(_ classDict: Dictionary<String, Any>?,
+    fileprivate func _validateAndMapClassDictionary(_ classDict: Dictionary<String, Any>?,
                                                 allowedClasses: [AnyClass]?,
                                                 classToConstruct: inout AnyClass?) -> Bool {
         classToConstruct = nil
@@ -312,7 +312,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Validate a class reference against a class list, and return the class object if allowed
      */
-    private func _validateAndMapClassReference(_ classReference: CFKeyedArchiverUID,
+    fileprivate func _validateAndMapClassReference(_ classReference: CFKeyedArchiverUID,
                                                allowedClasses: [AnyClass]?) throws -> AnyClass? {
         let classUid = objectRefGetValue(classReference)
         var classToConstruct : AnyClass? = _classes[classUid]
@@ -345,18 +345,18 @@ public class NSKeyedUnarchiver : NSCoder {
         }
     }
     
-    private func _cachedObjectForReference(_ objectRef: CFKeyedArchiverUID) -> AnyObject? {
+    fileprivate func _cachedObjectForReference(_ objectRef: CFKeyedArchiverUID) -> AnyObject? {
         return self._objRefMap[objectRefGetValue(objectRef)]
     }
     
-    private func _cacheObject(_ object: AnyObject, forReference objectRef: CFKeyedArchiverUID) {
+    fileprivate func _cacheObject(_ object: AnyObject, forReference objectRef: CFKeyedArchiverUID) {
         self._objRefMap[objectRefGetValue(objectRef)] = object
     }
     
     /**
         Returns true if the object is a dictionary representing a object rather than a value type
      */
-    private func _isContainer(_ object: Any) -> Bool {
+    fileprivate func _isContainer(_ object: Any) -> Bool {
         guard let dict = object as? Dictionary<String, Any> else {
             return false
         }
@@ -370,7 +370,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Replace object with another one
      */
-    private func replaceObject(_ object: AnyObject, withObject replacement: AnyObject) {
+    fileprivate func replaceObject(_ object: AnyObject, withObject replacement: AnyObject) {
         let oid = NSUniqueObject(object)
         
         if let unwrappedDelegate = self.delegate {
@@ -380,12 +380,12 @@ public class NSKeyedUnarchiver : NSCoder {
         self._replacementMap[oid] = replacement
     }
     
-    private func _decodingError(_ code: NSCocoaError, withDescription description: String) -> NSError {
+    fileprivate func _decodingError(_ code: NSCocoaError, withDescription description: String) -> NSError {
         return NSError(domain: NSCocoaErrorDomain,
                                code: code.rawValue, userInfo: [ "NSDebugDescription" : description ])
     }
     
-    private func _replacementObject(_ decodedObject: AnyObject?) -> AnyObject? {
+    fileprivate func _replacementObject(_ decodedObject: AnyObject?) -> AnyObject? {
         var object : AnyObject? = nil // object to encode after substitution
         
         // nil cannot be mapped
@@ -411,7 +411,7 @@ public class NSKeyedUnarchiver : NSCoder {
         return decodedObject
     }
     
-    private func _validateClassSupportsSecureCoding(_ classToConstruct : AnyClass?) -> Bool {
+    fileprivate func _validateClassSupportsSecureCoding(_ classToConstruct : AnyClass?) -> Bool {
         var supportsSecureCoding : Bool = false
         
         if let secureDecodableClass = classToConstruct as? NSSecureCoding.Type {
@@ -429,7 +429,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Decode an object for the given reference
      */
-    private func _decodeObject(_ objectRef: AnyObject) throws -> AnyObject? {
+    fileprivate func _decodeObject(_ objectRef: AnyObject) throws -> AnyObject? {
         var object : AnyObject? = nil
 
         let _ = _validateStillDecoding()
@@ -506,7 +506,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
             Internal function to decode an object. Returns the decoded object or throws an error.
      */
-    private func _decodeObject(forKey key: String?) throws -> AnyObject? {
+    fileprivate func _decodeObject(forKey key: String?) throws -> AnyObject? {
         guard let objectRef : AnyObject? = _objectInCurrentDecodingContext(forKey: key) else {
             throw _decodingError(NSCocoaError.CoderValueNotFoundError,
                                  withDescription: "No value found for key \(key). The data may be corrupt.")
@@ -628,7 +628,7 @@ public class NSKeyedUnarchiver : NSCoder {
     }
     
     // private variant of decodeObjectOfClasses() that supports generic (unkeyed) objects
-    private func _decodeObjectOfClasses(_ classes: [AnyClass], forKey key: String? = nil) -> AnyObject? {
+    fileprivate func _decodeObjectOfClasses(_ classes: [AnyClass], forKey key: String? = nil) -> AnyObject? {
         do {
             self._allowedClasses.append(classes)
             defer { self._allowedClasses.removeLast() }
@@ -767,7 +767,7 @@ public class NSKeyedUnarchiver : NSCoder {
         return decodeObject() as? NSData
     }
     
-    private func _decodeValueOfObjCType(_ type: _NSSimpleObjCType, at addr: UnsafeMutablePointer<Void>) {
+    fileprivate func _decodeValueOfObjCType(_ type: _NSSimpleObjCType, at addr: UnsafeMutablePointer<Void>) {
         switch type {
         case .ID:
             if let ns = decodeObject() {
diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
index 3d7122a6f8..3823a78c8a 100644
--- a/Foundation/NSLocale.swift
+++ b/Foundation/NSLocale.swift
@@ -12,16 +12,16 @@ import CoreFoundation
 
 public class NSLocale : NSObject, NSCopying, NSSecureCoding {
     typealias CFType = CFLocale
-    private var _base = _CFInfo(typeID: CFLocaleGetTypeID())
-    private var _identifier: UnsafeMutablePointer<Void>? = nil
-    private var _cache: UnsafeMutablePointer<Void>? = nil
-    private var _prefs: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _base = _CFInfo(typeID: CFLocaleGetTypeID())
+    fileprivate var _identifier: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _cache: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _prefs: UnsafeMutablePointer<Void>? = nil
 #if os(OSX) || os(iOS)
-    private var _lock = pthread_mutex_t()
+    fileprivate var _lock = pthread_mutex_t()
 #elseif os(Linux)
-    private var _lock = Int32(0)
+    fileprivate var _lock = Int32(0)
 #endif
-    private var _nullLocale = false
+    fileprivate var _nullLocale = false
     
     internal var _cfObject: CFType {
         return unsafeBitCast(self, to: CFType.self)
diff --git a/Foundation/NSNotification.swift b/Foundation/NSNotification.swift
index bb6fcfb9ad..9f1659fc1d 100755
--- a/Foundation/NSNotification.swift
+++ b/Foundation/NSNotification.swift
@@ -85,11 +85,11 @@ extension NSNotification {
     }
 }
 
-private class NSNotificationReceiver : NSObject {
-    private weak var object: NSObject?
-    private var name: String?
-    private var block: ((NSNotification) -> Void)?
-    private var sender: AnyObject?
+fileprivate class NSNotificationReceiver : NSObject {
+    fileprivate weak var object: NSObject?
+    fileprivate var name: String?
+    fileprivate var block: ((NSNotification) -> Void)?
+    fileprivate var sender: AnyObject?
 }
 
 extension Sequence where Iterator.Element : NSNotificationReceiver {
@@ -101,7 +101,7 @@ extension Sequence where Iterator.Element : NSNotificationReceiver {
     ///  - elements that property `name` is not equal to parameter `name` if specified.
     ///  - elements that property `sender` is not equal to parameter `object` if specified.
     ///
-    private func filterOutObserver(_ observerToFilter: AnyObject, name:String? = nil, object: AnyObject? = nil) -> [Iterator.Element] {
+    fileprivate func filterOutObserver(_ observerToFilter: AnyObject, name:String? = nil, object: AnyObject? = nil) -> [Iterator.Element] {
         return self.filter { observer in
 
             let differentObserver = observer.object !== observerToFilter
@@ -120,7 +120,7 @@ extension Sequence where Iterator.Element : NSNotificationReceiver {
     ///  - elements that property `sender` is `nil` or equals specified parameter `sender`.
     ///  - elements that property `name` is `nil` or equals specified parameter `name`.
     ///
-    private func observersMatchingName(_ name:String? = nil, sender: AnyObject? = nil) -> [Iterator.Element] {
+    fileprivate func observersMatchingName(_ name:String? = nil, sender: AnyObject? = nil) -> [Iterator.Element] {
         return self.filter { observer in
 
             let emptyName = observer.name == nil
@@ -133,12 +133,12 @@ extension Sequence where Iterator.Element : NSNotificationReceiver {
     }
 }
 
-private let _defaultCenter: NSNotificationCenter = NSNotificationCenter()
+fileprivate let _defaultCenter: NSNotificationCenter = NSNotificationCenter()
 
 public class NSNotificationCenter : NSObject {
     
-    private var _observers: [NSNotificationReceiver]
-    private let _observersLock = NSLock()
+    fileprivate var _observers: [NSNotificationReceiver]
+    fileprivate let _observersLock = NSLock()
     
     public required override init() {
         _observers = [NSNotificationReceiver]()
diff --git a/Foundation/NSNotificationQueue.swift b/Foundation/NSNotificationQueue.swift
index 660bb5d5ff..79687f6092 100644
--- a/Foundation/NSNotificationQueue.swift
+++ b/Foundation/NSNotificationQueue.swift
@@ -46,7 +46,7 @@ public class NSNotificationQueue : NSObject {
 
     // The NSNotificationQueue instance is associated with current thread.
     // The _notificationQueueList represents a list of notification queues related to the current thread.
-    private static var _notificationQueueList = NSThreadSpecific<NSMutableArray>()
+    fileprivate static var _notificationQueueList = NSThreadSpecific<NSMutableArray>()
     internal static var notificationQueueList: NotificationQueueList {
         return _notificationQueueList.get() {
             return NSMutableArray()
@@ -54,7 +54,7 @@ public class NSNotificationQueue : NSObject {
     }
 
     // The default notification queue for the current thread.
-    private static var _defaultQueue = NSThreadSpecific<NSNotificationQueue>()
+    fileprivate static var _defaultQueue = NSThreadSpecific<NSNotificationQueue>()
     public class func defaultQueue() -> NSNotificationQueue {
         return _defaultQueue.get() {
             return NSNotificationQueue(notificationCenter: NSNotificationCenter.defaultCenter())
@@ -127,17 +127,17 @@ public class NSNotificationQueue : NSObject {
 
     // MARK: Private
 
-    private func addRunloopObserver(_ observer: CFRunLoopObserver) {
+    fileprivate func addRunloopObserver(_ observer: CFRunLoopObserver) {
         CFRunLoopAddObserver(NSRunLoop.currentRunLoop()._cfRunLoop, observer, kCFRunLoopDefaultMode)
         CFRunLoopAddObserver(NSRunLoop.currentRunLoop()._cfRunLoop, observer, kCFRunLoopCommonModes)
     }
 
-    private func removeRunloopObserver(_ observer: CFRunLoopObserver) {
+    fileprivate func removeRunloopObserver(_ observer: CFRunLoopObserver) {
         CFRunLoopRemoveObserver(NSRunLoop.currentRunLoop()._cfRunLoop, observer, kCFRunLoopDefaultMode)
         CFRunLoopRemoveObserver(NSRunLoop.currentRunLoop()._cfRunLoop, observer, kCFRunLoopCommonModes)
     }
 
-    private func notify(_ currentMode: String?, notificationList: inout NSNotificationList) {
+    fileprivate func notify(_ currentMode: String?, notificationList: inout NSNotificationList) {
         for (idx, (notification, modes)) in notificationList.enumerated().reversed() {
             if currentMode == nil || modes.contains(currentMode!) {
                 self.notificationCenter.postNotification(notification)
@@ -149,7 +149,7 @@ public class NSNotificationQueue : NSObject {
     /**
      Gets queues from the notificationQueueList and posts all notification from the list related to the postingStyle parameter.
      */
-    private func notifyQueues(_ postingStyle: NSPostingStyle) {
+    fileprivate func notifyQueues(_ postingStyle: NSPostingStyle) {
         let currentMode = NSRunLoop.currentRunLoop().currentMode
         for queue in NSNotificationQueue.notificationQueueList {
             let notificationQueue = queue as! NSNotificationQueue
@@ -161,11 +161,11 @@ public class NSNotificationQueue : NSObject {
         }
     }
 
-    private static func registerQueue(_ notificationQueue: NSNotificationQueue) {
+    fileprivate static func registerQueue(_ notificationQueue: NSNotificationQueue) {
         self.notificationQueueList.addObject(notificationQueue)
     }
 
-    private static func unregisterQueue(_ notificationQueue: NSNotificationQueue) {
+    fileprivate static func unregisterQueue(_ notificationQueue: NSNotificationQueue) {
         guard self.notificationQueueList.indexOfObject(notificationQueue) != NSNotFound else {
             return
         }
diff --git a/Foundation/NSNumber.swift b/Foundation/NSNumber.swift
index 32eb40c792..dc151bdd99 100644
--- a/Foundation/NSNumber.swift
+++ b/Foundation/NSNumber.swift
@@ -137,8 +137,8 @@ extension NSNumber : FloatLiteralConvertible, IntegerLiteralConvertible, Boolean
 public class NSNumber : NSValue {
     typealias CFType = CFNumber
     // This layout MUST be the same as CFNumber so that they are bridgeable
-    private var _base = _CFInfo(typeID: CFNumberGetTypeID())
-    private var _pad: UInt64 = 0
+    fileprivate var _base = _CFInfo(typeID: CFNumberGetTypeID())
+    fileprivate var _pad: UInt64 = 0
     
     internal var _cfObject: CFType {
         return unsafeBitCast(self, to: CFType.self)
diff --git a/Foundation/NSNumberFormatter.swift b/Foundation/NSNumberFormatter.swift
index 9057da31c6..0b273d6c4d 100644
--- a/Foundation/NSNumberFormatter.swift
+++ b/Foundation/NSNumberFormatter.swift
@@ -25,8 +25,8 @@ internal let kCFNumberFormatterCurrencyAccountingStyle = CFNumberFormatterStyle.
 public class NSNumberFormatter : NSFormatter {
     
     typealias CFType = CFNumberFormatter
-    private var _currentCfFormatter: CFType?
-    private var _cfFormatter: CFType {
+    fileprivate var _currentCfFormatter: CFType?
+    fileprivate var _cfFormatter: CFType {
         if let obj = _currentCfFormatter {
             return obj
         } else {
diff --git a/Foundation/NSObjCRuntime.swift b/Foundation/NSObjCRuntime.swift
index 81749c4ac3..a724dfba7d 100644
--- a/Foundation/NSObjCRuntime.swift
+++ b/Foundation/NSObjCRuntime.swift
@@ -83,7 +83,7 @@ extension _NSSimpleObjCType {
 
 // mapping of ObjC types to sizes and alignments (note that .Int is 32-bit)
 // FIXME use a generic function, unfortuantely this seems to promote the size to 8
-private let _NSObjCSizesAndAlignments : Dictionary<_NSSimpleObjCType, (Int, Int)> = [
+fileprivate let _NSObjCSizesAndAlignments : Dictionary<_NSSimpleObjCType, (Int, Int)> = [
     .ID         : ( sizeof(AnyObject),              alignof(AnyObject)          ),
     .Class      : ( sizeof(AnyClass),               alignof(AnyClass)           ),
     .Char       : ( sizeof(CChar),                  alignof(CChar)              ),
@@ -234,9 +234,9 @@ internal protocol _NSBridgable {
 }
 
 #if os(OSX) || os(iOS)
-private let _SwiftFoundationModuleName = "SwiftFoundation"
+fileprivate let _SwiftFoundationModuleName = "SwiftFoundation"
 #else
-private let _SwiftFoundationModuleName = "Foundation"
+fileprivate let _SwiftFoundationModuleName = "Foundation"
 #endif
 
 /**
diff --git a/Foundation/NSOrderedSet.swift b/Foundation/NSOrderedSet.swift
index e79df763b1..62339d22d2 100644
--- a/Foundation/NSOrderedSet.swift
+++ b/Foundation/NSOrderedSet.swift
@@ -108,7 +108,7 @@ public class NSOrderedSet : NSObject, NSCopying, NSMutableCopying, NSSecureCodin
         return objectAtIndex(idx)
     }
 
-    private func _insertObject(_ object: AnyObject) {
+    fileprivate func _insertObject(_ object: AnyObject) {
         guard !containsObject(object), let object = object as? NSObject else {
             return
         }
@@ -117,7 +117,7 @@ public class NSOrderedSet : NSObject, NSCopying, NSMutableCopying, NSSecureCodin
         _orderedStorage.append(object)
     }
 
-    private func _insertObjects(_ objects: UnsafePointer<AnyObject?>, count cnt: Int) {
+    fileprivate func _insertObjects(_ objects: UnsafePointer<AnyObject?>, count cnt: Int) {
         let buffer = UnsafeBufferPointer(start: objects, count: cnt)
         for obj in buffer {
             _insertObject(obj!)
@@ -372,7 +372,7 @@ public class NSMutableOrderedSet : NSOrderedSet {
 
     public required init?(coder aDecoder: NSCoder) { NSUnimplemented() }
 
-    private func _removeObject(_ object: AnyObject) {
+    fileprivate func _removeObject(_ object: AnyObject) {
       guard containsObject(object), let object = object as? NSObject else {
         return
       }
diff --git a/Foundation/NSPredicate.swift b/Foundation/NSPredicate.swift
index d136b657a4..87f684cce3 100644
--- a/Foundation/NSPredicate.swift
+++ b/Foundation/NSPredicate.swift
@@ -12,14 +12,14 @@
 
 public class NSPredicate : NSObject, NSSecureCoding, NSCopying {
 
-    private enum PredicateKind {
+    fileprivate enum PredicateKind {
         case Boolean(Bool)
         case Block((AnyObject?, [String : AnyObject]?) -> Bool)
         // TODO: case for init(format:argumentArray:)
         // TODO: case for init(fromMetadataQueryString:)
     }
 
-    private let kind: PredicateKind
+    fileprivate let kind: PredicateKind
 
     public static func supportsSecureCoding() -> Bool {
         return true
diff --git a/Foundation/NSScanner.swift b/Foundation/NSScanner.swift
index 3067af3382..fa4ef9c27f 100644
--- a/Foundation/NSScanner.swift
+++ b/Foundation/NSScanner.swift
@@ -204,7 +204,7 @@ internal struct _NSStringBuffer {
     }
 }
 
-private func isADigit(_ ch: unichar) -> Bool {
+fileprivate func isADigit(_ ch: unichar) -> Bool {
     struct Local {
         static let set = NSCharacterSet.decimalDigits()
     }
@@ -255,7 +255,7 @@ extension Double : _FloatLike {
     static var min: Double { return DBL_MIN }
 }
 
-private func numericValue(_ ch: unichar) -> Int {
+fileprivate func numericValue(_ ch: unichar) -> Int {
     if (ch >= unichar(unicodeScalarLiteral: "0") && ch <= unichar(unicodeScalarLiteral: "9")) {
         return Int(ch) - Int(unichar(unicodeScalarLiteral: "0"))
     } else {
@@ -263,7 +263,7 @@ private func numericValue(_ ch: unichar) -> Int {
     }
 }
 
-private func numericOrHexValue(_ ch: unichar) -> Int {
+fileprivate func numericOrHexValue(_ ch: unichar) -> Int {
     if (ch >= unichar(unicodeScalarLiteral: "0") && ch <= unichar(unicodeScalarLiteral: "9")) {
         return Int(ch) - Int(unichar(unicodeScalarLiteral: "0"))
     } else if (ch >= unichar(unicodeScalarLiteral: "A") && ch <= unichar(unicodeScalarLiteral: "F")) {
@@ -275,7 +275,7 @@ private func numericOrHexValue(_ ch: unichar) -> Int {
     }
 }
 
-private func decimalSep(_ locale: NSLocale?) -> String {
+fileprivate func decimalSep(_ locale: NSLocale?) -> String {
     if let loc = locale {
         if let sep = loc.objectForKey(NSLocaleDecimalSeparator) as? NSString {
             return sep._swiftObject
diff --git a/Foundation/NSSet.swift b/Foundation/NSSet.swift
index d148dde4f9..d73e267164 100644
--- a/Foundation/NSSet.swift
+++ b/Foundation/NSSet.swift
@@ -71,7 +71,7 @@ extension Set : _ObjectTypeBridgeable {
 }
 
 public class NSSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCoding {
-    private let _cfinfo = _CFInfo(typeID: CFSetGetTypeID())
+    fileprivate let _cfinfo = _CFInfo(typeID: CFSetGetTypeID())
     internal var _storage: Set<NSObject>
     
     public var count: Int {
diff --git a/Foundation/NSSpecialValue.swift b/Foundation/NSSpecialValue.swift
index 3c08f63eb0..c74f7a32f1 100644
--- a/Foundation/NSSpecialValue.swift
+++ b/Foundation/NSSpecialValue.swift
@@ -33,7 +33,7 @@ internal class NSSpecialValue : NSValue {
     // Originally these were functions in NSSpecialValueCoding but it's probably
     // more convenient to keep it as a table here as nothing else really needs to
     // know about them
-    private static let _specialTypes : Dictionary<Int, NSSpecialValueCoding.Type> = [
+    fileprivate static let _specialTypes : Dictionary<Int, NSSpecialValueCoding.Type> = [
         1   : NSPoint.self,
         2   : NSSize.self,
         3   : NSRect.self,
@@ -41,11 +41,11 @@ internal class NSSpecialValue : NSValue {
         12  : NSEdgeInsets.self
     ]
     
-    private static func _typeFromFlags(_ flags: Int) -> NSSpecialValueCoding.Type? {
+    fileprivate static func _typeFromFlags(_ flags: Int) -> NSSpecialValueCoding.Type? {
         return _specialTypes[flags]
     }
     
-    private static func _flagsFromType(_ type: NSSpecialValueCoding.Type) -> Int {
+    fileprivate static func _flagsFromType(_ type: NSSpecialValueCoding.Type) -> Int {
         for (F, T) in _specialTypes {
             if T == type {
                 return F
@@ -54,7 +54,7 @@ internal class NSSpecialValue : NSValue {
         return 0
     }
     
-    private static func _objCTypeFromType(_ type: NSSpecialValueCoding.Type) -> String? {
+    fileprivate static func _objCTypeFromType(_ type: NSSpecialValueCoding.Type) -> String? {
         for (_, T) in _specialTypes {
             if T == type {
                 return T.objCType()
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
index 3511b44e30..767da75db4 100644
--- a/Foundation/NSString.swift
+++ b/Foundation/NSString.swift
@@ -206,7 +206,7 @@ internal func isAParagraphSeparatorTypeCharacter(_ ch: unichar) -> Bool {
 }
 
 public class NSString : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCoding {
-    private let _cfinfo = _CFInfo(typeID: CFStringGetTypeID())
+    fileprivate let _cfinfo = _CFInfo(typeID: CFStringGetTypeID())
     internal var _storage: String
     
     public var length: Int {
diff --git a/Foundation/NSSwiftRuntime.swift b/Foundation/NSSwiftRuntime.swift
index b031d9b37d..d9ebd70ab4 100644
--- a/Foundation/NSSwiftRuntime.swift
+++ b/Foundation/NSSwiftRuntime.swift
@@ -46,7 +46,7 @@ public var NSUTF32BigEndianStringEncoding: UInt { return 0x98000100 }
 public var NSUTF32LittleEndianStringEncoding: UInt { return 0x9c000100 }
 
 internal class __NSCFType : NSObject {
-    private var _cfinfo : Int32
+    fileprivate var _cfinfo : Int32
     
     override init() {
         // This is not actually called; _CFRuntimeCreateInstance will initialize _cfinfo
diff --git a/Foundation/NSTask.swift b/Foundation/NSTask.swift
index 004f82736a..9dbd02d69d 100644
--- a/Foundation/NSTask.swift
+++ b/Foundation/NSTask.swift
@@ -20,44 +20,44 @@ public enum NSTaskTerminationReason : Int {
     case UncaughtSignal
 }
 
-private func WEXITSTATUS(_ status: CInt) -> CInt {
+fileprivate func WEXITSTATUS(_ status: CInt) -> CInt {
     return (status >> 8) & 0xff
 }
 
-private var managerThreadSetupOnceToken = pthread_once_t()
+fileprivate var managerThreadSetupOnceToken = pthread_once_t()
 // these are different sadly...
 #if os(OSX) || os(iOS)
-private var threadID: pthread_t? = nil
+fileprivate var threadID: pthread_t? = nil
 #elseif os(Linux)
-private var threadID = pthread_t()
+fileprivate var threadID = pthread_t()
 #endif
 
-private var managerThreadRunLoop : NSRunLoop? = nil
-private var managerThreadRunLoopIsRunning = false
-private var managerThreadRunLoopIsRunningCondition = NSCondition()
+fileprivate var managerThreadRunLoop : NSRunLoop? = nil
+fileprivate var managerThreadRunLoopIsRunning = false
+fileprivate var managerThreadRunLoopIsRunningCondition = NSCondition()
 
 #if os(OSX) || os(iOS)
 internal let kCFSocketDataCallBack = CFSocketCallBackType.dataCallBack.rawValue
 #endif
 
-private func emptyRunLoopCallback(_ context : UnsafeMutablePointer<Void>?) -> Void {}
+fileprivate func emptyRunLoopCallback(_ context : UnsafeMutablePointer<Void>?) -> Void {}
 
 
 // Retain method for run loop source
-private func runLoopSourceRetain(_ pointer : UnsafePointer<Void>?) -> UnsafePointer<Void>? {
+fileprivate func runLoopSourceRetain(_ pointer : UnsafePointer<Void>?) -> UnsafePointer<Void>? {
     let ref = Unmanaged<AnyObject>.fromOpaque(pointer!).takeUnretainedValue()
     let retained = Unmanaged<AnyObject>.passRetained(ref)
     return unsafeBitCast(retained, to: UnsafePointer<Void>.self)
 }
 
 // Release method for run loop source
-private func runLoopSourceRelease(_ pointer : UnsafePointer<Void>?) -> Void {
+fileprivate func runLoopSourceRelease(_ pointer : UnsafePointer<Void>?) -> Void {
     Unmanaged<AnyObject>.fromOpaque(pointer!).release()
 }
 
 // Equal method for run loop source
 
-private func runloopIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?) -> _DarwinCompatibleBoolean {
+fileprivate func runloopIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?) -> _DarwinCompatibleBoolean {
     
     let unmanagedrunLoopA = Unmanaged<AnyObject>.fromOpaque(a!)
     guard let runLoopA = unmanagedrunLoopA.takeUnretainedValue() as? NSRunLoop else {
@@ -76,7 +76,7 @@ private func runloopIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?
     return true
 }
 
-@noreturn private func managerThread(_ x: UnsafeMutablePointer<Void>?) -> UnsafeMutablePointer<Void>? {
+@noreturn fileprivate func managerThread(_ x: UnsafeMutablePointer<Void>?) -> UnsafeMutablePointer<Void>? {
     
     managerThreadRunLoop = NSRunLoop.currentRunLoop()
     var emptySourceContext = CFRunLoopSourceContext (version: 0, info: Unmanaged.passUnretained(managerThreadRunLoop!).toOpaque(),
@@ -98,7 +98,7 @@ private func runloopIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?
     fatalError("NSTask manager run loop exited unexpectedly; it should run forever once initialized")
 }
 
-private func managerThreadSetup() -> Void {
+fileprivate func managerThreadSetup() -> Void {
     pthread_create(&threadID, nil, managerThread, nil)
     
     managerThreadRunLoopIsRunningCondition.lock()
@@ -111,7 +111,7 @@ private func managerThreadSetup() -> Void {
 
 
 // Equal method for task in run loop source
-private func nstaskIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?) -> _DarwinCompatibleBoolean {
+fileprivate func nstaskIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?) -> _DarwinCompatibleBoolean {
     
     let unmanagedTaskA = Unmanaged<AnyObject>.fromOpaque(a!)
     guard let taskA = unmanagedTaskA.takeUnretainedValue() as? NSTask else {
@@ -170,12 +170,12 @@ public class NSTask : NSObject {
         }
     }
     
-    private var runLoopSourceContext : CFRunLoopSourceContext?
-    private var runLoopSource : CFRunLoopSource?
+    fileprivate var runLoopSourceContext : CFRunLoopSourceContext?
+    fileprivate var runLoopSource : CFRunLoopSource?
     
-    private weak var runLoop : NSRunLoop? = nil
+    fileprivate weak var runLoop : NSRunLoop? = nil
     
-    private var processLaunchedCondition = NSCondition()
+    fileprivate var processLaunchedCondition = NSCondition()
     
     // actions
     public func launch() {
@@ -418,7 +418,7 @@ extension NSTask {
 
 public let NSTaskDidTerminateNotification: String = "NSTaskDidTerminateNotification"
 
-private func posix(_ code: Int32) {
+fileprivate func posix(_ code: Int32) {
     switch code {
     case 0: return
     case EBADF: fatalError("POSIX command failed with error: \(code) -- EBADF")
diff --git a/Foundation/NSThread.swift b/Foundation/NSThread.swift
index f519570793..24e70b0bfd 100644
--- a/Foundation/NSThread.swift
+++ b/Foundation/NSThread.swift
@@ -16,17 +16,17 @@ import Glibc
 
 import CoreFoundation
 
-private func disposeTLS(_ ctx: UnsafeMutablePointer<Void>?) -> Void {
+fileprivate func disposeTLS(_ ctx: UnsafeMutablePointer<Void>?) -> Void {
     Unmanaged<AnyObject>.fromOpaque(ctx!).release()
 }
 
 internal class NSThreadSpecific<T: AnyObject> {
 
-    private var NSThreadSpecificKeySet = false
-    private var NSThreadSpecificKeyLock = NSLock()
-    private var NSThreadSpecificKey = pthread_key_t()
+    fileprivate var NSThreadSpecificKeySet = false
+    fileprivate var NSThreadSpecificKeyLock = NSLock()
+    fileprivate var NSThreadSpecificKey = pthread_key_t()
 
-    private var key: pthread_key_t {
+    fileprivate var key: pthread_key_t {
         NSThreadSpecificKeyLock.lock()
         if !NSThreadSpecificKeySet {
             withUnsafeMutablePointer(&NSThreadSpecificKey) { key in
@@ -73,7 +73,7 @@ internal enum _NSThreadStatus {
     case Finished
 }
 
-private func NSThreadStart(_ context: UnsafeMutablePointer<Void>?) -> UnsafeMutablePointer<Void>? {
+fileprivate func NSThreadStart(_ context: UnsafeMutablePointer<Void>?) -> UnsafeMutablePointer<Void>? {
     let unmanaged: Unmanaged<NSThread> = Unmanaged.fromOpaque(context!)
     let thread = unmanaged.takeUnretainedValue()
     NSThread._currentThread.set(thread)
@@ -155,9 +155,9 @@ public class NSThread : NSObject {
     
     internal var _main: (Void) -> Void = {}
 #if os(OSX) || os(iOS)
-    private var _thread: pthread_t? = nil
+    fileprivate var _thread: pthread_t? = nil
 #elseif os(Linux)
-    private var _thread = pthread_t()
+    fileprivate var _thread = pthread_t()
 #endif
     internal var _attr = pthread_attr_t()
     internal var _status = _NSThreadStatus.Initialized
diff --git a/Foundation/NSTimeZone.swift b/Foundation/NSTimeZone.swift
index 9935126570..ef9e9f9fca 100644
--- a/Foundation/NSTimeZone.swift
+++ b/Foundation/NSTimeZone.swift
@@ -12,11 +12,11 @@ import CoreFoundation
 
 public class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
     typealias CFType = CFTimeZone
-    private var _base = _CFInfo(typeID: CFTimeZoneGetTypeID())
-    private var _name: UnsafeMutablePointer<Void>? = nil
-    private var _data: UnsafeMutablePointer<Void>? = nil
-    private var _periods: UnsafeMutablePointer<Void>? = nil
-    private var _periodCnt = Int32(0)
+    fileprivate var _base = _CFInfo(typeID: CFTimeZoneGetTypeID())
+    fileprivate var _name: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _data: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _periods: UnsafeMutablePointer<Void>? = nil
+    fileprivate var _periodCnt = Int32(0)
     
     internal var _cfObject: CFType {
         return unsafeBitCast(self, to: CFType.self)
diff --git a/Foundation/NSURL.swift b/Foundation/NSURL.swift
index df5a4d3093..55ff0dc69e 100644
--- a/Foundation/NSURL.swift
+++ b/Foundation/NSURL.swift
@@ -21,7 +21,7 @@ internal let kCFURLPOSIXPathStyle = CFURLPathStyle.cfurlposixPathStyle
 internal let kCFURLWindowsPathStyle = CFURLPathStyle.cfurlWindowsPathStyle
 #endif
 
-private func _standardizedPath(_ path: String) -> String {
+fileprivate func _standardizedPath(_ path: String) -> String {
     if !path.absolutePath {
         return path._nsObject.stringByStandardizingPath
     }
@@ -607,7 +607,7 @@ public class NSURLQueryItem : NSObject, NSSecureCoding, NSCopying {
 }
 
 public class NSURLComponents : NSObject, NSCopying {
-    private let _components : CFURLComponentsRef!
+    fileprivate let _components : CFURLComponentsRef!
     
     public override func copy() -> AnyObject {
         return copyWithZone(nil)
diff --git a/Foundation/NSURLCredential.swift b/Foundation/NSURLCredential.swift
index 0965f7e030..75a19832fa 100644
--- a/Foundation/NSURLCredential.swift
+++ b/Foundation/NSURLCredential.swift
@@ -31,9 +31,9 @@ public enum NSURLCredentialPersistence : UInt {
     @discussion This class is an immutable object representing an authentication credential.  The actual type of the credential is determined by the constructor called in the categories declared below.
 */
 public class NSURLCredential : NSObject, NSSecureCoding, NSCopying {
-    private var _user : String
-    private var _password : String
-    private var _persistence : NSURLCredentialPersistence
+    fileprivate var _user : String
+    fileprivate var _password : String
+    fileprivate var _persistence : NSURLCredentialPersistence
     
     /*!
         @method initWithUser:password:persistence:
diff --git a/Foundation/NSURLRequest.swift b/Foundation/NSURLRequest.swift
index fd42e863a1..2e7c74a8fe 100644
--- a/Foundation/NSURLRequest.swift
+++ b/Foundation/NSURLRequest.swift
@@ -137,7 +137,7 @@ public class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopyin
         return c
     }
     
-    private func setValues(from source: NSURLRequest) {
+    fileprivate func setValues(from source: NSURLRequest) {
         self.allHTTPHeaderFields = source.allHTTPHeaderFields
         self.url = source.url
         self.mainDocumentURL = source.mainDocumentURL
@@ -162,7 +162,7 @@ public class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopyin
         NSUnimplemented()
     }
     
-    private override init() {}
+    fileprivate override init() {}
     
     /// Indicates that NSURLRequest implements the NSSecureCoding protocol.
     public static func supportsSecureCoding() -> Bool { return true }
@@ -236,7 +236,7 @@ public class NSMutableURLRequest : NSURLRequest {
         super.init()
     }
     
-    private override init() { super.init() }
+    fileprivate override init() { super.init() }
     
     /*@NSCopying */ public override var url: NSURL? {
         get { return super.url }
@@ -305,7 +305,7 @@ public class NSMutableURLRequest : NSURLRequest {
 }
 
 /// Returns an existing key-value pair inside the header fields if it exists.
-private func existingHeaderField(_ key: String, inHeaderFields fields: [String: String]) -> (String, String)? {
+fileprivate func existingHeaderField(_ key: String, inHeaderFields fields: [String: String]) -> (String, String)? {
     for (k, v) in fields {
         if k.lowercased() == key.lowercased() {
             return (k, v)
diff --git a/Foundation/NSURLResponse.swift b/Foundation/NSURLResponse.swift
index e1a7bd1859..19fa24b523 100644
--- a/Foundation/NSURLResponse.swift
+++ b/Foundation/NSURLResponse.swift
@@ -237,7 +237,7 @@ public class NSHTTPURLResponse : NSURLResponse {
 /// The transfer length can only be derived when the Transfer-Encoding is identity (default).
 /// For compressed content (Content-Encoding other than identity), there is not way to derive the
 /// content length from the transfer length.
-private func getExpectedContentLength(fromHeaderFields headerFields: [String : String]?) -> Int64? {
+fileprivate func getExpectedContentLength(fromHeaderFields headerFields: [String : String]?) -> Int64? {
     guard
         let f = headerFields,
         let contentLengthS = valueForCaseInsensitiveKey("content-length", fields: f),
@@ -248,7 +248,7 @@ private func getExpectedContentLength(fromHeaderFields headerFields: [String : S
 /// Parses the suggested filename from the `Content-Disposition` header.
 ///
 /// - SeeAlso: [RFC 2183](https://tools.ietf.org/html/rfc2183)
-private func getSuggestedFilename(fromHeaderFields headerFields: [String : String]?) -> String? {
+fileprivate func getSuggestedFilename(fromHeaderFields headerFields: [String : String]?) -> String? {
     // Typical use looks like this:
     //     Content-Disposition: attachment; filename="fname.ext"
     guard
@@ -262,7 +262,7 @@ private func getSuggestedFilename(fromHeaderFields headerFields: [String : Strin
     return nil
 }
 /// Parts corresponding to the `Content-Type` header field in a HTTP message.
-private struct ContentTypeComponents {
+fileprivate struct ContentTypeComponents {
     /// For `text/html; charset=ISO-8859-4` this would be `text/html`
     let mimeType: String
     /// For `text/html; charset=ISO-8859-4` this would be `ISO-8859-4`. Will be
@@ -304,7 +304,7 @@ extension ContentTypeComponents {
 /// attribute               = token
 /// value                   = token | quoted-string
 /// ```
-private struct ValueWithParameters {
+fileprivate struct ValueWithParameters {
     let value: String
     let parameters: [Parameter]
     struct Parameter {
@@ -313,7 +313,7 @@ private struct ValueWithParameters {
     }
 }
 
-private extension String {
+fileprivate extension String {
     /// Split the string at each ";", remove any quoting.
     /// 
     /// The trouble is if there's a
@@ -384,7 +384,7 @@ private extension String {
         return ValueWithParameters(value: t, parameters: parameters)
     }
 }
-private func valueForCaseInsensitiveKey(_ key: String, fields: [String: String]) -> String? {
+fileprivate func valueForCaseInsensitiveKey(_ key: String, fields: [String: String]) -> String? {
     let kk = key.lowercased()
     for (k, v) in fields {
         if k.lowercased() == kk {
diff --git a/Foundation/NSUserDefaults.swift b/Foundation/NSUserDefaults.swift
index 3067e81728..6262761e11 100644
--- a/Foundation/NSUserDefaults.swift
+++ b/Foundation/NSUserDefaults.swift
@@ -13,11 +13,11 @@ public let NSGlobalDomain: String = "NSGlobalDomain"
 public let NSArgumentDomain: String = "NSArgumentDomain"
 public let NSRegistrationDomain: String = "NSRegistrationDomain"
 
-private var registeredDefaults = [String: AnyObject]()
-private var sharedDefaults = NSUserDefaults()
+fileprivate var registeredDefaults = [String: AnyObject]()
+fileprivate var sharedDefaults = NSUserDefaults()
 
 public class NSUserDefaults : NSObject {
-    private let suite: String?
+    fileprivate let suite: String?
     
     public class func standardUserDefaults() -> NSUserDefaults {
         return sharedDefaults
diff --git a/Foundation/NSValue.swift b/Foundation/NSValue.swift
index 706e6c802d..361ed3fab7 100644
--- a/Foundation/NSValue.swift
+++ b/Foundation/NSValue.swift
@@ -9,8 +9,8 @@
 
 public class NSValue : NSObject, NSCopying, NSSecureCoding, NSCoding {
 
-    private static var SideTable = [ObjectIdentifier : NSValue]()
-    private static var SideTableLock = NSLock()
+    fileprivate static var SideTable = [ObjectIdentifier : NSValue]()
+    fileprivate static var SideTableLock = NSLock()
 
     internal override init() {
         super.init()
@@ -92,7 +92,7 @@ public class NSValue : NSObject, NSCopying, NSSecureCoding, NSCoding {
         }
     }
     
-    private static func _isSpecialObjCType(_ type: UnsafePointer<Int8>) -> Bool {
+    fileprivate static func _isSpecialObjCType(_ type: UnsafePointer<Int8>) -> Bool {
         return NSSpecialValue._typeFromObjCType(type) != nil
     }
     
diff --git a/Foundation/NSXMLDocument.swift b/Foundation/NSXMLDocument.swift
index c58b9dd430..2c40e449cb 100644
--- a/Foundation/NSXMLDocument.swift
+++ b/Foundation/NSXMLDocument.swift
@@ -53,7 +53,7 @@ public enum NSXMLDocumentContentKind : UInt {
 	@discussion Note: if the application of a method would result in more than one element in the children array, an exception is thrown. Trying to add a document, namespace, attribute, or node with a parent also throws an exception. To add a node with a parent first detach or create a copy of it.
 */
 public class NSXMLDocument : NSXMLNode {
-    private var _xmlDoc: _CFXMLDocPtr {
+    fileprivate var _xmlDoc: _CFXMLDocPtr {
         return _CFXMLDocPtr(_xmlNode)
     }
     /*!
diff --git a/Foundation/NSXMLElement.swift b/Foundation/NSXMLElement.swift
index 17e062b2ae..a945efda69 100644
--- a/Foundation/NSXMLElement.swift
+++ b/Foundation/NSXMLElement.swift
@@ -119,7 +119,7 @@ public class NSXMLElement : NSXMLNode {
         }
     }
 
-    private func removeAttributes() {
+    fileprivate func removeAttributes() {
         var nextAttribute = _CFXMLNodeProperties(_xmlNode)
         while let attribute = nextAttribute {
             var shouldFreeNode = true
diff --git a/Foundation/NSXMLNode.swift b/Foundation/NSXMLNode.swift
index d75017b941..1728d6a35b 100644
--- a/Foundation/NSXMLNode.swift
+++ b/Foundation/NSXMLNode.swift
@@ -273,7 +273,7 @@ public class NSXMLNode : NSObject, NSCopying {
         }
     }
 
-    private var _objectValue: AnyObject? = nil
+    fileprivate var _objectValue: AnyObject? = nil
 
     /*!
         @method objectValue
@@ -325,7 +325,7 @@ public class NSXMLNode : NSObject, NSCopying {
         }
     }
 
-    private func _removeAllChildNodesExceptAttributes() {
+    fileprivate func _removeAllChildNodesExceptAttributes() {
         for node in _childNodes {
             if node.kind != NSXMLNodeKind.AttributeKind {
                 _CFXMLUnlinkNode(node._xmlNode)
@@ -791,7 +791,7 @@ public class NSXMLNode : NSObject, NSCopying {
             return NSXMLDTDNode._objectNodeForNode(node)
 
         default:
-            if let _private = _CFXMLNodeGetPrivateData(node) {
+            if let _fileprivate = _CFXMLNodeGetPrivateData(node) {
                 let unmanaged = Unmanaged<NSXMLNode>.fromOpaque(_private)
                 return unmanaged.takeUnretainedValue()
             }
@@ -882,8 +882,8 @@ internal protocol _NSXMLNodeCollectionType: Collection { }
 extension NSXMLNode: _NSXMLNodeCollectionType {
 
     public struct Index: Comparable {
-        private let node: _CFXMLNodePtr?
-        private let offset: Int?
+        fileprivate let node: _CFXMLNodePtr?
+        fileprivate let offset: Int?
     }
 
     public subscript(index: Index) -> NSXMLNode {
diff --git a/Foundation/NSXMLParser.swift b/Foundation/NSXMLParser.swift
index da13e1fcac..12f06a4b96 100644
--- a/Foundation/NSXMLParser.swift
+++ b/Foundation/NSXMLParser.swift
@@ -40,7 +40,7 @@ extension NSXMLParser {
     }
 }
 
-private func UTF8STRING(_ bytes: UnsafePointer<UInt8>) -> String? {
+fileprivate func UTF8STRING(_ bytes: UnsafePointer<UInt8>) -> String? {
     let len = strlen(UnsafePointer<Int8>(bytes))
     let str = String._fromCodeUnitSequence(UTF8.self, input: UnsafeBufferPointer(start: bytes, count: Int(len)))
     return str
@@ -392,13 +392,13 @@ internal func _structuredErrorFunc(_ interface: _CFXMLInterface, error: _CFXMLIn
 }
 
 public class NSXMLParser : NSObject {
-    private var _handler: _CFXMLInterfaceSAXHandler
+    fileprivate var _handler: _CFXMLInterfaceSAXHandler
     internal var _stream: NSInputStream?
     internal var _data: NSData?
     internal var _chunkSize = Int(4096 * 32) // a suitably large number for a decent chunk size
     internal var _haveDetectedEncoding = false
     internal var _bomChunk: NSData?
-    private var _parserContext: _CFXMLInterfaceParserContext?
+    fileprivate var _parserContext: _CFXMLInterfaceParserContext?
     internal var _delegateAborted = false
     internal var _url: NSURL?
     internal var _namespaces = [[String:String]]()
diff --git a/TestFoundation/TestNSAffineTransform.swift b/TestFoundation/TestNSAffineTransform.swift
index eaa9403a9e..a111f45041 100644
--- a/TestFoundation/TestNSAffineTransform.swift
+++ b/TestFoundation/TestNSAffineTransform.swift
@@ -19,7 +19,7 @@
 
 
 class TestNSAffineTransform : XCTestCase {
-    private let accuracyThreshold = 0.001
+    fileprivate let accuracyThreshold = 0.001
 
     static var allTests: [(String, (TestNSAffineTransform) -> () throws -> Void)] {
         return [
diff --git a/TestFoundation/TestNSBundle.swift b/TestFoundation/TestNSBundle.swift
index 4af578048a..72554feb97 100644
--- a/TestFoundation/TestNSBundle.swift
+++ b/TestFoundation/TestNSBundle.swift
@@ -96,13 +96,13 @@ class TestNSBundle : XCTestCase {
         XCTAssertEqual(["en"], NSBundle.preferredLocalizations(from: ["en", "pl", "es"]))
     }
     
-    private let _bundleName = "MyBundle.bundle"
-    private let _bundleResourceNames = ["hello.world", "goodbye.world", "swift.org"]
-    private let _subDirectory = "Sources"
-    private let _main = "main"
-    private let _type = "swift"
+    fileprivate let _bundleName = "MyBundle.bundle"
+    fileprivate let _bundleResourceNames = ["hello.world", "goodbye.world", "swift.org"]
+    fileprivate let _subDirectory = "Sources"
+    fileprivate let _main = "main"
+    fileprivate let _type = "swift"
     
-    private func _setupPlayground() -> String? {
+    fileprivate func _setupPlayground() -> String? {
         // Make sure the directory is uniquely named
         let tempDir = "/tmp/TestFoundation_Playground_" + NSUUID().UUIDString + "/"
         
@@ -129,7 +129,7 @@ class TestNSBundle : XCTestCase {
         return tempDir
     }
     
-    private func _cleanupPlayground(_ location: String) {
+    fileprivate func _cleanupPlayground(_ location: String) {
         do {
             try NSFileManager.defaultManager().removeItem(atPath: location)
         } catch _ {
diff --git a/TestFoundation/TestNSCompoundPredicate.swift b/TestFoundation/TestNSCompoundPredicate.swift
index ca3702190e..2a079e58a9 100644
--- a/TestFoundation/TestNSCompoundPredicate.swift
+++ b/TestFoundation/TestNSCompoundPredicate.swift
@@ -31,7 +31,7 @@ class TestNSCompoundPredicate: XCTestCase {
         ]
     }
 
-    private func eval(_ predicate: NSPredicate, object: NSObject = NSObject()) -> Bool {
+    fileprivate func eval(_ predicate: NSPredicate, object: NSObject = NSObject()) -> Bool {
         return predicate.evaluateWithObject(object, substitutionVariables: nil)
     }
 
diff --git a/TestFoundation/TestNSKeyedArchiver.swift b/TestFoundation/TestNSKeyedArchiver.swift
index cdfc145781..ec5c11f672 100644
--- a/TestFoundation/TestNSKeyedArchiver.swift
+++ b/TestFoundation/TestNSKeyedArchiver.swift
@@ -73,7 +73,7 @@ class TestNSKeyedArchiver : XCTestCase {
         ]
     }
 
-    private func test_archive(_ encode: (NSKeyedArchiver) -> Bool,
+    fileprivate func test_archive(_ encode: (NSKeyedArchiver) -> Bool,
                               decode: (NSKeyedUnarchiver) -> Bool) {
         let data = NSMutableData()
         let archiver = NSKeyedArchiver(forWritingWithMutableData: data)
@@ -85,7 +85,7 @@ class TestNSKeyedArchiver : XCTestCase {
         XCTAssertTrue(decode(unarchiver))
     }
     
-    private func test_archive(_ object: NSObject, classes: [AnyClass], allowsSecureCoding: Bool = true, outputFormat: NSPropertyListFormat) {
+    fileprivate func test_archive(_ object: NSObject, classes: [AnyClass], allowsSecureCoding: Bool = true, outputFormat: NSPropertyListFormat) {
         test_archive({ archiver -> Bool in
                 archiver.requiresSecureCoding = allowsSecureCoding
                 archiver.outputFormat = outputFormat
@@ -110,13 +110,13 @@ class TestNSKeyedArchiver : XCTestCase {
         })
     }
     
-    private func test_archive(_ object: NSObject, classes: [AnyClass], allowsSecureCoding: Bool = true) {
+    fileprivate func test_archive(_ object: NSObject, classes: [AnyClass], allowsSecureCoding: Bool = true) {
         // test both XML and binary encodings
         test_archive(object, classes: classes, allowsSecureCoding: allowsSecureCoding, outputFormat: NSPropertyListFormat.XMLFormat_v1_0)
         test_archive(object, classes: classes, allowsSecureCoding: allowsSecureCoding, outputFormat: NSPropertyListFormat.BinaryFormat_v1_0)
     }
     
-    private func test_archive(_ object: NSObject, allowsSecureCoding: Bool = true) {
+    fileprivate func test_archive(_ object: NSObject, allowsSecureCoding: Bool = true) {
         return test_archive(object, classes: [object.dynamicType], allowsSecureCoding: allowsSecureCoding)
     }
     
diff --git a/TestFoundation/TestNSKeyedUnarchiver.swift b/TestFoundation/TestNSKeyedUnarchiver.swift
index 87aa5f9832..4f3458f4b4 100644
--- a/TestFoundation/TestNSKeyedUnarchiver.swift
+++ b/TestFoundation/TestNSKeyedUnarchiver.swift
@@ -33,7 +33,7 @@ class TestNSKeyedUnarchiver : XCTestCase {
         ]
     }
     
-    private func test_unarchive_from_file(_ filename : String, _ expectedObject : NSObject) {
+    fileprivate func test_unarchive_from_file(_ filename : String, _ expectedObject : NSObject) {
         guard let testFilePath = testBundle().pathForResource(filename, ofType: "plist") else {
             XCTFail("Could not find \(filename)")
             return
diff --git a/TestFoundation/TestNSNotificationQueue.swift b/TestFoundation/TestNSNotificationQueue.swift
index dc6c10a1a0..712d33ab3b 100644
--- a/TestFoundation/TestNSNotificationQueue.swift
+++ b/TestFoundation/TestNSNotificationQueue.swift
@@ -212,7 +212,7 @@ class TestNSNotificationQueue : XCTestCase {
 
     // MARK: Private
 
-    private func scheduleTimer(withInterval interval: NSTimeInterval) {
+    fileprivate func scheduleTimer(withInterval interval: NSTimeInterval) {
         let e = expectation(withDescription: "Timer")
         let dummyTimer = NSTimer.scheduledTimer(interval, repeats: false) { _ in
             e.fulfill()
@@ -221,7 +221,7 @@ class TestNSNotificationQueue : XCTestCase {
         waitForExpectations(withTimeout: 0.1)
     }
 
-    private func executeInBackgroundThread(_ operation: () -> Void) {
+    fileprivate func executeInBackgroundThread(_ operation: () -> Void) {
         let e = expectation(withDescription: "Background Execution")
         let bgThread = NSThread() {
             operation()
diff --git a/TestFoundation/TestNSString.swift b/TestFoundation/TestNSString.swift
index ebe1e8fd89..812514b9d8 100644
--- a/TestFoundation/TestNSString.swift
+++ b/TestFoundation/TestNSString.swift
@@ -583,7 +583,7 @@ class TestNSString : XCTestCase {
         #endif
     }
     
-    private func startWith(_ prefix: String, strings: [NSString]) -> Bool {
+    fileprivate func startWith(_ prefix: String, strings: [NSString]) -> Bool {
         for item in strings {
             guard item.hasPrefix(prefix) else {
                 return false
@@ -593,7 +593,7 @@ class TestNSString : XCTestCase {
         return true
     }
     
-    private func stringsAreCaseInsensitivelyEqual(_ lhs: NSString, _ rhs: NSString) -> Bool {
+    fileprivate func stringsAreCaseInsensitivelyEqual(_ lhs: NSString, _ rhs: NSString) -> Bool {
     	return lhs.compare(rhs.bridge(), options: .caseInsensitiveSearch) == .orderedSame
     }
 
diff --git a/TestFoundation/TestNSTask.swift b/TestFoundation/TestNSTask.swift
index f829572748..3ed8ca3ce5 100644
--- a/TestFoundation/TestNSTask.swift
+++ b/TestFoundation/TestNSTask.swift
@@ -244,7 +244,7 @@ class TestNSTask : XCTestCase {
     }
 }
 
-private func mkstemp(template: String, body: @noescape (NSFileHandle) throws -> Void) rethrows {
+fileprivate func mkstemp(template: String, body: @noescape (NSFileHandle) throws -> Void) rethrows {
     let url = NSURL(fileURLWithPath: NSTemporaryDirectory()).URLByAppendingPathComponent("TestNSTask.XXXXXX")!
     var buffer = [Int8](repeating: 0, count: Int(PATH_MAX))
     url.getFileSystemRepresentation(&buffer, maxLength: buffer.count)
@@ -256,13 +256,13 @@ private func mkstemp(template: String, body: @noescape (NSFileHandle) throws ->
     }
 }
 
-private enum Error: ErrorProtocol {
+fileprivate enum Error: ErrorProtocol {
     case TerminationStatus(Int32)
     case UnicodeDecodingError(NSData)
     case InvalidEnvironmentVariable(String)
 }
 
-private func runTask(_ arguments: [String], environment: [String: String]? = nil) throws -> String {
+fileprivate func runTask(_ arguments: [String], environment: [String: String]? = nil) throws -> String {
     let task = NSTask()
 
     var arguments = arguments
@@ -288,7 +288,7 @@ private func runTask(_ arguments: [String], environment: [String: String]? = nil
     return output
 }
 
-private func parseEnv(_ env: String) throws -> [String: String] {
+fileprivate func parseEnv(_ env: String) throws -> [String: String] {
     var result = [String: String]()
     for line in env.components(separatedBy: "\n") where line != "" {
         guard let range = line.range(of: "=") else {
diff --git a/TestFoundation/TestNSURL.swift b/TestFoundation/TestNSURL.swift
index 2772fcf775..0fa0eea3c5 100644
--- a/TestFoundation/TestNSURL.swift
+++ b/TestFoundation/TestNSURL.swift
@@ -38,7 +38,7 @@ let kNullURLString = "<null url>"
 let kNullString = "<null>"
 
 /// Reads the test data plist file and returns the list of objects
-private func getTestData() -> [Any]? {
+fileprivate func getTestData() -> [Any]? {
     let testFilePath = testBundle().pathForResource("NSURLTestData", ofType: "plist")
     let data = NSData(contentsOfFile: testFilePath!)
     guard let testRoot = try? NSPropertyListSerialization.propertyListWithData(data!, options: [], format: nil) as? [String : Any] else {
@@ -92,7 +92,7 @@ class TestNSURL : XCTestCase {
     }
     
     /// Returns a URL from the given url string and base
-    private func URLWithString(_ urlString : String, baseString : String?) -> NSURL? {
+    fileprivate func URLWithString(_ urlString : String, baseString : String?) -> NSURL? {
         if let baseString = baseString {
             let baseURL = NSURL(string: baseString)
             return NSURL(string: urlString, relativeToURL: baseURL)