diff --git a/objc/src/ZXing/ZXBinarizer.h b/objc/src/ZXing/ZXBinarizer.h
index f62b37ab8..20f0daaa9 100644
--- a/objc/src/ZXing/ZXBinarizer.h
+++ b/objc/src/ZXing/ZXBinarizer.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#import <zxing/Binarizer.h>
+#include <zxing/Binarizer.h>
 #import <ZXing/ZXLuminanceSource.h>
 
 @interface ZXBinarizer : NSObject {
diff --git a/objc/src/ZXing/ZXBinaryBitmap.h b/objc/src/ZXing/ZXBinaryBitmap.h
index e2f995863..baad04263 100644
--- a/objc/src/ZXing/ZXBinaryBitmap.h
+++ b/objc/src/ZXing/ZXBinaryBitmap.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#import <zxing/BinaryBitmap.h>
+#include <zxing/BinaryBitmap.h>
 
 @class ZXBinarizer;
 
diff --git a/objc/src/ZXing/ZXCGImageLuminanceSource.h b/objc/src/ZXing/ZXCGImageLuminanceSource.h
index 8b8a25002..0108b3c62 100644
--- a/objc/src/ZXing/ZXCGImageLuminanceSource.h
+++ b/objc/src/ZXing/ZXCGImageLuminanceSource.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#import <ZXing/ZXLuminanceSource.h>
 #import <CoreVideo/CoreVideo.h>
+#import <ZXing/ZXLuminanceSource.h>
 
 namespace zxing {
 
diff --git a/objc/src/ZXing/ZXCapture.h b/objc/src/ZXing/ZXCapture.h
index be52ac6f8..a9110644e 100644
--- a/objc/src/ZXing/ZXCapture.h
+++ b/objc/src/ZXing/ZXCapture.h
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#import <zxing/ZXCaptureDelegate.h>
+#import <ZXing/ZXCaptureDelegate.h>
 
 #if !TARGET_IPHONE_SIMULATOR
 #if TARGET_OS_EMBEDDED
diff --git a/objc/src/ZXing/ZXCapture.mm b/objc/src/ZXing/ZXCapture.mm
index 67379b817..73f92793a 100644
--- a/objc/src/ZXing/ZXCapture.mm
+++ b/objc/src/ZXing/ZXCapture.mm
@@ -562,6 +562,9 @@ ZXAV(didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer)
 @synthesize captureToFilename;
 
 - (id)init {
+  if ((self = [super init])) {
+    [self release];
+  }
   return 0;
 }
 
diff --git a/objc/src/ZXing/ZXDecodeHints.h b/objc/src/ZXing/ZXDecodeHints.h
index f059601fe..c3a83041d 100644
--- a/objc/src/ZXing/ZXDecodeHints.h
+++ b/objc/src/ZXing/ZXDecodeHints.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#import <zxing/DecodeHints.h>
+#include <zxing/DecodeHints.h>
 
 @interface ZXDecodeHints : NSObject {
   zxing::DecodeHints* native;
diff --git a/objc/src/ZXing/ZXHybridBinarizer.h b/objc/src/ZXing/ZXHybridBinarizer.h
index e44b1fa4e..79aa9900a 100644
--- a/objc/src/ZXing/ZXHybridBinarizer.h
+++ b/objc/src/ZXing/ZXHybridBinarizer.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
+#include <zxing/common/HybridBinarizer.h>
 #import <ZXing/ZXBinarizer.h>
-#import <zxing/common/HybridBinarizer.h>
 
 @interface ZXHybridBinarizer : ZXBinarizer {
 }
diff --git a/objc/src/ZXing/ZXLuminanceSource.h b/objc/src/ZXing/ZXLuminanceSource.h
index a5d42bc3c..2336d7893 100644
--- a/objc/src/ZXing/ZXLuminanceSource.h
+++ b/objc/src/ZXing/ZXLuminanceSource.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#import <zxing/LuminanceSource.h>
+#include <zxing/LuminanceSource.h>
 
 @interface ZXLuminanceSource : NSObject {
   zxing::Ref<zxing::LuminanceSource> native;
diff --git a/objc/src/ZXing/ZXMultiFormatReader.mm b/objc/src/ZXing/ZXMultiFormatReader.mm
index ba96e68c8..992b5eb3a 100644
--- a/objc/src/ZXing/ZXMultiFormatReader.mm
+++ b/objc/src/ZXing/ZXMultiFormatReader.mm
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#import <zxing/MultiFormatReader.h>
 #import <ZXing/ZXMultiFormatReader.h>
+#include <zxing/MultiFormatReader.h>
 
 @implementation ZXMultiFormatReader
 
diff --git a/objc/src/ZXing/ZXQRCodeReader.mm b/objc/src/ZXing/ZXQRCodeReader.mm
index 2cc2451f8..9f48c3f71 100644
--- a/objc/src/ZXing/ZXQRCodeReader.mm
+++ b/objc/src/ZXing/ZXQRCodeReader.mm
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#import <zxing/qrcode/QRCodeReader.h>
 #import <ZXing/ZXQRCodeReader.h>
+#include <zxing/qrcode/QRCodeReader.h>
 
 @implementation ZXQRCodeReader
 
diff --git a/objc/src/ZXing/ZXReader.h b/objc/src/ZXing/ZXReader.h
index 8bd2123f4..1f9ed1de0 100644
--- a/objc/src/ZXing/ZXReader.h
+++ b/objc/src/ZXing/ZXReader.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#import <zxing/Reader.h>
+#include <zxing/Reader.h>
 
 @class ZXBinaryBitmap;
 @class ZXDecodeHints;
diff --git a/objc/src/ZXing/ZXReader.mm b/objc/src/ZXing/ZXReader.mm
index 4c7133da0..a82439129 100644
--- a/objc/src/ZXing/ZXReader.mm
+++ b/objc/src/ZXing/ZXReader.mm
@@ -16,12 +16,12 @@
  */
 
 #import <ZXing/ZXReader.h>
+#include <zxing/common/IllegalArgumentException.h>
+#include <zxing/ReaderException.h>
 #import <ZXing/ZXResult.h>
 #import <ZXing/ZXBinaryBitmap.h>
 #import <ZXing/ZXDecodeHints.h>
-#import <zxing/ReaderException.h>
 #import <ZXing/ZXReaderException.h>
-#import <zxing/common/IllegalArgumentException.h>
 #import <ZXing/ZXIllegalArgumentException.h>
 
 @implementation ZXReader
diff --git a/objc/src/ZXing/ZXResult.h b/objc/src/ZXing/ZXResult.h
index 5c67b668f..7fd4ef723 100644
--- a/objc/src/ZXing/ZXResult.h
+++ b/objc/src/ZXing/ZXResult.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#import <zxing/Result.h>
+#include <zxing/Result.h>
 
 @interface ZXResult : NSObject {
   zxing::Ref<zxing::Result> native;