diff --git a/Package.swift b/Package.swift
new file mode 100644
index 000000000..63eb6a4ae
--- /dev/null
+++ b/Package.swift
@@ -0,0 +1,71 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "ZXingObjC",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "ZXingObjC",
+            targets: ["ZXingObjC"]
+        ),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "ZXingObjC",
+            dependencies: [],
+            path: "ZXingObjC",
+            publicHeadersPath: "include",
+            cxxSettings: [
+                .headerSearchPath("aztec"),
+                .headerSearchPath("aztec/decoder"),
+                .headerSearchPath("aztec/detector"),
+                .headerSearchPath("aztec/encoder"),
+                
+                .headerSearchPath("client"),
+                .headerSearchPath("client/result"),
+                
+                .headerSearchPath("common"),
+                .headerSearchPath("common/detector"),
+                .headerSearchPath("common/reedsolomon"),
+                
+                .headerSearchPath("core"),
+                
+                .headerSearchPath("datamatrix"),
+                .headerSearchPath("datamatrix/decoder"),
+                .headerSearchPath("datamatrix/detector"),
+                .headerSearchPath("datamatrix/encoder"),
+                
+                .headerSearchPath("maxicode"),
+                .headerSearchPath("maxicode/decoder"),
+                
+                .headerSearchPath("multi"),
+                
+                .headerSearchPath("oned"),
+                .headerSearchPath("oned/rss"),
+                .headerSearchPath("oned/rss/expanded"),
+                .headerSearchPath("oned/rss/expanded/decoders"),
+                
+                .headerSearchPath("pdf417"),
+                .headerSearchPath("pdf417/decoder"),
+                .headerSearchPath("pdf417/decoder/ec"),
+                .headerSearchPath("pdf417/detector"),
+                .headerSearchPath("pdf417/encoder"),
+                
+                .headerSearchPath("qrcode"),
+                .headerSearchPath("qrcode/decoder"),
+                .headerSearchPath("qrcode/detector"),
+                .headerSearchPath("qrcode/encoder"),
+                .headerSearchPath("qrcode/multi"),
+                .headerSearchPath("qrcode/multi/detector"),
+            ]
+        )
+    ]
+)
diff --git a/ZXingObjC/aztec/detector/ZXAztecDetector.h b/ZXingObjC/aztec/detector/ZXAztecDetector.h
index 3043fb37a..90134f5a1 100644
--- a/ZXingObjC/aztec/detector/ZXAztecDetector.h
+++ b/ZXingObjC/aztec/detector/ZXAztecDetector.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXAztecPoint : NSObject
 
 @property (nonatomic, assign, readonly) int x;
diff --git a/ZXingObjC/aztec/encoder/ZXAztecCode.h b/ZXingObjC/aztec/encoder/ZXAztecCode.h
index cf3169346..ca7363c7d 100644
--- a/ZXingObjC/aztec/encoder/ZXAztecCode.h
+++ b/ZXingObjC/aztec/encoder/ZXAztecCode.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitMatrix;
 
 /**
diff --git a/ZXingObjC/aztec/encoder/ZXAztecHighLevelEncoder.h b/ZXingObjC/aztec/encoder/ZXAztecHighLevelEncoder.h
index a1631dc7c..57d040da3 100644
--- a/ZXingObjC/aztec/encoder/ZXAztecHighLevelEncoder.h
+++ b/ZXingObjC/aztec/encoder/ZXAztecHighLevelEncoder.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 extern NSArray *ZX_AZTEC_MODE_NAMES;
 
 extern const int ZX_AZTEC_MODE_UPPER;
diff --git a/ZXingObjC/aztec/encoder/ZXAztecToken.h b/ZXingObjC/aztec/encoder/ZXAztecToken.h
index a95ff3209..f666f4410 100644
--- a/ZXingObjC/aztec/encoder/ZXAztecToken.h
+++ b/ZXingObjC/aztec/encoder/ZXAztecToken.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitArray, ZXByteArray;
 
 @interface ZXAztecToken : NSObject
diff --git a/ZXingObjC/client/ZXCGImageLuminanceSourceInfo.h b/ZXingObjC/client/ZXCGImageLuminanceSourceInfo.h
index b949cc481..5fa4a533e 100644
--- a/ZXingObjC/client/ZXCGImageLuminanceSourceInfo.h
+++ b/ZXingObjC/client/ZXCGImageLuminanceSourceInfo.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 typedef enum {
   ZXCGImageLuminanceSourceNormal = 0,
   ZXCGImageLuminanceSourceLuma,
diff --git a/ZXingObjC/client/result/ZXResultParser.h b/ZXingObjC/client/result/ZXResultParser.h
index a4eaabbbc..8db25c13a 100644
--- a/ZXingObjC/client/result/ZXResultParser.h
+++ b/ZXingObjC/client/result/ZXResultParser.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXParsedResult, ZXResult;
 
 /**
diff --git a/ZXingObjC/common/ZXBitArray.h b/ZXingObjC/common/ZXBitArray.h
index 521f0cbb8..2a01fd2c0 100644
--- a/ZXingObjC/common/ZXBitArray.h
+++ b/ZXingObjC/common/ZXBitArray.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXByteArray, ZXIntArray;
 
 /**
diff --git a/ZXingObjC/common/ZXBitMatrix.h b/ZXingObjC/common/ZXBitMatrix.h
index be65fcf8d..2335ccd21 100644
--- a/ZXingObjC/common/ZXBitMatrix.h
+++ b/ZXingObjC/common/ZXBitMatrix.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitArray, ZXIntArray;
 
 /**
diff --git a/ZXingObjC/common/ZXBitSource.h b/ZXingObjC/common/ZXBitSource.h
index 4ac7f816b..ae31e10e6 100644
--- a/ZXingObjC/common/ZXBitSource.h
+++ b/ZXingObjC/common/ZXBitSource.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXByteArray;
 
 /**
diff --git a/ZXingObjC/common/ZXBoolArray.h b/ZXingObjC/common/ZXBoolArray.h
index 6e80b6ca3..d25a1b59a 100644
--- a/ZXingObjC/common/ZXBoolArray.h
+++ b/ZXingObjC/common/ZXBoolArray.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXBoolArray : NSObject
 
 @property (nonatomic, assign, readonly) BOOL *array;
diff --git a/ZXingObjC/common/ZXByteArray.h b/ZXingObjC/common/ZXByteArray.h
index 931583f61..2f12b8363 100644
--- a/ZXingObjC/common/ZXByteArray.h
+++ b/ZXingObjC/common/ZXByteArray.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXByteArray : NSObject
 
 @property (nonatomic, assign, readonly) int8_t *array;
diff --git a/ZXingObjC/common/ZXCharacterSetECI.h b/ZXingObjC/common/ZXCharacterSetECI.h
index 00326753d..49ec26f5c 100644
--- a/ZXingObjC/common/ZXCharacterSetECI.h
+++ b/ZXingObjC/common/ZXCharacterSetECI.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Encapsulates a Character Set ECI, according to "Extended Channel Interpretations" 5.3.1.1
  * of ISO 18004.
diff --git a/ZXingObjC/common/ZXDecimal.h b/ZXingObjC/common/ZXDecimal.h
index 4262e8045..ce483c4e4 100644
--- a/ZXingObjC/common/ZXDecimal.h
+++ b/ZXingObjC/common/ZXDecimal.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Drop-in replacement for `NSDecimalNumber`.
  * @see ZXPDF417DecodedBitStreamParser.m#L696
diff --git a/ZXingObjC/common/ZXIntArray.h b/ZXingObjC/common/ZXIntArray.h
index 0b45e6217..f0dbf1028 100644
--- a/ZXingObjC/common/ZXIntArray.h
+++ b/ZXingObjC/common/ZXIntArray.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXIntArray : NSObject <NSCopying>
 
 @property (nonatomic, assign, readonly) int32_t *array;
diff --git a/ZXingObjC/common/ZXPerspectiveTransform.h b/ZXingObjC/common/ZXPerspectiveTransform.h
index ab8cceb19..c2b0cf318 100644
--- a/ZXingObjC/common/ZXPerspectiveTransform.h
+++ b/ZXingObjC/common/ZXPerspectiveTransform.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * This class implements a perspective transform in two dimensions. Given four source and four
  * destination points, it will compute the transformation implied between them. The code is based
diff --git a/ZXingObjC/common/detector/ZXMathUtils.h b/ZXingObjC/common/detector/ZXMathUtils.h
index 10446b0b0..350733ecc 100644
--- a/ZXingObjC/common/detector/ZXMathUtils.h
+++ b/ZXingObjC/common/detector/ZXMathUtils.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXMathUtils : NSObject
 
 /**
diff --git a/ZXingObjC/common/reedsolomon/ZXGenericGF.h b/ZXingObjC/common/reedsolomon/ZXGenericGF.h
index f5d0b6292..09c21aa31 100644
--- a/ZXingObjC/common/reedsolomon/ZXGenericGF.h
+++ b/ZXingObjC/common/reedsolomon/ZXGenericGF.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXGenericGFPoly;
 
 /**
diff --git a/ZXingObjC/core/ZXBinaryBitmap.h b/ZXingObjC/core/ZXBinaryBitmap.h
index 7f2abc39e..4e64e83d2 100644
--- a/ZXingObjC/core/ZXBinaryBitmap.h
+++ b/ZXingObjC/core/ZXBinaryBitmap.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBinarizer, ZXBitArray, ZXBitMatrix;
 
 /**
diff --git a/ZXingObjC/core/ZXByteMatrix.h b/ZXingObjC/core/ZXByteMatrix.h
index 84b820daf..e8f620c07 100644
--- a/ZXingObjC/core/ZXByteMatrix.h
+++ b/ZXingObjC/core/ZXByteMatrix.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXByteMatrix : NSObject
 
 @property (nonatomic, assign, readonly) int8_t **array;
diff --git a/ZXingObjC/core/ZXDecodeHints.h b/ZXingObjC/core/ZXDecodeHints.h
index db2703d34..c6ab66c40 100644
--- a/ZXingObjC/core/ZXDecodeHints.h
+++ b/ZXingObjC/core/ZXDecodeHints.h
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
 #import "ZXBarcodeFormat.h"
 
 @protocol ZXResultPointCallback;
diff --git a/ZXingObjC/core/ZXDimension.h b/ZXingObjC/core/ZXDimension.h
index 809584707..aadc4f66c 100644
--- a/ZXingObjC/core/ZXDimension.h
+++ b/ZXingObjC/core/ZXDimension.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Simply encapsulates a width and height.
  */
diff --git a/ZXingObjC/core/ZXEncodeHints.h b/ZXingObjC/core/ZXEncodeHints.h
index 360f557e2..64468a7b5 100644
--- a/ZXingObjC/core/ZXEncodeHints.h
+++ b/ZXingObjC/core/ZXEncodeHints.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Enumeration for DataMatrix symbol shape hint. It can be used to force square or rectangular
  * symbols.
diff --git a/ZXingObjC/core/ZXErrors.h b/ZXingObjC/core/ZXErrors.h
index 20e6e882f..46efdd375 100644
--- a/ZXingObjC/core/ZXErrors.h
+++ b/ZXingObjC/core/ZXErrors.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 #define ZXErrorDomain @"ZXErrorDomain"
 
 enum {
diff --git a/ZXingObjC/core/ZXResultPoint.h b/ZXingObjC/core/ZXResultPoint.h
index 957b9fd05..754a8810b 100644
--- a/ZXingObjC/core/ZXResultPoint.h
+++ b/ZXingObjC/core/ZXResultPoint.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Encapsulates a point of interest in an image containing a barcode. Typically, this
  * would be the location of a finder pattern or the corner of the barcode, for example.
diff --git a/ZXingObjC/datamatrix/decoder/ZXDataMatrixVersion.h b/ZXingObjC/datamatrix/decoder/ZXDataMatrixVersion.h
index 82e01a9b3..49fd53e34 100644
--- a/ZXingObjC/datamatrix/decoder/ZXDataMatrixVersion.h
+++ b/ZXingObjC/datamatrix/decoder/ZXDataMatrixVersion.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Encapsulates a set of error-correction blocks in one symbol version. Most versions will
  * use blocks of differing sizes within one version, so, this encapsulates the parameters for
diff --git a/ZXingObjC/datamatrix/detector/ZXDataMatrixDetector.h b/ZXingObjC/datamatrix/detector/ZXDataMatrixDetector.h
index babf9e104..9eb2d7a23 100644
--- a/ZXingObjC/datamatrix/detector/ZXDataMatrixDetector.h
+++ b/ZXingObjC/datamatrix/detector/ZXDataMatrixDetector.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitMatrix, ZXDetectorResult, ZXWhiteRectangleDetector;
 
 /**
diff --git a/ZXingObjC/datamatrix/encoder/ZXDataMatrixDefaultPlacement.h b/ZXingObjC/datamatrix/encoder/ZXDataMatrixDefaultPlacement.h
index a7e0fc7ff..afde208a4 100644
--- a/ZXingObjC/datamatrix/encoder/ZXDataMatrixDefaultPlacement.h
+++ b/ZXingObjC/datamatrix/encoder/ZXDataMatrixDefaultPlacement.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Symbol Character Placement Program. Adapted from Annex M.1 in ISO/IEC 16022:2000(E).
  */
diff --git a/ZXingObjC/datamatrix/encoder/ZXDataMatrixEncoder.h b/ZXingObjC/datamatrix/encoder/ZXDataMatrixEncoder.h
index 4d3c63d3f..804d9b5ab 100644
--- a/ZXingObjC/datamatrix/encoder/ZXDataMatrixEncoder.h
+++ b/ZXingObjC/datamatrix/encoder/ZXDataMatrixEncoder.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXDataMatrixEncoderContext;
 
 @protocol ZXDataMatrixEncoder <NSObject>
diff --git a/ZXingObjC/datamatrix/encoder/ZXDataMatrixErrorCorrection.h b/ZXingObjC/datamatrix/encoder/ZXDataMatrixErrorCorrection.h
index d93d3fd60..6eaa7e274 100644
--- a/ZXingObjC/datamatrix/encoder/ZXDataMatrixErrorCorrection.h
+++ b/ZXingObjC/datamatrix/encoder/ZXDataMatrixErrorCorrection.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXDataMatrixSymbolInfo;
 
 /**
diff --git a/ZXingObjC/include/ZXingObjC/ZXAbstractDoCoMoResultParser.h b/ZXingObjC/include/ZXingObjC/ZXAbstractDoCoMoResultParser.h
new file mode 120000
index 000000000..a3a296505
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAbstractDoCoMoResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXAbstractDoCoMoResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAbstractExpandedDecoder.h b/ZXingObjC/include/ZXingObjC/ZXAbstractExpandedDecoder.h
new file mode 120000
index 000000000..d1164514d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAbstractExpandedDecoder.h
@@ -0,0 +1 @@
+../../oned/rss/expanded/decoders/ZXAbstractExpandedDecoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAbstractRSSReader.h b/ZXingObjC/include/ZXingObjC/ZXAbstractRSSReader.h
new file mode 120000
index 000000000..b35511afd
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAbstractRSSReader.h
@@ -0,0 +1 @@
+../../oned/rss/ZXAbstractRSSReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAddressBookAUResultParser.h b/ZXingObjC/include/ZXingObjC/ZXAddressBookAUResultParser.h
new file mode 120000
index 000000000..57f579dad
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAddressBookAUResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXAddressBookAUResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAddressBookDoCoMoResultParser.h b/ZXingObjC/include/ZXingObjC/ZXAddressBookDoCoMoResultParser.h
new file mode 120000
index 000000000..839a9b27b
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAddressBookDoCoMoResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXAddressBookDoCoMoResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAddressBookParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXAddressBookParsedResult.h
new file mode 120000
index 000000000..9d636f4d3
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAddressBookParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXAddressBookParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecCode.h b/ZXingObjC/include/ZXingObjC/ZXAztecCode.h
new file mode 120000
index 000000000..4a22950a4
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecCode.h
@@ -0,0 +1 @@
+../../aztec/encoder/ZXAztecCode.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecDecoder.h b/ZXingObjC/include/ZXingObjC/ZXAztecDecoder.h
new file mode 120000
index 000000000..115a4223c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecDecoder.h
@@ -0,0 +1 @@
+../../aztec/decoder/ZXAztecDecoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecDetector.h b/ZXingObjC/include/ZXingObjC/ZXAztecDetector.h
new file mode 120000
index 000000000..78c9f685d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecDetector.h
@@ -0,0 +1 @@
+../../aztec/detector/ZXAztecDetector.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecDetectorResult.h b/ZXingObjC/include/ZXingObjC/ZXAztecDetectorResult.h
new file mode 120000
index 000000000..fc605829a
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecDetectorResult.h
@@ -0,0 +1 @@
+../../aztec/ZXAztecDetectorResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecEncoder.h b/ZXingObjC/include/ZXingObjC/ZXAztecEncoder.h
new file mode 120000
index 000000000..284cee269
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecEncoder.h
@@ -0,0 +1 @@
+../../aztec/encoder/ZXAztecEncoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecHighLevelEncoder.h b/ZXingObjC/include/ZXingObjC/ZXAztecHighLevelEncoder.h
new file mode 120000
index 000000000..a979c43ba
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecHighLevelEncoder.h
@@ -0,0 +1 @@
+../../aztec/encoder/ZXAztecHighLevelEncoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecReader.h b/ZXingObjC/include/ZXingObjC/ZXAztecReader.h
new file mode 120000
index 000000000..1628a6469
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecReader.h
@@ -0,0 +1 @@
+../../aztec/ZXAztecReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXAztecWriter.h b/ZXingObjC/include/ZXingObjC/ZXAztecWriter.h
new file mode 120000
index 000000000..081bdd4ca
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXAztecWriter.h
@@ -0,0 +1 @@
+../../aztec/ZXAztecWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBarcodeFormat.h b/ZXingObjC/include/ZXingObjC/ZXBarcodeFormat.h
new file mode 120000
index 000000000..e977d3048
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBarcodeFormat.h
@@ -0,0 +1 @@
+../../core/ZXBarcodeFormat.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBinarizer.h b/ZXingObjC/include/ZXingObjC/ZXBinarizer.h
new file mode 120000
index 000000000..a4adeaaee
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBinarizer.h
@@ -0,0 +1 @@
+../../core/ZXBinarizer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBinaryBitmap.h b/ZXingObjC/include/ZXingObjC/ZXBinaryBitmap.h
new file mode 120000
index 000000000..a0456513a
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBinaryBitmap.h
@@ -0,0 +1 @@
+../../core/ZXBinaryBitmap.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBitArray.h b/ZXingObjC/include/ZXingObjC/ZXBitArray.h
new file mode 120000
index 000000000..dbd5427be
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBitArray.h
@@ -0,0 +1 @@
+../../common/ZXBitArray.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBitMatrix.h b/ZXingObjC/include/ZXingObjC/ZXBitMatrix.h
new file mode 120000
index 000000000..ed363a6e2
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBitMatrix.h
@@ -0,0 +1 @@
+../../common/ZXBitMatrix.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBitSource.h b/ZXingObjC/include/ZXingObjC/ZXBitSource.h
new file mode 120000
index 000000000..fcb150973
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBitSource.h
@@ -0,0 +1 @@
+../../common/ZXBitSource.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBizcardResultParser.h b/ZXingObjC/include/ZXingObjC/ZXBizcardResultParser.h
new file mode 120000
index 000000000..ce02f5188
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBizcardResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXBizcardResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBookmarkDoCoMoResultParser.h b/ZXingObjC/include/ZXingObjC/ZXBookmarkDoCoMoResultParser.h
new file mode 120000
index 000000000..0c7fd72e2
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBookmarkDoCoMoResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXBookmarkDoCoMoResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXBoolArray.h b/ZXingObjC/include/ZXingObjC/ZXBoolArray.h
new file mode 120000
index 000000000..6300ef1b7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXBoolArray.h
@@ -0,0 +1 @@
+../../common/ZXBoolArray.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXByQuadrantReader.h b/ZXingObjC/include/ZXingObjC/ZXByQuadrantReader.h
new file mode 120000
index 000000000..bc2fa54a3
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXByQuadrantReader.h
@@ -0,0 +1 @@
+../../multi/ZXByQuadrantReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXByteArray.h b/ZXingObjC/include/ZXingObjC/ZXByteArray.h
new file mode 120000
index 000000000..a98241a08
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXByteArray.h
@@ -0,0 +1 @@
+../../common/ZXByteArray.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXByteMatrix.h b/ZXingObjC/include/ZXingObjC/ZXByteMatrix.h
new file mode 120000
index 000000000..dce4e0246
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXByteMatrix.h
@@ -0,0 +1 @@
+../../core/ZXByteMatrix.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCGImageLuminanceSource.h b/ZXingObjC/include/ZXingObjC/ZXCGImageLuminanceSource.h
new file mode 120000
index 000000000..7c66815c3
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCGImageLuminanceSource.h
@@ -0,0 +1 @@
+../../client/ZXCGImageLuminanceSource.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCGImageLuminanceSourceInfo.h b/ZXingObjC/include/ZXingObjC/ZXCGImageLuminanceSourceInfo.h
new file mode 120000
index 000000000..7b96048fb
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCGImageLuminanceSourceInfo.h
@@ -0,0 +1 @@
+../../client/ZXCGImageLuminanceSourceInfo.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCalendarParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXCalendarParsedResult.h
new file mode 120000
index 000000000..9b7f76815
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCalendarParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXCalendarParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCapture.h b/ZXingObjC/include/ZXingObjC/ZXCapture.h
new file mode 120000
index 000000000..ea8482e12
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCapture.h
@@ -0,0 +1 @@
+../../client/ZXCapture.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCaptureDelegate.h b/ZXingObjC/include/ZXingObjC/ZXCaptureDelegate.h
new file mode 120000
index 000000000..3ac36da0c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCaptureDelegate.h
@@ -0,0 +1 @@
+../../client/ZXCaptureDelegate.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCharacterSetECI.h b/ZXingObjC/include/ZXingObjC/ZXCharacterSetECI.h
new file mode 120000
index 000000000..8a924d075
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCharacterSetECI.h
@@ -0,0 +1 @@
+../../common/ZXCharacterSetECI.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCodaBarReader.h b/ZXingObjC/include/ZXingObjC/ZXCodaBarReader.h
new file mode 120000
index 000000000..9ff6ef243
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCodaBarReader.h
@@ -0,0 +1 @@
+../../oned/ZXCodaBarReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCodaBarWriter.h b/ZXingObjC/include/ZXingObjC/ZXCodaBarWriter.h
new file mode 120000
index 000000000..4552a968d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCodaBarWriter.h
@@ -0,0 +1 @@
+../../oned/ZXCodaBarWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCode128Reader.h b/ZXingObjC/include/ZXingObjC/ZXCode128Reader.h
new file mode 120000
index 000000000..552df134f
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCode128Reader.h
@@ -0,0 +1 @@
+../../oned/ZXCode128Reader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCode128Writer.h b/ZXingObjC/include/ZXingObjC/ZXCode128Writer.h
new file mode 120000
index 000000000..d9e796b66
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCode128Writer.h
@@ -0,0 +1 @@
+../../oned/ZXCode128Writer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCode39Reader.h b/ZXingObjC/include/ZXingObjC/ZXCode39Reader.h
new file mode 120000
index 000000000..be4d5fd8d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCode39Reader.h
@@ -0,0 +1 @@
+../../oned/ZXCode39Reader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCode39Writer.h b/ZXingObjC/include/ZXingObjC/ZXCode39Writer.h
new file mode 120000
index 000000000..eccde6f0e
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCode39Writer.h
@@ -0,0 +1 @@
+../../oned/ZXCode39Writer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXCode93Reader.h b/ZXingObjC/include/ZXingObjC/ZXCode93Reader.h
new file mode 120000
index 000000000..3733409b9
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXCode93Reader.h
@@ -0,0 +1 @@
+../../oned/ZXCode93Reader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixDecoder.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixDecoder.h
new file mode 120000
index 000000000..dcdb20cc9
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixDecoder.h
@@ -0,0 +1 @@
+../../datamatrix/decoder/ZXDataMatrixDecoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixDefaultPlacement.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixDefaultPlacement.h
new file mode 120000
index 000000000..07c639d4d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixDefaultPlacement.h
@@ -0,0 +1 @@
+../../datamatrix/encoder/ZXDataMatrixDefaultPlacement.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixDetector.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixDetector.h
new file mode 120000
index 000000000..3bd7a6443
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixDetector.h
@@ -0,0 +1 @@
+../../datamatrix/detector/ZXDataMatrixDetector.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixEdifactEncoder.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixEdifactEncoder.h
new file mode 120000
index 000000000..1a27cadc5
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixEdifactEncoder.h
@@ -0,0 +1 @@
+../../datamatrix/encoder/ZXDataMatrixEdifactEncoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixEncoder.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixEncoder.h
new file mode 120000
index 000000000..a48b9308c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixEncoder.h
@@ -0,0 +1 @@
+../../datamatrix/encoder/ZXDataMatrixEncoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixEncoderContext.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixEncoderContext.h
new file mode 120000
index 000000000..358b2be03
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixEncoderContext.h
@@ -0,0 +1 @@
+../../datamatrix/encoder/ZXDataMatrixEncoderContext.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixErrorCorrection.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixErrorCorrection.h
new file mode 120000
index 000000000..12dc2a173
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixErrorCorrection.h
@@ -0,0 +1 @@
+../../datamatrix/encoder/ZXDataMatrixErrorCorrection.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixHighLevelEncoder.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixHighLevelEncoder.h
new file mode 120000
index 000000000..b259af617
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixHighLevelEncoder.h
@@ -0,0 +1 @@
+../../datamatrix/encoder/ZXDataMatrixHighLevelEncoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixReader.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixReader.h
new file mode 120000
index 000000000..f59cc05c8
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixReader.h
@@ -0,0 +1 @@
+../../datamatrix/ZXDataMatrixReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixSymbolInfo.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixSymbolInfo.h
new file mode 120000
index 000000000..793141809
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixSymbolInfo.h
@@ -0,0 +1 @@
+../../datamatrix/encoder/ZXDataMatrixSymbolInfo.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixVersion.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixVersion.h
new file mode 120000
index 000000000..b28529f0f
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixVersion.h
@@ -0,0 +1 @@
+../../datamatrix/decoder/ZXDataMatrixVersion.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDataMatrixWriter.h b/ZXingObjC/include/ZXingObjC/ZXDataMatrixWriter.h
new file mode 120000
index 000000000..5cc15146d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDataMatrixWriter.h
@@ -0,0 +1 @@
+../../datamatrix/ZXDataMatrixWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDecodeHints.h b/ZXingObjC/include/ZXingObjC/ZXDecodeHints.h
new file mode 120000
index 000000000..10230dab2
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDecodeHints.h
@@ -0,0 +1 @@
+../../core/ZXDecodeHints.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDecoderResult.h b/ZXingObjC/include/ZXingObjC/ZXDecoderResult.h
new file mode 120000
index 000000000..58715d463
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDecoderResult.h
@@ -0,0 +1 @@
+../../common/ZXDecoderResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDefaultGridSampler.h b/ZXingObjC/include/ZXingObjC/ZXDefaultGridSampler.h
new file mode 120000
index 000000000..d4ad038ff
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDefaultGridSampler.h
@@ -0,0 +1 @@
+../../common/ZXDefaultGridSampler.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDetectorResult.h b/ZXingObjC/include/ZXingObjC/ZXDetectorResult.h
new file mode 120000
index 000000000..dcf80b88c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDetectorResult.h
@@ -0,0 +1 @@
+../../common/ZXDetectorResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXDimension.h b/ZXingObjC/include/ZXingObjC/ZXDimension.h
new file mode 120000
index 000000000..0798cf7fb
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXDimension.h
@@ -0,0 +1 @@
+../../core/ZXDimension.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEAN13Reader.h b/ZXingObjC/include/ZXingObjC/ZXEAN13Reader.h
new file mode 120000
index 000000000..48428f1c4
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEAN13Reader.h
@@ -0,0 +1 @@
+../../oned/ZXEAN13Reader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEAN13Writer.h b/ZXingObjC/include/ZXingObjC/ZXEAN13Writer.h
new file mode 120000
index 000000000..240e4a1d1
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEAN13Writer.h
@@ -0,0 +1 @@
+../../oned/ZXEAN13Writer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEAN8Reader.h b/ZXingObjC/include/ZXingObjC/ZXEAN8Reader.h
new file mode 120000
index 000000000..5e15e7907
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEAN8Reader.h
@@ -0,0 +1 @@
+../../oned/ZXEAN8Reader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEAN8Writer.h b/ZXingObjC/include/ZXingObjC/ZXEAN8Writer.h
new file mode 120000
index 000000000..dec813873
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEAN8Writer.h
@@ -0,0 +1 @@
+../../oned/ZXEAN8Writer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEmailAddressParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXEmailAddressParsedResult.h
new file mode 120000
index 000000000..25d2799f7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEmailAddressParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXEmailAddressParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEmailAddressResultParser.h b/ZXingObjC/include/ZXingObjC/ZXEmailAddressResultParser.h
new file mode 120000
index 000000000..dca828d2a
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEmailAddressResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXEmailAddressResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEmailDoCoMoResultParser.h b/ZXingObjC/include/ZXingObjC/ZXEmailDoCoMoResultParser.h
new file mode 120000
index 000000000..e4bdfcf21
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEmailDoCoMoResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXEmailDoCoMoResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXEncodeHints.h b/ZXingObjC/include/ZXingObjC/ZXEncodeHints.h
new file mode 120000
index 000000000..9d05e0061
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXEncodeHints.h
@@ -0,0 +1 @@
+../../core/ZXEncodeHints.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXErrors.h b/ZXingObjC/include/ZXingObjC/ZXErrors.h
new file mode 120000
index 000000000..cecf1ee86
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXErrors.h
@@ -0,0 +1 @@
+../../core/ZXErrors.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXExpandedProductParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXExpandedProductParsedResult.h
new file mode 120000
index 000000000..282ce5287
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXExpandedProductParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXExpandedProductParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXExpandedProductResultParser.h b/ZXingObjC/include/ZXingObjC/ZXExpandedProductResultParser.h
new file mode 120000
index 000000000..dcbb249f5
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXExpandedProductResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXExpandedProductResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXGenericGF.h b/ZXingObjC/include/ZXingObjC/ZXGenericGF.h
new file mode 120000
index 000000000..36ae2badc
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXGenericGF.h
@@ -0,0 +1 @@
+../../common/reedsolomon/ZXGenericGF.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXGenericMultipleBarcodeReader.h b/ZXingObjC/include/ZXingObjC/ZXGenericMultipleBarcodeReader.h
new file mode 120000
index 000000000..71cce8e3d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXGenericMultipleBarcodeReader.h
@@ -0,0 +1 @@
+../../multi/ZXGenericMultipleBarcodeReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXGeoParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXGeoParsedResult.h
new file mode 120000
index 000000000..16daac6f8
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXGeoParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXGeoParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXGeoResultParser.h b/ZXingObjC/include/ZXingObjC/ZXGeoResultParser.h
new file mode 120000
index 000000000..582a5a88c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXGeoResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXGeoResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXGlobalHistogramBinarizer.h b/ZXingObjC/include/ZXingObjC/ZXGlobalHistogramBinarizer.h
new file mode 120000
index 000000000..88be8826f
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXGlobalHistogramBinarizer.h
@@ -0,0 +1 @@
+../../common/ZXGlobalHistogramBinarizer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXGridSampler.h b/ZXingObjC/include/ZXingObjC/ZXGridSampler.h
new file mode 120000
index 000000000..b1181645c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXGridSampler.h
@@ -0,0 +1 @@
+../../common/ZXGridSampler.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXHybridBinarizer.h b/ZXingObjC/include/ZXingObjC/ZXHybridBinarizer.h
new file mode 120000
index 000000000..fe550d324
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXHybridBinarizer.h
@@ -0,0 +1 @@
+../../common/ZXHybridBinarizer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXISBNParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXISBNParsedResult.h
new file mode 120000
index 000000000..b171c8cc7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXISBNParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXISBNParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXISBNResultParser.h b/ZXingObjC/include/ZXingObjC/ZXISBNResultParser.h
new file mode 120000
index 000000000..0629d0c57
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXISBNResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXISBNResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXITFReader.h b/ZXingObjC/include/ZXingObjC/ZXITFReader.h
new file mode 120000
index 000000000..bb24f2c6b
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXITFReader.h
@@ -0,0 +1 @@
+../../oned/ZXITFReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXITFWriter.h b/ZXingObjC/include/ZXingObjC/ZXITFWriter.h
new file mode 120000
index 000000000..26dc35298
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXITFWriter.h
@@ -0,0 +1 @@
+../../oned/ZXITFWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXImage.h b/ZXingObjC/include/ZXingObjC/ZXImage.h
new file mode 120000
index 000000000..83db09af7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXImage.h
@@ -0,0 +1 @@
+../../client/ZXImage.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXIntArray.h b/ZXingObjC/include/ZXingObjC/ZXIntArray.h
new file mode 120000
index 000000000..0ad818d33
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXIntArray.h
@@ -0,0 +1 @@
+../../common/ZXIntArray.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXInvertedLuminanceSource.h b/ZXingObjC/include/ZXingObjC/ZXInvertedLuminanceSource.h
new file mode 120000
index 000000000..70e560b90
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXInvertedLuminanceSource.h
@@ -0,0 +1 @@
+../../core/ZXInvertedLuminanceSource.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXLuminanceSource.h b/ZXingObjC/include/ZXingObjC/ZXLuminanceSource.h
new file mode 120000
index 000000000..51429f74d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXLuminanceSource.h
@@ -0,0 +1 @@
+../../core/ZXLuminanceSource.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMathUtils.h b/ZXingObjC/include/ZXingObjC/ZXMathUtils.h
new file mode 120000
index 000000000..f8dcd9708
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMathUtils.h
@@ -0,0 +1 @@
+../../common/detector/ZXMathUtils.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMaxiCodeDecoder.h b/ZXingObjC/include/ZXingObjC/ZXMaxiCodeDecoder.h
new file mode 120000
index 000000000..5e4761b6a
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMaxiCodeDecoder.h
@@ -0,0 +1 @@
+../../maxicode/decoder/ZXMaxiCodeDecoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMaxiCodeReader.h b/ZXingObjC/include/ZXingObjC/ZXMaxiCodeReader.h
new file mode 120000
index 000000000..b750fa7ae
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMaxiCodeReader.h
@@ -0,0 +1 @@
+../../maxicode/ZXMaxiCodeReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXModulusGF.h b/ZXingObjC/include/ZXingObjC/ZXModulusGF.h
new file mode 120000
index 000000000..e2d9e04db
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXModulusGF.h
@@ -0,0 +1 @@
+../../pdf417/decoder/ec/ZXModulusGF.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMonochromeRectangleDetector.h b/ZXingObjC/include/ZXingObjC/ZXMonochromeRectangleDetector.h
new file mode 120000
index 000000000..08df88564
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMonochromeRectangleDetector.h
@@ -0,0 +1 @@
+../../common/detector/ZXMonochromeRectangleDetector.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMultiDetector.h b/ZXingObjC/include/ZXingObjC/ZXMultiDetector.h
new file mode 120000
index 000000000..959df32b8
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMultiDetector.h
@@ -0,0 +1 @@
+../../qrcode/multi/detector/ZXMultiDetector.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMultiFormatOneDReader.h b/ZXingObjC/include/ZXingObjC/ZXMultiFormatOneDReader.h
new file mode 120000
index 000000000..56dfa4987
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMultiFormatOneDReader.h
@@ -0,0 +1 @@
+../../oned/ZXMultiFormatOneDReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMultiFormatReader.h b/ZXingObjC/include/ZXingObjC/ZXMultiFormatReader.h
new file mode 120000
index 000000000..6c7b0d7ed
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMultiFormatReader.h
@@ -0,0 +1 @@
+../../ZXMultiFormatReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMultiFormatUPCEANReader.h b/ZXingObjC/include/ZXingObjC/ZXMultiFormatUPCEANReader.h
new file mode 120000
index 000000000..c6267d0bb
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMultiFormatUPCEANReader.h
@@ -0,0 +1 @@
+../../oned/ZXMultiFormatUPCEANReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMultiFormatWriter.h b/ZXingObjC/include/ZXingObjC/ZXMultiFormatWriter.h
new file mode 120000
index 000000000..f1c576dcb
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMultiFormatWriter.h
@@ -0,0 +1 @@
+../../ZXMultiFormatWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXMultipleBarcodeReader.h b/ZXingObjC/include/ZXingObjC/ZXMultipleBarcodeReader.h
new file mode 120000
index 000000000..34ad5cfb7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXMultipleBarcodeReader.h
@@ -0,0 +1 @@
+../../multi/ZXMultipleBarcodeReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXOneDReader.h b/ZXingObjC/include/ZXingObjC/ZXOneDReader.h
new file mode 120000
index 000000000..c74ba43c3
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXOneDReader.h
@@ -0,0 +1 @@
+../../oned/ZXOneDReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXOneDimensionalCodeWriter.h b/ZXingObjC/include/ZXingObjC/ZXOneDimensionalCodeWriter.h
new file mode 120000
index 000000000..e1bc23463
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXOneDimensionalCodeWriter.h
@@ -0,0 +1 @@
+../../oned/ZXOneDimensionalCodeWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417.h b/ZXingObjC/include/ZXingObjC/ZXPDF417.h
new file mode 120000
index 000000000..e33335b03
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417.h
@@ -0,0 +1 @@
+../../pdf417/encoder/ZXPDF417.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417BarcodeMatrix.h b/ZXingObjC/include/ZXingObjC/ZXPDF417BarcodeMatrix.h
new file mode 120000
index 000000000..98a00db85
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417BarcodeMatrix.h
@@ -0,0 +1 @@
+../../pdf417/encoder/ZXPDF417BarcodeMatrix.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417Common.h b/ZXingObjC/include/ZXingObjC/ZXPDF417Common.h
new file mode 120000
index 000000000..dde2fb5d6
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417Common.h
@@ -0,0 +1 @@
+../../pdf417/ZXPDF417Common.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417Detector.h b/ZXingObjC/include/ZXingObjC/ZXPDF417Detector.h
new file mode 120000
index 000000000..b8cc84ea9
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417Detector.h
@@ -0,0 +1 @@
+../../pdf417/detector/ZXPDF417Detector.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417DetectorResult.h b/ZXingObjC/include/ZXingObjC/ZXPDF417DetectorResult.h
new file mode 120000
index 000000000..392d97f47
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417DetectorResult.h
@@ -0,0 +1 @@
+../../pdf417/detector/ZXPDF417DetectorResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417Dimensions.h b/ZXingObjC/include/ZXingObjC/ZXPDF417Dimensions.h
new file mode 120000
index 000000000..7c5badc26
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417Dimensions.h
@@ -0,0 +1 @@
+../../pdf417/encoder/ZXPDF417Dimensions.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417ECErrorCorrection.h b/ZXingObjC/include/ZXingObjC/ZXPDF417ECErrorCorrection.h
new file mode 120000
index 000000000..5a2cf7b80
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417ECErrorCorrection.h
@@ -0,0 +1 @@
+../../pdf417/decoder/ec/ZXPDF417ECErrorCorrection.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417Reader.h b/ZXingObjC/include/ZXingObjC/ZXPDF417Reader.h
new file mode 120000
index 000000000..b090ecb9c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417Reader.h
@@ -0,0 +1 @@
+../../pdf417/ZXPDF417Reader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417ResultMetadata.h b/ZXingObjC/include/ZXingObjC/ZXPDF417ResultMetadata.h
new file mode 120000
index 000000000..8f937d9e5
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417ResultMetadata.h
@@ -0,0 +1 @@
+../../pdf417/ZXPDF417ResultMetadata.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417ScanningDecoder.h b/ZXingObjC/include/ZXingObjC/ZXPDF417ScanningDecoder.h
new file mode 120000
index 000000000..c3aa668c9
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417ScanningDecoder.h
@@ -0,0 +1 @@
+../../pdf417/decoder/ZXPDF417ScanningDecoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPDF417Writer.h b/ZXingObjC/include/ZXingObjC/ZXPDF417Writer.h
new file mode 120000
index 000000000..77f93e224
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPDF417Writer.h
@@ -0,0 +1 @@
+../../pdf417/ZXPDF417Writer.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXParsedResult.h
new file mode 120000
index 000000000..252e55b05
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXParsedResultType.h b/ZXingObjC/include/ZXingObjC/ZXParsedResultType.h
new file mode 120000
index 000000000..f097d6bb1
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXParsedResultType.h
@@ -0,0 +1 @@
+../../client/result/ZXParsedResultType.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPerspectiveTransform.h b/ZXingObjC/include/ZXingObjC/ZXPerspectiveTransform.h
new file mode 120000
index 000000000..b26c8b1c0
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPerspectiveTransform.h
@@ -0,0 +1 @@
+../../common/ZXPerspectiveTransform.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXPlanarYUVLuminanceSource.h b/ZXingObjC/include/ZXingObjC/ZXPlanarYUVLuminanceSource.h
new file mode 120000
index 000000000..3d5d329ba
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXPlanarYUVLuminanceSource.h
@@ -0,0 +1 @@
+../../core/ZXPlanarYUVLuminanceSource.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXProductParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXProductParsedResult.h
new file mode 120000
index 000000000..9e9cc7e45
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXProductParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXProductParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXProductResultParser.h b/ZXingObjC/include/ZXingObjC/ZXProductResultParser.h
new file mode 120000
index 000000000..44c69bc9f
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXProductResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXProductResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCode.h b/ZXingObjC/include/ZXingObjC/ZXQRCode.h
new file mode 120000
index 000000000..030577ed4
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCode.h
@@ -0,0 +1 @@
+../../qrcode/encoder/ZXQRCode.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeAlignmentPattern.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeAlignmentPattern.h
new file mode 120000
index 000000000..4ceccfb98
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeAlignmentPattern.h
@@ -0,0 +1 @@
+../../qrcode/detector/ZXQRCodeAlignmentPattern.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeDecoder.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeDecoder.h
new file mode 120000
index 000000000..3868bbb0f
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeDecoder.h
@@ -0,0 +1 @@
+../../qrcode/decoder/ZXQRCodeDecoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeDecoderMetaData.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeDecoderMetaData.h
new file mode 120000
index 000000000..dae05fa4c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeDecoderMetaData.h
@@ -0,0 +1 @@
+../../qrcode/decoder/ZXQRCodeDecoderMetaData.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeDetector.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeDetector.h
new file mode 120000
index 000000000..6237a73f7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeDetector.h
@@ -0,0 +1 @@
+../../qrcode/detector/ZXQRCodeDetector.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeEncoder.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeEncoder.h
new file mode 120000
index 000000000..9a03dbdbf
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeEncoder.h
@@ -0,0 +1 @@
+../../qrcode/encoder/ZXQRCodeEncoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeErrorCorrectionLevel.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeErrorCorrectionLevel.h
new file mode 120000
index 000000000..d2963d3c8
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeErrorCorrectionLevel.h
@@ -0,0 +1 @@
+../../qrcode/decoder/ZXQRCodeErrorCorrectionLevel.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPattern.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPattern.h
new file mode 120000
index 000000000..2619f76f5
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPattern.h
@@ -0,0 +1 @@
+../../qrcode/detector/ZXQRCodeFinderPattern.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPatternFinder.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPatternFinder.h
new file mode 120000
index 000000000..a32f9a10b
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPatternFinder.h
@@ -0,0 +1 @@
+../../qrcode/detector/ZXQRCodeFinderPatternFinder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPatternInfo.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPatternInfo.h
new file mode 120000
index 000000000..1fb0dfc45
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeFinderPatternInfo.h
@@ -0,0 +1 @@
+../../qrcode/detector/ZXQRCodeFinderPatternInfo.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeMode.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeMode.h
new file mode 120000
index 000000000..af0608d31
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeMode.h
@@ -0,0 +1 @@
+../../qrcode/decoder/ZXQRCodeMode.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeMultiReader.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeMultiReader.h
new file mode 120000
index 000000000..79c5f8924
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeMultiReader.h
@@ -0,0 +1 @@
+../../qrcode/multi/ZXQRCodeMultiReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeReader.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeReader.h
new file mode 120000
index 000000000..c711708de
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeReader.h
@@ -0,0 +1 @@
+../../qrcode/ZXQRCodeReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeVersion.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeVersion.h
new file mode 120000
index 000000000..99d58fecc
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeVersion.h
@@ -0,0 +1 @@
+../../qrcode/decoder/ZXQRCodeVersion.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXQRCodeWriter.h b/ZXingObjC/include/ZXingObjC/ZXQRCodeWriter.h
new file mode 120000
index 000000000..d89d45b17
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXQRCodeWriter.h
@@ -0,0 +1 @@
+../../qrcode/ZXQRCodeWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXRGBLuminanceSource.h b/ZXingObjC/include/ZXingObjC/ZXRGBLuminanceSource.h
new file mode 120000
index 000000000..37684464f
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXRGBLuminanceSource.h
@@ -0,0 +1 @@
+../../core/ZXRGBLuminanceSource.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXRSS14Reader.h b/ZXingObjC/include/ZXingObjC/ZXRSS14Reader.h
new file mode 120000
index 000000000..fd819a5de
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXRSS14Reader.h
@@ -0,0 +1 @@
+../../oned/rss/ZXRSS14Reader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXRSSDataCharacter.h b/ZXingObjC/include/ZXingObjC/ZXRSSDataCharacter.h
new file mode 120000
index 000000000..da59379dc
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXRSSDataCharacter.h
@@ -0,0 +1 @@
+../../oned/rss/ZXRSSDataCharacter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXRSSExpandedReader.h b/ZXingObjC/include/ZXingObjC/ZXRSSExpandedReader.h
new file mode 120000
index 000000000..99ee989ab
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXRSSExpandedReader.h
@@ -0,0 +1 @@
+../../oned/rss/expanded/ZXRSSExpandedReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXRSSFinderPattern.h b/ZXingObjC/include/ZXingObjC/ZXRSSFinderPattern.h
new file mode 120000
index 000000000..94bb17bf5
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXRSSFinderPattern.h
@@ -0,0 +1 @@
+../../oned/rss/ZXRSSFinderPattern.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXRSSUtils.h b/ZXingObjC/include/ZXingObjC/ZXRSSUtils.h
new file mode 120000
index 000000000..c7877b782
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXRSSUtils.h
@@ -0,0 +1 @@
+../../oned/rss/ZXRSSUtils.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXReader.h b/ZXingObjC/include/ZXingObjC/ZXReader.h
new file mode 120000
index 000000000..5721d09fd
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXReader.h
@@ -0,0 +1 @@
+../../core/ZXReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXReedSolomonDecoder.h b/ZXingObjC/include/ZXingObjC/ZXReedSolomonDecoder.h
new file mode 120000
index 000000000..4a766b032
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXReedSolomonDecoder.h
@@ -0,0 +1 @@
+../../common/reedsolomon/ZXReedSolomonDecoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXReedSolomonEncoder.h b/ZXingObjC/include/ZXingObjC/ZXReedSolomonEncoder.h
new file mode 120000
index 000000000..9ad0cbec5
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXReedSolomonEncoder.h
@@ -0,0 +1 @@
+../../common/reedsolomon/ZXReedSolomonEncoder.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXResult.h b/ZXingObjC/include/ZXingObjC/ZXResult.h
new file mode 120000
index 000000000..93946903d
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXResult.h
@@ -0,0 +1 @@
+../../core/ZXResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXResultMetadataType.h b/ZXingObjC/include/ZXingObjC/ZXResultMetadataType.h
new file mode 120000
index 000000000..96056de7c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXResultMetadataType.h
@@ -0,0 +1 @@
+../../core/ZXResultMetadataType.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXResultParser.h b/ZXingObjC/include/ZXingObjC/ZXResultParser.h
new file mode 120000
index 000000000..6e73f9c68
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXResultPoint.h b/ZXingObjC/include/ZXingObjC/ZXResultPoint.h
new file mode 120000
index 000000000..84e1de693
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXResultPoint.h
@@ -0,0 +1 @@
+../../core/ZXResultPoint.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXResultPointCallback.h b/ZXingObjC/include/ZXingObjC/ZXResultPointCallback.h
new file mode 120000
index 000000000..91f6827e7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXResultPointCallback.h
@@ -0,0 +1 @@
+../../core/ZXResultPointCallback.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXSMSMMSResultParser.h b/ZXingObjC/include/ZXingObjC/ZXSMSMMSResultParser.h
new file mode 120000
index 000000000..2cefaba07
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXSMSMMSResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXSMSMMSResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXSMSParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXSMSParsedResult.h
new file mode 120000
index 000000000..210a03736
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXSMSParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXSMSParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXSMSTOMMSTOResultParser.h b/ZXingObjC/include/ZXingObjC/ZXSMSTOMMSTOResultParser.h
new file mode 120000
index 000000000..9a3c3fa1a
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXSMSTOMMSTOResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXSMSTOMMSTOResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXSMTPResultParser.h b/ZXingObjC/include/ZXingObjC/ZXSMTPResultParser.h
new file mode 120000
index 000000000..bff56bcbb
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXSMTPResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXSMTPResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXStringUtils.h b/ZXingObjC/include/ZXingObjC/ZXStringUtils.h
new file mode 120000
index 000000000..06bcbfffd
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXStringUtils.h
@@ -0,0 +1 @@
+../../common/ZXStringUtils.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXTelParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXTelParsedResult.h
new file mode 120000
index 000000000..8ee1ab6dc
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXTelParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXTelParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXTelResultParser.h b/ZXingObjC/include/ZXingObjC/ZXTelResultParser.h
new file mode 120000
index 000000000..1cccf3372
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXTelResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXTelResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXTextParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXTextParsedResult.h
new file mode 120000
index 000000000..8236c2193
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXTextParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXTextParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXUPCAReader.h b/ZXingObjC/include/ZXingObjC/ZXUPCAReader.h
new file mode 120000
index 000000000..51289400b
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXUPCAReader.h
@@ -0,0 +1 @@
+../../oned/ZXUPCAReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXUPCAWriter.h b/ZXingObjC/include/ZXingObjC/ZXUPCAWriter.h
new file mode 120000
index 000000000..ee9e20b1b
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXUPCAWriter.h
@@ -0,0 +1 @@
+../../oned/ZXUPCAWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXUPCEANReader.h b/ZXingObjC/include/ZXingObjC/ZXUPCEANReader.h
new file mode 120000
index 000000000..3073d497e
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXUPCEANReader.h
@@ -0,0 +1 @@
+../../oned/ZXUPCEANReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXUPCEANWriter.h b/ZXingObjC/include/ZXingObjC/ZXUPCEANWriter.h
new file mode 120000
index 000000000..4d54ea719
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXUPCEANWriter.h
@@ -0,0 +1 @@
+../../oned/ZXUPCEANWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXUPCEReader.h b/ZXingObjC/include/ZXingObjC/ZXUPCEReader.h
new file mode 120000
index 000000000..9d34690d5
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXUPCEReader.h
@@ -0,0 +1 @@
+../../oned/ZXUPCEReader.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXUPCEWriter.h b/ZXingObjC/include/ZXingObjC/ZXUPCEWriter.h
new file mode 120000
index 000000000..5c603aca7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXUPCEWriter.h
@@ -0,0 +1 @@
+../../oned/ZXUPCEWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXURIParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXURIParsedResult.h
new file mode 120000
index 000000000..763b0ef11
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXURIParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXURIParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXURIResultParser.h b/ZXingObjC/include/ZXingObjC/ZXURIResultParser.h
new file mode 120000
index 000000000..364af1be4
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXURIResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXURIResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXURLTOResultParser.h b/ZXingObjC/include/ZXingObjC/ZXURLTOResultParser.h
new file mode 120000
index 000000000..1ff0f14c4
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXURLTOResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXURLTOResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXVCardResultParser.h b/ZXingObjC/include/ZXingObjC/ZXVCardResultParser.h
new file mode 120000
index 000000000..6207cb728
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXVCardResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXVCardResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXVEventResultParser.h b/ZXingObjC/include/ZXingObjC/ZXVEventResultParser.h
new file mode 120000
index 000000000..dd92480ff
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXVEventResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXVEventResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXVINParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXVINParsedResult.h
new file mode 120000
index 000000000..8822e657f
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXVINParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXVINParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXVINResultParser.h b/ZXingObjC/include/ZXingObjC/ZXVINResultParser.h
new file mode 120000
index 000000000..b4c346983
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXVINResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXVINResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXWhiteRectangleDetector.h b/ZXingObjC/include/ZXingObjC/ZXWhiteRectangleDetector.h
new file mode 120000
index 000000000..8b51cae18
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXWhiteRectangleDetector.h
@@ -0,0 +1 @@
+../../common/detector/ZXWhiteRectangleDetector.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXWifiParsedResult.h b/ZXingObjC/include/ZXingObjC/ZXWifiParsedResult.h
new file mode 120000
index 000000000..0e3b74148
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXWifiParsedResult.h
@@ -0,0 +1 @@
+../../client/result/ZXWifiParsedResult.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXWifiResultParser.h b/ZXingObjC/include/ZXingObjC/ZXWifiResultParser.h
new file mode 120000
index 000000000..91fa0ee1e
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXWifiResultParser.h
@@ -0,0 +1 @@
+../../client/result/ZXWifiResultParser.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXWriter.h b/ZXingObjC/include/ZXingObjC/ZXWriter.h
new file mode 120000
index 000000000..0ac885a4c
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXWriter.h
@@ -0,0 +1 @@
+../../core/ZXWriter.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjC.h b/ZXingObjC/include/ZXingObjC/ZXingObjC.h
new file mode 120000
index 000000000..af79084d8
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjC.h
@@ -0,0 +1 @@
+../../ZXingObjC.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjCAztec.h b/ZXingObjC/include/ZXingObjC/ZXingObjCAztec.h
new file mode 120000
index 000000000..36b96f360
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjCAztec.h
@@ -0,0 +1 @@
+../../aztec/ZXingObjCAztec.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjCCore.h b/ZXingObjC/include/ZXingObjC/ZXingObjCCore.h
new file mode 120000
index 000000000..f75d17e64
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjCCore.h
@@ -0,0 +1 @@
+../../core/ZXingObjCCore.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjCDataMatrix.h b/ZXingObjC/include/ZXingObjC/ZXingObjCDataMatrix.h
new file mode 120000
index 000000000..c4bf3193a
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjCDataMatrix.h
@@ -0,0 +1 @@
+../../datamatrix/ZXingObjCDataMatrix.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjCMaxiCode.h b/ZXingObjC/include/ZXingObjC/ZXingObjCMaxiCode.h
new file mode 120000
index 000000000..6d40b19d7
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjCMaxiCode.h
@@ -0,0 +1 @@
+../../maxicode/ZXingObjCMaxiCode.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjCOneD.h b/ZXingObjC/include/ZXingObjC/ZXingObjCOneD.h
new file mode 120000
index 000000000..7e55e0cec
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjCOneD.h
@@ -0,0 +1 @@
+../../oned/ZXingObjCOneD.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjCPDF417.h b/ZXingObjC/include/ZXingObjC/ZXingObjCPDF417.h
new file mode 120000
index 000000000..859aa49f9
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjCPDF417.h
@@ -0,0 +1 @@
+../../pdf417/ZXingObjCPDF417.h
\ No newline at end of file
diff --git a/ZXingObjC/include/ZXingObjC/ZXingObjCQRCode.h b/ZXingObjC/include/ZXingObjC/ZXingObjCQRCode.h
new file mode 120000
index 000000000..4423efe90
--- /dev/null
+++ b/ZXingObjC/include/ZXingObjC/ZXingObjCQRCode.h
@@ -0,0 +1 @@
+../../qrcode/ZXingObjCQRCode.h
\ No newline at end of file
diff --git a/ZXingObjC/include/module.modulemap b/ZXingObjC/include/module.modulemap
new file mode 100644
index 000000000..3d66496c5
--- /dev/null
+++ b/ZXingObjC/include/module.modulemap
@@ -0,0 +1,5 @@
+module ZXingObjC {
+    umbrella header "ZXingObjC/ZXingObjC.h"
+    export *
+    module * { export * }
+}
diff --git a/ZXingObjC/oned/ZXEANManufacturerOrgSupport.h b/ZXingObjC/oned/ZXEANManufacturerOrgSupport.h
index 60b385af2..da7028278 100644
--- a/ZXingObjC/oned/ZXEANManufacturerOrgSupport.h
+++ b/ZXingObjC/oned/ZXEANManufacturerOrgSupport.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Records EAN prefix to GS1 Member Organization, where the member organization
  * correlates strongly with a country. This is an imperfect means of identifying
diff --git a/ZXingObjC/oned/ZXUPCEANExtensionSupport.h b/ZXingObjC/oned/ZXUPCEANExtensionSupport.h
index b94101ca5..4ad9e975b 100644
--- a/ZXingObjC/oned/ZXUPCEANExtensionSupport.h
+++ b/ZXingObjC/oned/ZXUPCEANExtensionSupport.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitArray, ZXResult;
 
 @interface ZXUPCEANExtensionSupport : NSObject
diff --git a/ZXingObjC/oned/rss/ZXRSSDataCharacter.h b/ZXingObjC/oned/rss/ZXRSSDataCharacter.h
index 78a99019f..5e5a1de76 100644
--- a/ZXingObjC/oned/rss/ZXRSSDataCharacter.h
+++ b/ZXingObjC/oned/rss/ZXRSSDataCharacter.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXRSSDataCharacter : NSObject
 
 @property (nonatomic, assign, readonly) int value;
diff --git a/ZXingObjC/oned/rss/expanded/ZXRSSExpandedRow.h b/ZXingObjC/oned/rss/expanded/ZXRSSExpandedRow.h
index d6933666e..d549cdf29 100644
--- a/ZXingObjC/oned/rss/expanded/ZXRSSExpandedRow.h
+++ b/ZXingObjC/oned/rss/expanded/ZXRSSExpandedRow.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * One row of an RSS Expanded Stacked symbol, consisting of 1+ expanded pairs.
  */
diff --git a/ZXingObjC/oned/rss/expanded/decoders/ZXAbstractExpandedDecoder.h b/ZXingObjC/oned/rss/expanded/decoders/ZXAbstractExpandedDecoder.h
index f272ca29c..2f9fbc148 100644
--- a/ZXingObjC/oned/rss/expanded/decoders/ZXAbstractExpandedDecoder.h
+++ b/ZXingObjC/oned/rss/expanded/decoders/ZXAbstractExpandedDecoder.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitArray, ZXRSSExpandedGeneralAppIdDecoder;
 
 @interface ZXAbstractExpandedDecoder : NSObject
diff --git a/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedBlockParsedResult.h b/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedBlockParsedResult.h
index 691ebd710..4a70d93cb 100644
--- a/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedBlockParsedResult.h
+++ b/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedBlockParsedResult.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXRSSExpandedDecodedInformation;
 
 @interface ZXRSSExpandedBlockParsedResult : NSObject
diff --git a/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedCurrentParsingState.h b/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedCurrentParsingState.h
index b4c88c82c..ba2f8c72b 100644
--- a/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedCurrentParsingState.h
+++ b/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedCurrentParsingState.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXRSSExpandedCurrentParsingState : NSObject
 
 @property (nonatomic, assign) int position;
diff --git a/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedDecodedObject.h b/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedDecodedObject.h
index 5dce8c8e4..32fdcb6a6 100644
--- a/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedDecodedObject.h
+++ b/ZXingObjC/oned/rss/expanded/decoders/ZXRSSExpandedDecodedObject.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXRSSExpandedDecodedObject : NSObject
 
 @property (nonatomic, assign, readonly) int theNewPosition;
diff --git a/ZXingObjC/pdf417/ZXPDF417ResultMetadata.h b/ZXingObjC/pdf417/ZXPDF417ResultMetadata.h
index 70502295d..71a606e5b 100644
--- a/ZXingObjC/pdf417/ZXPDF417ResultMetadata.h
+++ b/ZXingObjC/pdf417/ZXPDF417ResultMetadata.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXPDF417ResultMetadata : NSObject
 
 @property (nonatomic, assign) int segmentIndex;
diff --git a/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeMetadata.h b/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeMetadata.h
index f2fb7d9fd..e60263d7e 100644
--- a/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeMetadata.h
+++ b/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeMetadata.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXPDF417BarcodeMetadata : NSObject
 
 @property (nonatomic, assign, readonly) int columnCount;
diff --git a/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeValue.h b/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeValue.h
index 76147a264..514de6069 100644
--- a/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeValue.h
+++ b/ZXingObjC/pdf417/decoder/ZXPDF417BarcodeValue.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXIntArray;
 
 @interface ZXPDF417BarcodeValue : NSObject
diff --git a/ZXingObjC/pdf417/decoder/ZXPDF417BoundingBox.h b/ZXingObjC/pdf417/decoder/ZXPDF417BoundingBox.h
index da74a7894..44161b172 100644
--- a/ZXingObjC/pdf417/decoder/ZXPDF417BoundingBox.h
+++ b/ZXingObjC/pdf417/decoder/ZXPDF417BoundingBox.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitMatrix, ZXResultPoint;
 
 @interface ZXPDF417BoundingBox : NSObject
diff --git a/ZXingObjC/pdf417/decoder/ZXPDF417Codeword.h b/ZXingObjC/pdf417/decoder/ZXPDF417Codeword.h
index d64bf47c6..af0d21dfe 100644
--- a/ZXingObjC/pdf417/decoder/ZXPDF417Codeword.h
+++ b/ZXingObjC/pdf417/decoder/ZXPDF417Codeword.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXPDF417Codeword : NSObject
 
 @property (nonatomic, assign, readonly) int startX;
diff --git a/ZXingObjC/pdf417/decoder/ZXPDF417CodewordDecoder.h b/ZXingObjC/pdf417/decoder/ZXPDF417CodewordDecoder.h
index a50e3478f..32f1f3b35 100644
--- a/ZXingObjC/pdf417/decoder/ZXPDF417CodewordDecoder.h
+++ b/ZXingObjC/pdf417/decoder/ZXPDF417CodewordDecoder.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @interface ZXPDF417CodewordDecoder : NSObject
 
 + (int)decodedValue:(NSArray *)moduleBitCount;
diff --git a/ZXingObjC/pdf417/decoder/ec/ZXPDF417ECErrorCorrection.h b/ZXingObjC/pdf417/decoder/ec/ZXPDF417ECErrorCorrection.h
index 51f30dd7f..225863b95 100644
--- a/ZXingObjC/pdf417/decoder/ec/ZXPDF417ECErrorCorrection.h
+++ b/ZXingObjC/pdf417/decoder/ec/ZXPDF417ECErrorCorrection.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXIntArray;
 
 /**
diff --git a/ZXingObjC/pdf417/detector/ZXPDF417DetectorResult.h b/ZXingObjC/pdf417/detector/ZXPDF417DetectorResult.h
index b7e8c9250..7d741cf91 100644
--- a/ZXingObjC/pdf417/detector/ZXPDF417DetectorResult.h
+++ b/ZXingObjC/pdf417/detector/ZXPDF417DetectorResult.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXBitMatrix;
 
 @interface ZXPDF417DetectorResult : NSObject
diff --git a/ZXingObjC/pdf417/encoder/ZXPDF417BarcodeMatrix.h b/ZXingObjC/pdf417/encoder/ZXPDF417BarcodeMatrix.h
index 9ff0aed5f..5f423fbfb 100644
--- a/ZXingObjC/pdf417/encoder/ZXPDF417BarcodeMatrix.h
+++ b/ZXingObjC/pdf417/encoder/ZXPDF417BarcodeMatrix.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXPDF417BarcodeRow;
 
 /**
diff --git a/ZXingObjC/pdf417/encoder/ZXPDF417Dimensions.h b/ZXingObjC/pdf417/encoder/ZXPDF417Dimensions.h
index 0e1f155ff..991193463 100644
--- a/ZXingObjC/pdf417/encoder/ZXPDF417Dimensions.h
+++ b/ZXingObjC/pdf417/encoder/ZXPDF417Dimensions.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Data object to specify the minimum and maximum number of rows and columns for a PDF417 barcode.
  */
diff --git a/ZXingObjC/qrcode/decoder/ZXQRCodeDecoderMetaData.h b/ZXingObjC/qrcode/decoder/ZXQRCodeDecoderMetaData.h
index f31f497fc..46a9b0dfb 100644
--- a/ZXingObjC/qrcode/decoder/ZXQRCodeDecoderMetaData.h
+++ b/ZXingObjC/qrcode/decoder/ZXQRCodeDecoderMetaData.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * Meta-data container for QR Code decoding. Instances of this class may be used to convey information back to the
  * decoding caller. Callers are expected to process this.
diff --git a/ZXingObjC/qrcode/decoder/ZXQRCodeErrorCorrectionLevel.h b/ZXingObjC/qrcode/decoder/ZXQRCodeErrorCorrectionLevel.h
index 72230a88f..fdd54e928 100644
--- a/ZXingObjC/qrcode/decoder/ZXQRCodeErrorCorrectionLevel.h
+++ b/ZXingObjC/qrcode/decoder/ZXQRCodeErrorCorrectionLevel.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 /**
  * See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels
  * defined by the QR code standard.
diff --git a/ZXingObjC/qrcode/decoder/ZXQRCodeMode.h b/ZXingObjC/qrcode/decoder/ZXQRCodeMode.h
index d89b2caa2..b74c05cec 100644
--- a/ZXingObjC/qrcode/decoder/ZXQRCodeMode.h
+++ b/ZXingObjC/qrcode/decoder/ZXQRCodeMode.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXQRCodeVersion;
 
 /**
diff --git a/ZXingObjC/qrcode/encoder/ZXQRCodeBlockPair.h b/ZXingObjC/qrcode/encoder/ZXQRCodeBlockPair.h
index 16c6882ec..16c39e770 100644
--- a/ZXingObjC/qrcode/encoder/ZXQRCodeBlockPair.h
+++ b/ZXingObjC/qrcode/encoder/ZXQRCodeBlockPair.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 @class ZXByteArray;
 
 @interface ZXQRCodeBlockPair : NSObject