diff --git a/src/zxing/zxing/BarcodeFormat.h b/src/zxing/zxing/BarcodeFormat.h
index 25d92a6..fedb327 100644
--- a/src/zxing/zxing/BarcodeFormat.h
+++ b/src/zxing/zxing/BarcodeFormat.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __BARCODE_FORMAT_H__
-#define __BARCODE_FORMAT_H__
+#ifndef ZXING_BARCODE_FORMAT_H
+#define ZXING_BARCODE_FORMAT_H
 
 /*
  *  BarcodeFormat.h
@@ -58,4 +58,4 @@ public:
 
 }
 
-#endif // __BARCODE_FORMAT_H__
+#endif // ZXING_BARCODE_FORMAT_H
diff --git a/src/zxing/zxing/BinaryBitmap.h b/src/zxing/zxing/BinaryBitmap.h
index 00012ee..92e830e 100644
--- a/src/zxing/zxing/BinaryBitmap.h
+++ b/src/zxing/zxing/BinaryBitmap.h
@@ -1,5 +1,5 @@
-#ifndef __BINARYBITMAP_H__
-#define __BINARYBITMAP_H__
+#ifndef ZXING_BINARYBITMAP_H
+#define ZXING_BINARYBITMAP_H
 
 /*
  *  BinaryBitmap.h
@@ -53,4 +53,4 @@ namespace zxing {
 	
 }
 
-#endif /* BINARYBITMAP_H_ */
+#endif /* ZXING_BINARYBITMAP_H */
diff --git a/src/zxing/zxing/ChecksumException.h b/src/zxing/zxing/ChecksumException.h
index 77f4dfd..07e9502 100644
--- a/src/zxing/zxing/ChecksumException.h
+++ b/src/zxing/zxing/ChecksumException.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __CHECKSUM_EXCEPTION_H__
-#define __NOT_FOUND_EXCEPTION_H__
+#ifndef ZXING_CHECKSUM_EXCEPTION_H
+#define ZXING_CHECKSUM_EXCEPTION_H
 
 /*
  * Copyright 20011 ZXing authors
@@ -31,4 +31,4 @@ namespace zxing {
   };
 }
 
-#endif // __CHECKSUM_EXCEPTION_H__
+#endif // ZXING_CHECKSUM_EXCEPTION_H
diff --git a/src/zxing/zxing/DecodeHints.h b/src/zxing/zxing/DecodeHints.h
index d11cfa3..b39c5b5 100644
--- a/src/zxing/zxing/DecodeHints.h
+++ b/src/zxing/zxing/DecodeHints.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __DECODEHINTS_H_
-#define __DECODEHINTS_H_
+#ifndef ZXING_DECODEHINTS_H
+#define ZXING_DECODEHINTS_H
 /*
  *  DecodeHintType.h
  *  zxing
@@ -85,4 +85,5 @@ class DecodeHints {
 
 }
 
-#endif
+#endif // ZXING_DECODEHINTS_H
+
diff --git a/src/zxing/zxing/Exception.h b/src/zxing/zxing/Exception.h
index f0df1e5..bedc469 100644
--- a/src/zxing/zxing/Exception.h
+++ b/src/zxing/zxing/Exception.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __EXCEPTION_H__
-#define __EXCEPTION_H__
+#ifndef ZXING_EXCEPTION_H
+#define ZXING_EXCEPTION_H
 
 /*
  *  Exception.h
@@ -48,4 +48,4 @@ private:
 
 }
 
-#endif // __EXCEPTION_H__
+#endif // ZXING_EXCEPTION_H
diff --git a/src/zxing/zxing/FormatException.h b/src/zxing/zxing/FormatException.h
index 090d79c..e0a2f10 100644
--- a/src/zxing/zxing/FormatException.h
+++ b/src/zxing/zxing/FormatException.h
@@ -1,5 +1,5 @@
-#ifndef __FORMAT_EXCEPTION_H__
-#define __FORMAT_EXCEPTION_H__
+#ifndef ZXING_FORMAT_EXCEPTION_H
+#define ZXING_FORMAT_EXCEPTION_H
 
 /*
  *  FormatException.h
@@ -34,4 +34,4 @@ public:
 };
 
 }
-#endif // __FORMAT_EXCEPTION_H__
+#endif // ZXING_FORMAT_EXCEPTION_H
diff --git a/src/zxing/zxing/IllegalStateException.h b/src/zxing/zxing/IllegalStateException.h
index dfaf5f3..dbe50f9 100644
--- a/src/zxing/zxing/IllegalStateException.h
+++ b/src/zxing/zxing/IllegalStateException.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __ILLEGAL_STATE_EXCEPTION_H__
-#define __ILLEGAL_STATE_EXCEPTION_H__
+#ifndef ZXING_ILLEGAL_STATE_EXCEPTION_H
+#define ZXING_ILLEGAL_STATE_EXCEPTION_H
 
 /*
  * Copyright 20011 ZXing authors
@@ -32,4 +32,4 @@ public:
 
 }
 
-#endif // __ILLEGAL_STATE_EXCEPTION_H__
+#endif // ZXING_ILLEGAL_STATE_EXCEPTION_H
diff --git a/src/zxing/zxing/InvertedLuminanceSource.h b/src/zxing/zxing/InvertedLuminanceSource.h
index a3f7fbe..1200fca 100644
--- a/src/zxing/zxing/InvertedLuminanceSource.h
+++ b/src/zxing/zxing/InvertedLuminanceSource.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __INVERTEDLUMINANCESOURCE_H__
-#define __INVERTEDLUMINANCESOURCE_H__
+#ifndef ZXING_INVERTEDLUMINANCESOURCE_H
+#define ZXING_INVERTEDLUMINANCESOURCE_H
 /*
  *  Copyright 2013 ZXing authors All rights reserved.
  *
@@ -45,4 +45,4 @@ public:
 
 }
 
-#endif /* INVERTEDLUMINANCESOURCE_H_ */
+#endif // ZXING_INVERTEDLUMINANCESOURCE_H
diff --git a/src/zxing/zxing/LuminanceSource.h b/src/zxing/zxing/LuminanceSource.h
index dfe4051..889bf58 100644
--- a/src/zxing/zxing/LuminanceSource.h
+++ b/src/zxing/zxing/LuminanceSource.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __LUMINANCESOURCE_H__
-#define __LUMINANCESOURCE_H__
+#ifndef ZXING_LUMINANCESOURCE_H
+#define ZXING_LUMINANCESOURCE_H
 /*
  *  LuminanceSource.h
  *  zxing
@@ -59,4 +59,4 @@ class LuminanceSource : public Counted {
 
 }
 
-#endif /* LUMINANCESOURCE_H_ */
+#endif // ZXING_LUMINANCESOURCE_H
diff --git a/src/zxing/zxing/MultiFormatReader.h b/src/zxing/zxing/MultiFormatReader.h
index af07899..13a0d41 100644
--- a/src/zxing/zxing/MultiFormatReader.h
+++ b/src/zxing/zxing/MultiFormatReader.h
@@ -1,5 +1,5 @@
-#ifndef __MULTI_FORMAT_READER_H__
-#define __MULTI_FORMAT_READER_H__
+#ifndef ZXING_MULTI_FORMAT_READER_H
+#define ZXING_MULTI_FORMAT_READER_H
 
 /*
  *  MultiFormatBarcodeReader.h
@@ -45,4 +45,5 @@ namespace zxing {
   };
 }
 
-#endif
+#endif // ZXING_MULTI_FORMAT_READER_H
+
diff --git a/src/zxing/zxing/NotFoundException.h b/src/zxing/zxing/NotFoundException.h
index d443362..695ce94 100644
--- a/src/zxing/zxing/NotFoundException.h
+++ b/src/zxing/zxing/NotFoundException.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __NOT_FOUND_EXCEPTION_H__
-#define __NOT_FOUND_EXCEPTION_H__
+#ifndef ZXING_NOT_FOUND_EXCEPTION_H
+#define ZXING_NOT_FOUND_EXCEPTION_H
 
 /*
  * Copyright 20011 ZXing authors
@@ -32,4 +32,4 @@ public:
 
 }
 
-#endif // __NOT_FOUND_EXCEPTION_H__
+#endif // ZXING_NOT_FOUND_EXCEPTION_H
diff --git a/src/zxing/zxing/Reader.h b/src/zxing/zxing/Reader.h
index 05c741b..9725664 100644
--- a/src/zxing/zxing/Reader.h
+++ b/src/zxing/zxing/Reader.h
@@ -1,5 +1,5 @@
-#ifndef __READER_H__
-#define __READER_H__
+#ifndef ZXING_READER_H
+#define ZXING_READER_H
 
 /*
  *  Reader.h
@@ -37,4 +37,4 @@ namespace zxing {
 
 }
 
-#endif // __READER_H__
+#endif // ZXING_READER_H
diff --git a/src/zxing/zxing/ReaderException.h b/src/zxing/zxing/ReaderException.h
index b09aea3..804dde4 100644
--- a/src/zxing/zxing/ReaderException.h
+++ b/src/zxing/zxing/ReaderException.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __READER_EXCEPTION_H__
-#define __READER_EXCEPTION_H__
+#ifndef ZXING_READER_EXCEPTION_H
+#define ZXING_READER_EXCEPTION_H
 
 /*
  *  ReaderException.h
@@ -34,4 +34,4 @@ class ReaderException : public Exception {
 
 }
 
-#endif // __READER_EXCEPTION_H__
+#endif // ZXING_READER_EXCEPTION_H
diff --git a/src/zxing/zxing/Result.h b/src/zxing/zxing/Result.h
index c5ee04c..c7ba578 100644
--- a/src/zxing/zxing/Result.h
+++ b/src/zxing/zxing/Result.h
@@ -1,5 +1,5 @@
-#ifndef __RESULT_H__
-#define __RESULT_H__
+#ifndef ZXING_RESULT_H
+#define ZXING_RESULT_H
 
 /*
  *  Result.h
@@ -55,4 +55,4 @@ public:
 };
 
 }
-#endif // __RESULT_H__
+#endif // ZXING_RESULT_H
diff --git a/src/zxing/zxing/ResultPoint.h b/src/zxing/zxing/ResultPoint.h
index d2d6eae..5934485 100644
--- a/src/zxing/zxing/ResultPoint.h
+++ b/src/zxing/zxing/ResultPoint.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __RESULT_POINT_H__
-#define __RESULT_POINT_H__
+#ifndef ZXING_RESULT_POINT_H
+#define ZXING_RESULT_POINT_H
 
 /*
  *  ResultPoint.h
@@ -52,4 +52,4 @@ private:
 
 }
 
-#endif // __RESULT_POINT_H__
+#endif // ZXING_RESULT_POINT_H
diff --git a/src/zxing/zxing/ResultPointCallback.h b/src/zxing/zxing/ResultPointCallback.h
index 2687656..59e3220 100644
--- a/src/zxing/zxing/ResultPointCallback.h
+++ b/src/zxing/zxing/ResultPointCallback.h
@@ -1,5 +1,5 @@
-#ifndef __RESULT_POINT_CALLBACK_H__
-#define __RESULT_POINT_CALLBACK_H__
+#ifndef ZXING_RESULT_POINT_CALLBACK_H
+#define ZXING_RESULT_POINT_CALLBACK_H
 
 /*
  *  ResultPointCallback.h
@@ -36,4 +36,4 @@ public:
 
 }
 
-#endif // __RESULT_POINT_CALLBACK_H__
+#endif // ZXING_RESULT_POINT_CALLBACK_H
diff --git a/src/zxing/zxing/ZXing.h b/src/zxing/zxing/ZXing.h
index 6d95f2d..cbca440 100644
--- a/src/zxing/zxing/ZXing.h
+++ b/src/zxing/zxing/ZXing.h
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __ZXING_H_
-#define __ZXING_H_
+#ifndef ZXING_H
+#define ZXING_H
 
 #define ZXING_ARRAY_LEN(v) ((int)(sizeof(v)/sizeof(v[0])))
 #define ZX_LOG_DIGITS(digits) \
diff --git a/src/zxing/zxing/aztec/decoder/Decoder.h b/src/zxing/zxing/aztec/decoder/Decoder.h
index d9f5cce..6798b21 100644
--- a/src/zxing/zxing/aztec/decoder/Decoder.h
+++ b/src/zxing/zxing/aztec/decoder/Decoder.h
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef __ZXING_AZTEC_DECODER_DECODER_H__
-#define __ZXING_AZTEC_DECODER_DECODER_H__
+#ifndef ZXING_AZTEC_DECODER_DECODER_H
+#define ZXING_AZTEC_DECODER_DECODER_H
 
 #include <zxing/common/BitMatrix.h>
 #include <zxing/common/Str.h>
@@ -66,4 +66,4 @@ class Decoder : public Counted {
 }
 }
 
-#endif
+#endif // ZXING_AZTEC_DECODER_DECODER_H
diff --git a/src/zxing/zxing/aztec/detector/Detector.h b/src/zxing/zxing/aztec/detector/Detector.h
index 65414ad..0fe6037 100644
--- a/src/zxing/zxing/aztec/detector/Detector.h
+++ b/src/zxing/zxing/aztec/detector/Detector.h
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef __ZXING_AZTEC_DETECTOR_DETECTOR_H__
-#define __ZXING_AZTEC_DETECTOR_DETECTOR_H__
+#ifndef ZXING_AZTEC_DETECTOR_DETECTOR_H
+#define ZXING_AZTEC_DETECTOR_DETECTOR_H
 
 #include <vector>
 
@@ -89,4 +89,4 @@ class Detector : public Counted {
 }
 }
 
-#endif
+#endif // ZXING_AZTEC_DETECTOR_DETECTOR_H
diff --git a/src/zxing/zxing/common/Array.h b/src/zxing/zxing/common/Array.h
index 6f087eb..af3a521 100644
--- a/src/zxing/zxing/common/Array.h
+++ b/src/zxing/zxing/common/Array.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __ARRAY_H__
-#define __ARRAY_H__
+#ifndef ZXING_ARRAY_H
+#define ZXING_ARRAY_H
 
 /*
  *  Array.h
@@ -170,4 +170,4 @@ public:
 
 } // namespace zxing
 
-#endif // __ARRAY_H__
+#endif // ZXING_ARRAY_H
diff --git a/src/zxing/zxing/common/BitArray.h b/src/zxing/zxing/common/BitArray.h
index f7e57dc..1c9a709 100644
--- a/src/zxing/zxing/common/BitArray.h
+++ b/src/zxing/zxing/common/BitArray.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __BIT_ARRAY_H__
-#define __BIT_ARRAY_H__
+#ifndef ZXING_BIT_ARRAY_H
+#define ZXING_BIT_ARRAY_H
 
 /*
  *  Copyright 2010 ZXing authors. All rights reserved.
@@ -100,4 +100,4 @@ std::ostream& operator << (std::ostream&, BitArray const&);
 
 }
 
-#endif // __BIT_ARRAY_H__
+#endif // ZXING_BIT_ARRAY_H
diff --git a/src/zxing/zxing/common/BitMatrix.h b/src/zxing/zxing/common/BitMatrix.h
index 5b6c6df..42bd9bc 100644
--- a/src/zxing/zxing/common/BitMatrix.h
+++ b/src/zxing/zxing/common/BitMatrix.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __BIT_MATRIX_H__
-#define __BIT_MATRIX_H__
+#ifndef ZXING_BIT_MATRIX_H
+#define ZXING_BIT_MATRIX_H
 
 /*
  *  BitMatrix.h
@@ -81,4 +81,4 @@ private:
 
 }
 
-#endif // __BIT_MATRIX_H__
+#endif // ZXING_BIT_MATRIX_H
diff --git a/src/zxing/zxing/common/BitSource.h b/src/zxing/zxing/common/BitSource.h
index fb3d930..5566776 100644
--- a/src/zxing/zxing/common/BitSource.h
+++ b/src/zxing/zxing/common/BitSource.h
@@ -1,5 +1,5 @@
-#ifndef __BIT_SOURCE_H__
-#define __BIT_SOURCE_H__
+#ifndef ZXING_BIT_SOURCE_H
+#define ZXING_BIT_SOURCE_H
 
 /*
  *  BitSource.h
@@ -71,4 +71,4 @@ public:
 
 }
 
-#endif // __BIT_SOURCE_H__
+#endif // ZXING_BIT_SOURCE_H
diff --git a/src/zxing/zxing/common/CharacterSetECI.h b/src/zxing/zxing/common/CharacterSetECI.h
index 4a8c0c1..120e2af 100644
--- a/src/zxing/zxing/common/CharacterSetECI.h
+++ b/src/zxing/zxing/common/CharacterSetECI.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __CHARACTERSET_ECI__
-#define __CHARACTERSET_ECI__
+#ifndef ZXING_CHARACTERSET_ECI
+#define ZXING_CHARACTERSET_ECI
 
 /*
  * Copyright 2008-2011 ZXing authors
@@ -54,4 +54,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_CHARACTERSET_ECI
+
diff --git a/src/zxing/zxing/common/Counted.h b/src/zxing/zxing/common/Counted.h
index 41ac5ec..a52607c 100644
--- a/src/zxing/zxing/common/Counted.h
+++ b/src/zxing/zxing/common/Counted.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __COUNTED_H__
-#define __COUNTED_H__
+#ifndef ZXING_COUNTED_H
+#define ZXING_COUNTED_H
 
 /*
  *  Copyright 2010 ZXing authors All rights reserved.
@@ -137,4 +137,4 @@ public:
 
 }
 
-#endif // __COUNTED_H__
+#endif // ZXING_COUNTED_H
diff --git a/src/zxing/zxing/common/DecoderResult.h b/src/zxing/zxing/common/DecoderResult.h
index a31e5f1..a555fa9 100644
--- a/src/zxing/zxing/common/DecoderResult.h
+++ b/src/zxing/zxing/common/DecoderResult.h
@@ -1,5 +1,5 @@
-#ifndef __DECODER_RESULT_H__
-#define __DECODER_RESULT_H__
+#ifndef ZXING_DECODER_RESULT_H
+#define ZXING_DECODER_RESULT_H
 
 /*
  *  DecoderResult.h
@@ -52,4 +52,4 @@ public:
 
 }
 
-#endif // __DECODER_RESULT_H__
+#endif // ZXING_DECODER_RESULT_H
diff --git a/src/zxing/zxing/common/DetectorResult.h b/src/zxing/zxing/common/DetectorResult.h
index 26b633a..9ae94b9 100644
--- a/src/zxing/zxing/common/DetectorResult.h
+++ b/src/zxing/zxing/common/DetectorResult.h
@@ -1,5 +1,5 @@
-#ifndef __DETECTOR_RESULT_H__
-#define __DETECTOR_RESULT_H__
+#ifndef ZXING_DETECTOR_RESULT_H
+#define ZXING_DETECTOR_RESULT_H
 
 /*
  *  DetectorResult.h
@@ -40,4 +40,4 @@ public:
 
 }
 
-#endif // __DETECTOR_RESULT_H__
+#endif // ZXING_DETECTOR_RESULT_H
diff --git a/src/zxing/zxing/common/GlobalHistogramBinarizer.h b/src/zxing/zxing/common/GlobalHistogramBinarizer.h
index e60e7fc..c65391c 100644
--- a/src/zxing/zxing/common/GlobalHistogramBinarizer.h
+++ b/src/zxing/zxing/common/GlobalHistogramBinarizer.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __GLOBALHISTOGRAMBINARIZER_H__
-#define __GLOBALHISTOGRAMBINARIZER_H__
+#ifndef ZXING_GLOBALHISTOGRAMBINARIZER_H
+#define ZXING_GLOBALHISTOGRAMBINARIZER_H
 /*
  *  GlobalHistogramBinarizer.h
  *  zxing
@@ -45,4 +45,4 @@ private:
 
 }
 	
-#endif /* GLOBALHISTOGRAMBINARIZER_H_ */
+#endif /* ZXING_GLOBALHISTOGRAMBINARIZER_H */
diff --git a/src/zxing/zxing/common/GreyscaleLuminanceSource.h b/src/zxing/zxing/common/GreyscaleLuminanceSource.h
index 20ae936..4c78257 100644
--- a/src/zxing/zxing/common/GreyscaleLuminanceSource.h
+++ b/src/zxing/zxing/common/GreyscaleLuminanceSource.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __GREYSCALE_LUMINANCE_SOURCE__
-#define __GREYSCALE_LUMINANCE_SOURCE__
+#ifndef ZXING_GREYSCALE_LUMINANCE_SOURCE
+#define ZXING_GREYSCALE_LUMINANCE_SOURCE
 /*
  *  GreyscaleLuminanceSource.h
  *  zxing
@@ -50,4 +50,4 @@ public:
 
 }
 
-#endif
+#endif // ZXING_GREYSCALE_LUMINANCE_SOURCE
diff --git a/src/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h b/src/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h
index 2ef8287..efd60dc 100644
--- a/src/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h
+++ b/src/zxing/zxing/common/GreyscaleRotatedLuminanceSource.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __GREYSCALE_ROTATED_LUMINANCE_SOURCE__
-#define __GREYSCALE_ROTATED_LUMINANCE_SOURCE__
+#ifndef ZXING_GREYSCALE_ROTATED_LUMINANCE_SOURCE
+#define ZXING_GREYSCALE_ROTATED_LUMINANCE_SOURCE
 /*
  *  GreyscaleRotatedLuminanceSource.h
  *  zxing
@@ -43,4 +43,4 @@ public:
 
 }
 
-#endif
+#endif // ZXING_GREYSCALE_ROTATED_LUMINANCE_SOURCE
diff --git a/src/zxing/zxing/common/GridSampler.h b/src/zxing/zxing/common/GridSampler.h
index d7f74e5..5014bdd 100644
--- a/src/zxing/zxing/common/GridSampler.h
+++ b/src/zxing/zxing/common/GridSampler.h
@@ -1,5 +1,5 @@
-#ifndef __GRID_SAMPLER_H__
-#define __GRID_SAMPLER_H__
+#ifndef ZXING_GRID_SAMPLER_H
+#define ZXING_GRID_SAMPLER_H
 
 /*
  *  GridSampler.h
@@ -42,4 +42,4 @@ public:
 };
 }
 
-#endif // __GRID_SAMPLER_H__
+#endif // ZXING_GRID_SAMPLER_H
diff --git a/src/zxing/zxing/common/HybridBinarizer.h b/src/zxing/zxing/common/HybridBinarizer.h
index b85c4b0..9d1c7f6 100644
--- a/src/zxing/zxing/common/HybridBinarizer.h
+++ b/src/zxing/zxing/common/HybridBinarizer.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __HYBRIDBINARIZER_H__
-#define __HYBRIDBINARIZER_H__
+#ifndef ZXING_HYBRIDBINARIZER_H
+#define ZXING_HYBRIDBINARIZER_H
 /*
  *  HybridBinarizer.h
  *  zxing
@@ -64,4 +64,4 @@ namespace zxing {
 
 }
 
-#endif
+#endif // ZXING_HYBRIDBINARIZER_H
diff --git a/src/zxing/zxing/common/IllegalArgumentException.h b/src/zxing/zxing/common/IllegalArgumentException.h
index 735ab06..4a74b6b 100644
--- a/src/zxing/zxing/common/IllegalArgumentException.h
+++ b/src/zxing/zxing/common/IllegalArgumentException.h
@@ -1,5 +1,5 @@
-#ifndef __ILLEGAL_ARGUMENT_EXCEPTION_H__
-#define __ILLEGAL_ARGUMENT_EXCEPTION_H__
+#ifndef ZXING_ILLEGAL_ARGUMENT_EXCEPTION_H
+#define ZXING_ILLEGAL_ARGUMENT_EXCEPTION_H
 
 /*
  *  IllegalArgumentException.h
@@ -33,4 +33,4 @@ public:
 
 }
 
-#endif // __ILLEGAL_ARGUMENT_EXCEPTION_H__
+#endif // ZXING_ILLEGAL_ARGUMENT_EXCEPTION_H
diff --git a/src/zxing/zxing/common/PerspectiveTransform.h b/src/zxing/zxing/common/PerspectiveTransform.h
index 43b7fa1..217abe9 100644
--- a/src/zxing/zxing/common/PerspectiveTransform.h
+++ b/src/zxing/zxing/common/PerspectiveTransform.h
@@ -1,5 +1,5 @@
-#ifndef __PERSPECTIVE_TANSFORM_H__
-#define __PERSPECTIVE_TANSFORM_H__
+#ifndef ZXING_PERSPECTIVE_TANSFORM_H
+#define ZXING_PERSPECTIVE_TANSFORM_H
 
 /*
  *  PerspectiveTransform.h
@@ -46,4 +46,4 @@ public:
 };
 }
 
-#endif // __PERSPECTIVE_TANSFORM_H__
+#endif // ZXING_PERSPECTIVE_TANSFORM_H
diff --git a/src/zxing/zxing/common/Point.h b/src/zxing/zxing/common/Point.h
index cae032b..036eea7 100644
--- a/src/zxing/zxing/common/Point.h
+++ b/src/zxing/zxing/common/Point.h
@@ -1,5 +1,5 @@
-#ifndef __POINT_H__
-#define __POINT_H__
+#ifndef ZXING_POINT_H
+#define ZXING_POINT_H
 
 /*
  *  Point.h
@@ -44,4 +44,4 @@ public:
   Point end;
 };
 }
-#endif // POINT_H_
+#endif // ZXING_POINT_H
diff --git a/src/zxing/zxing/common/Str.h b/src/zxing/zxing/common/Str.h
index adc8d4e..8e8c8b3 100644
--- a/src/zxing/zxing/common/Str.h
+++ b/src/zxing/zxing/common/Str.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __STR_H__
-#define __STR_H__
+#ifndef ZXING_STR_H
+#define ZXING_STR_H
 
 /*
  *  Str.h
@@ -48,4 +48,4 @@ public:
 
 }
 
-#endif // __COMMON__STRING_H__
+#endif // ZXING_STR_H
diff --git a/src/zxing/zxing/common/StringUtils.h b/src/zxing/zxing/common/StringUtils.h
index 703e699..efa2555 100644
--- a/src/zxing/zxing/common/StringUtils.h
+++ b/src/zxing/zxing/common/StringUtils.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __STRING_UTILS__
-#define __STRING_UTILS__
+#ifndef ZXING_STRING_UTILS_H
+#define ZXING_STRING_UTILS_H
 
 /*
  * Copyright (C) 2010-2011 ZXing authors
@@ -52,4 +52,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_STRING_UTILS_H
+
diff --git a/src/zxing/zxing/common/Types.h b/src/zxing/zxing/common/Types.h
index 30806b1..cecffe9 100644
--- a/src/zxing/zxing/common/Types.h
+++ b/src/zxing/zxing/common/Types.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __TYPES_H__
-#define __TYPES_H__
+#ifndef ZXING_TYPES_H
+#define ZXING_TYPES_H
 
 #include <string>
 #include <iostream>
@@ -13,4 +13,4 @@ typedef bool boolean;
 
 }
 
-#endif // __COMMON__TYPES_H__
+#endif // ZXING_TYPES_H
diff --git a/src/zxing/zxing/common/detector/JavaMath.h b/src/zxing/zxing/common/detector/JavaMath.h
index ce99ab7..d6530a5 100644
--- a/src/zxing/zxing/common/detector/JavaMath.h
+++ b/src/zxing/zxing/common/detector/JavaMath.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __ZXING_COMMON_DETECTOR_MATH_H__
-#define __ZXING_COMMON_DETECTOR_MATH_H__
+#ifndef ZXING_COMMON_DETECTOR_MATH_H
+#define ZXING_COMMON_DETECTOR_MATH_H
 /*
  *  Copyright 2012 ZXing authors All rights reserved.
  *
@@ -40,4 +40,5 @@ class Math {
 }
 }
 
-#endif
+#endif // ZXING_COMMON_DETECTOR_MATH_H
+
diff --git a/src/zxing/zxing/common/detector/MathUtils.h b/src/zxing/zxing/common/detector/MathUtils.h
index 5884566..900e33c 100644
--- a/src/zxing/zxing/common/detector/MathUtils.h
+++ b/src/zxing/zxing/common/detector/MathUtils.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __ZXING_COMMON_DETECTOR_MATHUTILS_H__
-#define __ZXING_COMMON_DETECTOR_MATHUTILS_H__
+#ifndef ZXING_COMMON_DETECTOR_MATHUTILS_H
+#define ZXING_COMMON_DETECTOR_MATHUTILS_H
 /*
  *  Copyright 2012 ZXing authors All rights reserved.
  *
@@ -54,4 +54,5 @@ class MathUtils {
 }
 }
 
-#endif
+#endif // ZXING_COMMON_DETECTOR_MATHUTILS_H
+
diff --git a/src/zxing/zxing/common/detector/MonochromeRectangleDetector.h b/src/zxing/zxing/common/detector/MonochromeRectangleDetector.h
index f32c99d..c26a62c 100644
--- a/src/zxing/zxing/common/detector/MonochromeRectangleDetector.h
+++ b/src/zxing/zxing/common/detector/MonochromeRectangleDetector.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __MONOCHROMERECTANGLEDETECTOR_H__
-#define __MONOCHROMERECTANGLEDETECTOR_H__
+#ifndef ZXING_MONOCHROMERECTANGLEDETECTOR_H
+#define ZXING_MONOCHROMERECTANGLEDETECTOR_H
 
 /*
  *  MonochromeRectangleDetector.h
@@ -59,4 +59,4 @@ class MonochromeRectangleDetector : public Counted {
 
 }
 
-#endif // __MONOCHROMERECTANGLEDETECTOR_H__
+#endif // ZXING_MONOCHROMERECTANGLEDETECTOR_H
diff --git a/src/zxing/zxing/common/detector/WhiteRectangleDetector.h b/src/zxing/zxing/common/detector/WhiteRectangleDetector.h
index 9180806..d043e85 100644
--- a/src/zxing/zxing/common/detector/WhiteRectangleDetector.h
+++ b/src/zxing/zxing/common/detector/WhiteRectangleDetector.h
@@ -1,5 +1,5 @@
-#ifndef __WHITERECTANGLEDETECTOR_H__
-#define __WHITERECTANGLEDETECTOR_H__
+#ifndef ZXING_WHITERECTANGLEDETECTOR_H
+#define ZXING_WHITERECTANGLEDETECTOR_H
 
 /*
  *  WhiteRectangleDetector.h
@@ -56,4 +56,5 @@ class WhiteRectangleDetector : public Counted {
 };
 }
 
-#endif
+#endif // ZXING_WHITERECTANGLEDETECTOR_H
+
diff --git a/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h b/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h
index 296a479..80f70a5 100644
--- a/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h
+++ b/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h
@@ -1,5 +1,5 @@
-#ifndef __REED_SOLOMON_DECODER_H__
-#define __REED_SOLOMON_DECODER_H__
+#ifndef ZXING_REED_SOLOMON_DECODER_H
+#define ZXING_REED_SOLOMON_DECODER_H
 
 /*
  *  ReedSolomonDecoder.h
@@ -46,4 +46,4 @@ private:
 };
 }
 
-#endif // __REED_SOLOMON_DECODER_H__
+#endif // ZXING_REED_SOLOMON_DECODER_H
diff --git a/src/zxing/zxing/common/reedsolomon/ReedSolomonException.h b/src/zxing/zxing/common/reedsolomon/ReedSolomonException.h
index 1c01250..b707b6d 100644
--- a/src/zxing/zxing/common/reedsolomon/ReedSolomonException.h
+++ b/src/zxing/zxing/common/reedsolomon/ReedSolomonException.h
@@ -1,5 +1,5 @@
-#ifndef __REED_SOLOMON_EXCEPTION_H__
-#define __REED_SOLOMON_EXCEPTION_H__
+#ifndef ZXING_REED_SOLOMON_EXCEPTION_H
+#define ZXING_REED_SOLOMON_EXCEPTION_H
 
 /*
  *  ReedSolomonException.h
@@ -30,4 +30,4 @@ public:
 };
 }
 
-#endif // __REED_SOLOMON_EXCEPTION_H__
+#endif // ZXING_REED_SOLOMON_EXCEPTION_H
diff --git a/src/zxing/zxing/datamatrix/DataMatrixReader.h b/src/zxing/zxing/datamatrix/DataMatrixReader.h
index e266739..06f8adc 100644
--- a/src/zxing/zxing/datamatrix/DataMatrixReader.h
+++ b/src/zxing/zxing/datamatrix/DataMatrixReader.h
@@ -1,5 +1,5 @@
-#ifndef __DATA_MATRIX_READER_H__
-#define __DATA_MATRIX_READER_H__
+#ifndef ZXING_DATA_MATRIX_READER_H
+#define ZXING_DATA_MATRIX_READER_H
 
 /*
  *  DataMatrixReader.h
@@ -42,4 +42,4 @@ public:
 }
 }
 
-#endif // __DATA_MATRIX_READER_H__
+#endif // ZXING_DATA_MATRIX_READER_H
diff --git a/src/zxing/zxing/datamatrix/Version.h b/src/zxing/zxing/datamatrix/Version.h
index d8523fe..8412c75 100644
--- a/src/zxing/zxing/datamatrix/Version.h
+++ b/src/zxing/zxing/datamatrix/Version.h
@@ -1,5 +1,5 @@
-#ifndef __VERSION_H__
-#define __VERSION_H__
+#ifndef ZXING_VERSION_H
+#define ZXING_VERSION_H
 
 /*
  *  Version.h
@@ -84,4 +84,4 @@ private:
 }
 }
 
-#endif // __VERSION_H__
+#endif // ZXING_VERSION_H
diff --git a/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h b/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h
index 37c4514..78dcf26 100644
--- a/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h
+++ b/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h
@@ -1,5 +1,5 @@
-#ifndef __BIT_MATRIX_PARSER_DM_H__
-#define __BIT_MATRIX_PARSER_DM_H__
+#ifndef ZXING_BIT_MATRIX_PARSER_DM_H
+#define ZXING_BIT_MATRIX_PARSER_DM_H
 
 /*
  *  BitMatrixParser.h
@@ -56,4 +56,4 @@ private:
 }
 }
 
-#endif // __BIT_MATRIX_PARSER_DM_H__
+#endif // ZXING_BIT_MATRIX_PARSER_DM_H
diff --git a/src/zxing/zxing/datamatrix/decoder/DataBlock.h b/src/zxing/zxing/datamatrix/decoder/DataBlock.h
index 9ff8dc3..ea82dc0 100644
--- a/src/zxing/zxing/datamatrix/decoder/DataBlock.h
+++ b/src/zxing/zxing/datamatrix/decoder/DataBlock.h
@@ -1,5 +1,5 @@
-#ifndef __DATA_BLOCK_DM_H__
-#define __DATA_BLOCK_DM_H__
+#ifndef ZXING_DATA_BLOCK_DM_H
+#define ZXING_DATA_BLOCK_DM_H
 
 /*
  *  DataBlock.h
@@ -46,4 +46,4 @@ public:
 }
 }
 
-#endif // __DATA_BLOCK_DM_H__
+#endif // ZXING_DATA_BLOCK_DM_H
diff --git a/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h b/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h
index 7ee2a6e..301fb64 100644
--- a/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h
+++ b/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h
@@ -1,5 +1,5 @@
-#ifndef __DECODED_BIT_STREAM_PARSER_DM_H__
-#define __DECODED_BIT_STREAM_PARSER_DM_H__
+#ifndef ZXING_DECODED_BIT_STREAM_PARSER_DM_H
+#define ZXING_DECODED_BIT_STREAM_PARSER_DM_H
 
 /*
  *  DecodedBitStreamParser.h
@@ -90,15 +90,16 @@ private:
     int pseudoRandomNumber = ((149 * base256CodewordPosition) % 255) + 1;
     int tempVariable = randomizedBase256Codeword - pseudoRandomNumber;
     return (byte) (tempVariable >= 0 ? tempVariable : (tempVariable + 256));
-  };
+  }
+
   void append(std::ostream &ost, const char *bufIn, size_t nIn, const char *src);
 
 public:
-  DecodedBitStreamParser() { };
+  DecodedBitStreamParser() { }
   Ref<DecoderResult> decode(ArrayRef<byte> bytes);
 };
 
 }
 }
 
-#endif // __DECODED_BIT_STREAM_PARSER_DM_H__
+#endif // ZXING_DECODED_BIT_STREAM_PARSER_DM_H
diff --git a/src/zxing/zxing/datamatrix/decoder/Decoder.h b/src/zxing/zxing/datamatrix/decoder/Decoder.h
index 31c0743..95d7cc3 100644
--- a/src/zxing/zxing/datamatrix/decoder/Decoder.h
+++ b/src/zxing/zxing/datamatrix/decoder/Decoder.h
@@ -1,5 +1,5 @@
-#ifndef __DECODER_DM_H__
-#define __DECODER_DM_H__
+#ifndef ZXING_DECODER_DM_H
+#define ZXING_DECODER_DM_H
 
 /*
  *  Decoder.h
@@ -46,4 +46,4 @@ public:
 }
 }
 
-#endif // __DECODER_DM_H__
+#endif // ZXING_DECODER_DM_H
diff --git a/src/zxing/zxing/datamatrix/detector/CornerPoint.h b/src/zxing/zxing/datamatrix/detector/CornerPoint.h
index cbf2a7e..5f757da 100644
--- a/src/zxing/zxing/datamatrix/detector/CornerPoint.h
+++ b/src/zxing/zxing/datamatrix/detector/CornerPoint.h
@@ -1,5 +1,5 @@
-#ifndef __CORNER_FINDER_H__
-#define __CORNER_FINDER_H__
+#ifndef ZXING_CORNER_FINDER_H
+#define ZXING_CORNER_FINDER_H
 
 /*
  *  CornerPoint.h
@@ -40,4 +40,4 @@ namespace zxing {
 	}
 }
 
-#endif // __CORNER_FINDER_H__
+#endif // ZXING_CORNER_FINDER_H
diff --git a/src/zxing/zxing/datamatrix/detector/Detector.h b/src/zxing/zxing/datamatrix/detector/Detector.h
index 8e0bf06..ab89337 100644
--- a/src/zxing/zxing/datamatrix/detector/Detector.h
+++ b/src/zxing/zxing/datamatrix/detector/Detector.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __DETECTOR_H__
-#define __DETECTOR_H__
+#ifndef ZXING_DETECTOR_H
+#define ZXING_DETECTOR_H
 
 /*
  *  Detector.h
@@ -91,4 +91,4 @@ class Detector: public Counted {
 }
 }
 
-#endif // __DETECTOR_H__
+#endif // ZXING_DETECTOR_H
diff --git a/src/zxing/zxing/multi/ByQuadrantReader.h b/src/zxing/zxing/multi/ByQuadrantReader.h
index 3f7fac6..c61cc41 100644
--- a/src/zxing/zxing/multi/ByQuadrantReader.h
+++ b/src/zxing/zxing/multi/ByQuadrantReader.h
@@ -1,5 +1,5 @@
-#ifndef __BY_QUADRANT_READER_H__
-#define __BY_QUADRANT_READER_H__
+#ifndef ZXING_BY_QUADRANT_READER_H
+#define ZXING_BY_QUADRANT_READER_H
 
 /*
  *  Copyright 2011 ZXing authors All rights reserved.
@@ -39,4 +39,4 @@ class ByQuadrantReader : public Reader {
 }
 }
 
-#endif // __BY_QUADRANT_READER_H__
+#endif // ZXING_BY_QUADRANT_READER_H
diff --git a/src/zxing/zxing/multi/GenericMultipleBarcodeReader.h b/src/zxing/zxing/multi/GenericMultipleBarcodeReader.h
index ff96ab8..3cb78a2 100644
--- a/src/zxing/zxing/multi/GenericMultipleBarcodeReader.h
+++ b/src/zxing/zxing/multi/GenericMultipleBarcodeReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __GENERIC_MULTIPLE_BARCODE_READER_H__
-#define __GENERIC_MULTIPLE_BARCODE_READER_H__
+#ifndef ZXING_GENERIC_MULTIPLE_BARCODE_READER_H
+#define ZXING_GENERIC_MULTIPLE_BARCODE_READER_H
 
 /*
  *  Copyright 2011 ZXing authors All rights reserved.
@@ -48,4 +48,4 @@ class GenericMultipleBarcodeReader : public MultipleBarcodeReader {
 }
 }
 
-#endif // __GENERIC_MULTIPLE_BARCODE_READER_H__
+#endif // ZXING_GENERIC_MULTIPLE_BARCODE_READER_H
diff --git a/src/zxing/zxing/multi/MultipleBarcodeReader.h b/src/zxing/zxing/multi/MultipleBarcodeReader.h
index 9f02adb..d3bd792 100644
--- a/src/zxing/zxing/multi/MultipleBarcodeReader.h
+++ b/src/zxing/zxing/multi/MultipleBarcodeReader.h
@@ -1,5 +1,5 @@
-#ifndef __MULTIPLE_BARCODE_READER_H__
-#define __MULTIPLE_BARCODE_READER_H__
+#ifndef ZXING_MULTIPLE_BARCODE_READER_H
+#define ZXING_MULTIPLE_BARCODE_READER_H
 
 /*
  *  Copyright 2011 ZXing authors All rights reserved.
@@ -38,4 +38,4 @@ class MultipleBarcodeReader : public Counted {
 }
 }
 
-#endif // __MULTIPLE_BARCODE_READER_H__
+#endif // ZXING_MULTIPLE_BARCODE_READER_H
diff --git a/src/zxing/zxing/multi/qrcode/QRCodeMultiReader.h b/src/zxing/zxing/multi/qrcode/QRCodeMultiReader.h
index be17041..c9037e1 100644
--- a/src/zxing/zxing/multi/qrcode/QRCodeMultiReader.h
+++ b/src/zxing/zxing/multi/qrcode/QRCodeMultiReader.h
@@ -1,5 +1,5 @@
-#ifndef __QRCODE_MULTI_READER_H__
-#define __QRCODE_MULTI_READER_H__
+#ifndef ZXING_QRCODE_MULTI_READER_H
+#define ZXING_QRCODE_MULTI_READER_H
 
 /*
  *  Copyright 2011 ZXing authors All rights reserved.
@@ -33,4 +33,4 @@ class QRCodeMultiReader: public zxing::qrcode::QRCodeReader, public MultipleBarc
 }
 }
 
-#endif // __QRCODE_MULTI_READER_H__
+#endif // ZXING_QRCODE_MULTI_READER_H
diff --git a/src/zxing/zxing/multi/qrcode/detector/MultiDetector.h b/src/zxing/zxing/multi/qrcode/detector/MultiDetector.h
index 7c9a189..9ebde86 100644
--- a/src/zxing/zxing/multi/qrcode/detector/MultiDetector.h
+++ b/src/zxing/zxing/multi/qrcode/detector/MultiDetector.h
@@ -1,5 +1,5 @@
-#ifndef __MULTI_DETECTOR_H__
-#define __MULTI_DETECTOR_H__
+#ifndef ZXING_MULTI_DETECTOR_H
+#define ZXING_MULTI_DETECTOR_H
 
 /*
  *  Copyright 2011 ZXing authors
@@ -34,4 +34,4 @@ class MultiDetector : public zxing::qrcode::Detector {
 }
 }
 
-#endif // __MULTI_DETECTOR_H__
+#endif // ZXING_MULTI_DETECTOR_H
diff --git a/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h b/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h
index 4612d72..4e5832d 100644
--- a/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h
+++ b/src/zxing/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h
@@ -1,5 +1,5 @@
-#ifndef __MULTI_FINDER_PATTERN_FINDER_H__
-#define __MULTI_FINDER_PATTERN_FINDER_H__
+#ifndef ZXING_MULTI_FINDER_PATTERN_FINDER_H
+#define ZXING_MULTI_FINDER_PATTERN_FINDER_H
 
 /*
  *  Copyright 2011 ZXing authors
@@ -44,4 +44,4 @@ class MultiFinderPatternFinder : zxing::qrcode::FinderPatternFinder {
 }
 }
 
-#endif // __MULTI_FINDER_PATTERN_FINDER_H__
+#endif // ZXING_MULTI_FINDER_PATTERN_FINDER_H
diff --git a/src/zxing/zxing/oned/CodaBarReader.h b/src/zxing/zxing/oned/CodaBarReader.h
index 14d1eed..e3d4829 100644
--- a/src/zxing/zxing/oned/CodaBarReader.h
+++ b/src/zxing/zxing/oned/CodaBarReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __CODA_BAR_READER_H__
-#define __CODA_BAR_READER_H__
+#ifndef ZXING_CODA_BAR_READER_H
+#define ZXING_CODA_BAR_READER_H
 /*
  *  Copyright 2010 ZXing authors All rights reserved.
  *
@@ -54,4 +54,4 @@ private:
 }
 }
 
-#endif
+#endif // ZXING_CODA_BAR_READER_H
diff --git a/src/zxing/zxing/oned/Code128Reader.h b/src/zxing/zxing/oned/Code128Reader.h
index 052f540..1c608fe 100644
--- a/src/zxing/zxing/oned/Code128Reader.h
+++ b/src/zxing/zxing/oned/Code128Reader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __CODE_128_READER_H__
-#define __CODE_128_READER_H__
+#ifndef ZXING_CODE_128_READER_H
+#define ZXING_CODE_128_READER_H
 /*
  *  Copyright 2010 ZXing authors All rights reserved.
  *
@@ -45,4 +45,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_CODE_128_READER_H
+
diff --git a/src/zxing/zxing/oned/Code39Reader.h b/src/zxing/zxing/oned/Code39Reader.h
index 4bab3bc..935d241 100644
--- a/src/zxing/zxing/oned/Code39Reader.h
+++ b/src/zxing/zxing/oned/Code39Reader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __CODE_39_READER_H__
-#define __CODE_39_READER_H__
+#ifndef ZXING_CODE_39_READER_H
+#define ZXING_CODE_39_READER_H
 /*
  *  Code39Reader.h
  *  ZXing
@@ -60,4 +60,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_CODE_39_READER_H
+
diff --git a/src/zxing/zxing/oned/Code93Reader.h b/src/zxing/zxing/oned/Code93Reader.h
index 95c6828..080a09d 100644
--- a/src/zxing/zxing/oned/Code93Reader.h
+++ b/src/zxing/zxing/oned/Code93Reader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __CODE_93_READER_H__
-#define __CODE_93_READER_H__
+#ifndef ZXING_CODE_93_READER_H
+#define ZXING_CODE_93_READER_H
 /*
  *  Code93Reader.h
  *  ZXing
@@ -55,4 +55,5 @@ private:
 }
 }
 
-#endif
+#endif // ZXING_CODE_93_READER_H
+
diff --git a/src/zxing/zxing/oned/EAN13Reader.h b/src/zxing/zxing/oned/EAN13Reader.h
index a428225..c6a0e60 100644
--- a/src/zxing/zxing/oned/EAN13Reader.h
+++ b/src/zxing/zxing/oned/EAN13Reader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __EAN_13_READER_H__
-#define __EAN_13_READER_H__
+#ifndef ZXING_EAN_13_READER_H
+#define ZXING_EAN_13_READER_H
 
 /*
  *  EAN13Reader.h
@@ -46,4 +46,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_EAN_13_READER_H
+
diff --git a/src/zxing/zxing/oned/EAN8Reader.h b/src/zxing/zxing/oned/EAN8Reader.h
index 7dfaf3a..6e49cea 100644
--- a/src/zxing/zxing/oned/EAN8Reader.h
+++ b/src/zxing/zxing/oned/EAN8Reader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __EAN_8_READER_H__
-#define __EAN_8_READER_H__
+#ifndef ZXING_EAN_8_READER_H
+#define ZXING_EAN_8_READER_H
 
 /*
  *  EAN8Reader.h
@@ -44,4 +44,5 @@ class EAN8Reader : public UPCEANReader {
 }
 }
 
-#endif
+#endif // ZXING_EAN_8_READER_H
+
diff --git a/src/zxing/zxing/oned/ITFReader.h b/src/zxing/zxing/oned/ITFReader.h
index aea279f..fe57146 100644
--- a/src/zxing/zxing/oned/ITFReader.h
+++ b/src/zxing/zxing/oned/ITFReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __ITF_READER_H__
-#define __ITF_READER_H__
+#ifndef ZXING_ITF_READER_H
+#define ZXING_ITF_READER_H
 
 /*
  *  Copyright 2010 ZXing authors All rights reserved.
@@ -51,4 +51,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_ITF_READER_H
+
diff --git a/src/zxing/zxing/oned/MultiFormatOneDReader.h b/src/zxing/zxing/oned/MultiFormatOneDReader.h
index dae214d..ef5ff07 100644
--- a/src/zxing/zxing/oned/MultiFormatOneDReader.h
+++ b/src/zxing/zxing/oned/MultiFormatOneDReader.h
@@ -1,5 +1,5 @@
-#ifndef __MULTI_FORMAT_ONED_READER_H__
-#define __MULTI_FORMAT_ONED_READER_H__
+#ifndef ZXING_MULTI_FORMAT_ONED_READER_H
+#define ZXING_MULTI_FORMAT_ONED_READER_H
 /*
  *  MultiFormatOneDReader.h
  *  ZXing
@@ -35,4 +35,5 @@ namespace zxing {
   }
 }
 
-#endif
+#endif // ZXING_MULTI_FORMAT_ONED_READER_H
+
diff --git a/src/zxing/zxing/oned/MultiFormatUPCEANReader.h b/src/zxing/zxing/oned/MultiFormatUPCEANReader.h
index 9e141f9..62720a5 100644
--- a/src/zxing/zxing/oned/MultiFormatUPCEANReader.h
+++ b/src/zxing/zxing/oned/MultiFormatUPCEANReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __MULTI_FORMAT_UPC_EAN_READER_H__
-#define __MULTI_FORMAT_UPC_EAN_READER_H__
+#ifndef ZXING_MULTI_FORMAT_UPC_EAN_READER_H
+#define ZXING_MULTI_FORMAT_UPC_EAN_READER_H
 /*
  *  MultiFormatUPCEANReader.h
  *  ZXing
@@ -38,4 +38,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_MULTI_FORMAT_UPC_EAN_READER_H
+
diff --git a/src/zxing/zxing/oned/OneDReader.h b/src/zxing/zxing/oned/OneDReader.h
index 63cc4a9..dd67ce8 100644
--- a/src/zxing/zxing/oned/OneDReader.h
+++ b/src/zxing/zxing/oned/OneDReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __ONED_READER_H__
-#define __ONED_READER_H__
+#ifndef ZXING_ONED_READER_H
+#define ZXING_ONED_READER_H
 
 /*
  *  OneDReader.h
@@ -78,4 +78,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_ONED_READER_H
+
diff --git a/src/zxing/zxing/oned/OneDResultPoint.h b/src/zxing/zxing/oned/OneDResultPoint.h
index 825a04e..024687f 100644
--- a/src/zxing/zxing/oned/OneDResultPoint.h
+++ b/src/zxing/zxing/oned/OneDResultPoint.h
@@ -1,5 +1,5 @@
-#ifndef __ONED_RESULT_POINT_H__
-#define __ONED_RESULT_POINT_H__
+#ifndef ZXING_ONED_RESULT_POINT_H
+#define ZXING_ONED_RESULT_POINT_H
 /*
  *  OneDResultPoint.h
  *  ZXing
@@ -32,4 +32,5 @@ namespace zxing {
 	}
 }
 
-#endif
+#endif // ZXING_ONED_RESULT_POINT_H
+
diff --git a/src/zxing/zxing/oned/UPCAReader.h b/src/zxing/zxing/oned/UPCAReader.h
index 7d80b2d..d8250d2 100644
--- a/src/zxing/zxing/oned/UPCAReader.h
+++ b/src/zxing/zxing/oned/UPCAReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __UPCA_READER_H__
-#define __UPCA_READER_H__
+#ifndef ZXING_UPCA_READER_H
+#define ZXING_UPCA_READER_H
 /*
  *  UPCAReader.h
  *  ZXing
@@ -47,4 +47,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_UPCA_READER_H
+
diff --git a/src/zxing/zxing/oned/UPCEANReader.h b/src/zxing/zxing/oned/UPCEANReader.h
index 16189ba..452db88 100644
--- a/src/zxing/zxing/oned/UPCEANReader.h
+++ b/src/zxing/zxing/oned/UPCEANReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __UPC_EAN_READER_H__
-#define __UPC_EAN_READER_H__
+#ifndef ZXING_UPC_EAN_READER_H
+#define ZXING_UPC_EAN_READER_H
 
 /*
  *  Copyright 2010 ZXing authors All rights reserved.
@@ -85,4 +85,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_UPC_EAN_READER_H
+
diff --git a/src/zxing/zxing/oned/UPCEReader.h b/src/zxing/zxing/oned/UPCEReader.h
index 9578f0e..dedcfba 100644
--- a/src/zxing/zxing/oned/UPCEReader.h
+++ b/src/zxing/zxing/oned/UPCEReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __UPC_E_READER_H__
-#define __UPC_E_READER_H__
+#ifndef ZXING_UPC_E_READER_H
+#define ZXING_UPC_E_READER_H
 
 /*
  *  Copyright 2010 ZXing authors All rights reserved.
@@ -44,4 +44,5 @@ public:
 }
 }
 
-#endif
+#endif // ZXING_UPC_E_READER_H
+
diff --git a/src/zxing/zxing/pdf417/PDF417Reader.h b/src/zxing/zxing/pdf417/PDF417Reader.h
index 73636ba..7c40ead 100644
--- a/src/zxing/zxing/pdf417/PDF417Reader.h
+++ b/src/zxing/zxing/pdf417/PDF417Reader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __PDF417_READER_H__
-#define __PDF417_READER_H__
+#ifndef ZXING_PDF417_READER_H
+#define ZXING_PDF417_READER_H
 
 /*
  *  PDF417Reader.h
@@ -46,4 +46,4 @@ class PDF417Reader : public Reader {
 }
 }
 
-#endif // __PDF417_READER_H__
+#endif // ZXING_PDF417_READER_H
diff --git a/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h b/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h
index afc080b..47f2290 100644
--- a/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h
+++ b/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h
@@ -1,5 +1,5 @@
-#ifndef __BIT_MATRIX_PARSER__PDF_H__
-#define __BIT_MATRIX_PARSER__PDF_H__
+#ifndef ZXING_BIT_MATRIX_PARSER_PDF_H
+#define ZXING_BIT_MATRIX_PARSER_PDF_H
 
 /*
  *  BitMatrixParser.h / PDF417
@@ -81,4 +81,4 @@ protected:
 }
 }
 
-#endif // __BIT_MATRIX_PARSER__PDF_H__
+#endif // ZXING_BIT_MATRIX_PARSER_PDF_H
diff --git a/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h b/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h
index e9aff88..d83bceb 100644
--- a/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h
+++ b/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __DECODED_BIT_STREAM_PARSER_PD_H__
-#define __DECODED_BIT_STREAM_PARSER_PD_H__
+#ifndef ZXING_DECODED_BIT_STREAM_PARSER_PD_H
+#define ZXING_DECODED_BIT_STREAM_PARSER_PD_H
 
 /*
  * Copyright 2010 ZXing authors All rights reserved.
@@ -81,4 +81,4 @@ class DecodedBitStreamParser {
 } /* namespace pdf417 */
 } /* namespace zxing */
 
-#endif // __DECODED_BIT_STREAM_PARSER_PD_H__
+#endif // ZXING_DECODED_BIT_STREAM_PARSER_PD_H
diff --git a/src/zxing/zxing/pdf417/decoder/Decoder.h b/src/zxing/zxing/pdf417/decoder/Decoder.h
index 304be87..c7733df 100644
--- a/src/zxing/zxing/pdf417/decoder/Decoder.h
+++ b/src/zxing/zxing/pdf417/decoder/Decoder.h
@@ -1,5 +1,5 @@
-#ifndef __DECOCER_PDF_H__
-#define __DECOCER_PDF_H__
+#ifndef ZXING_DECOCER_PDF_H
+#define ZXING_DECOCER_PDF_H
 
 /*
  *  Decoder.h
@@ -59,4 +59,4 @@ public:
 }
 }
 
-#endif // __DECOCER_PDF_H__
+#endif // ZXING_DECOCER_PDF_H
diff --git a/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h b/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h
index 7ea8c4a..e6c7a16 100644
--- a/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h
+++ b/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __ERROR_CORRECTION_PDF_H__
-#define __ERROR_CORRECTION_PDF_H__
+#ifndef ZXING_ERROR_CORRECTION_PDF_H
+#define ZXING_ERROR_CORRECTION_PDF_H
 /*
  * Copyright 2012 ZXing authors
  *
@@ -68,4 +68,4 @@ class ErrorCorrection: public Counted {
 }
 }
 
-#endif /* __ERROR_CORRECTION_PDF_H__ */
+#endif /* ZXING_ERROR_CORRECTION_PDF_H */
diff --git a/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h b/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h
index b4d8b4b..79e666a 100644
--- a/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h
+++ b/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h
@@ -1,5 +1,5 @@
-#ifndef __MODULUS_GF_PDF_H__
-#define __MODULUS_GF_PDF_H__
+#ifndef ZXING_MODULUS_GF_PDF_H
+#define ZXING_MODULUS_GF_PDF_H
 /*
  * Copyright 2012 ZXing authors
  *
@@ -69,4 +69,4 @@ class ModulusGF {
 }
 }
 
-#endif /* __MODULUS_GF_PDF_H__ */
+#endif /* ZXING_MODULUS_GF_PDF_H */
diff --git a/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h b/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h
index f3f76a1..ffab558 100644
--- a/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h
+++ b/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h
@@ -1,5 +1,5 @@
-#ifndef __MODULUS_GFPOLY_PDF_H__
-#define __MODULUS_GFPOLY_PDF_H__
+#ifndef ZXING_MODULUS_GFPOLY_PDF_H
+#define ZXING_MODULUS_GFPOLY_PDF_H
 
 /*
  * Copyright 2012 ZXing authors
@@ -65,4 +65,4 @@ class ModulusPoly: public Counted {
 }
 }
 
-#endif /* __MODULUS_GFPOLY_PDF_H__ */
+#endif /* ZXING_MODULUS_GFPOLY_PDF_H */
diff --git a/src/zxing/zxing/pdf417/detector/Detector.h b/src/zxing/zxing/pdf417/detector/Detector.h
index 874ec5c..d2d9698 100644
--- a/src/zxing/zxing/pdf417/detector/Detector.h
+++ b/src/zxing/zxing/pdf417/detector/Detector.h
@@ -1,5 +1,5 @@
-#ifndef __DETECTOR_H__
-#define __DETECTOR_H__
+#ifndef ZXING_DETECTOR_H_
+#define ZXING_DETECTOR_H_
 
 /*
  *  Detector.h
@@ -103,4 +103,4 @@ public:
 }
 }
 
-#endif // __DETECTOR_H__
+#endif // ZXING_DETECTOR_H_
diff --git a/src/zxing/zxing/pdf417/detector/LinesSampler.h b/src/zxing/zxing/pdf417/detector/LinesSampler.h
index b2de4bd..648ba3f 100644
--- a/src/zxing/zxing/pdf417/detector/LinesSampler.h
+++ b/src/zxing/zxing/pdf417/detector/LinesSampler.h
@@ -1,5 +1,5 @@
-#ifndef __LINESSAMPLER_H__
-#define __LINESSAMPLER_H__
+#ifndef ZXING_LINESSAMPLER_H
+#define ZXING_LINESSAMPLER_H
 
 /*
  * Copyright 2010 ZXing authors All rights reserved.
@@ -119,4 +119,4 @@ public:
 }
 }
 
-#endif // __LINESSAMPLER_H__
+#endif // ZXING_LINESSAMPLER_H
diff --git a/src/zxing/zxing/qrcode/ErrorCorrectionLevel.h b/src/zxing/zxing/qrcode/ErrorCorrectionLevel.h
index 5ad9718..77a6ccd 100644
--- a/src/zxing/zxing/qrcode/ErrorCorrectionLevel.h
+++ b/src/zxing/zxing/qrcode/ErrorCorrectionLevel.h
@@ -1,5 +1,5 @@
-#ifndef __ERROR_CORRECTION_LEVEL_H__
-#define __ERROR_CORRECTION_LEVEL_H__
+#ifndef ZXING_ERROR_CORRECTION_LEVEL_H
+#define ZXING_ERROR_CORRECTION_LEVEL_H
 
 /*
  *  ErrorCorrectionLevel.h
@@ -52,4 +52,4 @@ public:
 }
 }
 
-#endif // __ERROR_CORRECTION_LEVEL_H__
+#endif // ZXING_ERROR_CORRECTION_LEVEL_H
diff --git a/src/zxing/zxing/qrcode/FormatInformation.h b/src/zxing/zxing/qrcode/FormatInformation.h
index 7770472..6de295f 100644
--- a/src/zxing/zxing/qrcode/FormatInformation.h
+++ b/src/zxing/zxing/qrcode/FormatInformation.h
@@ -1,5 +1,5 @@
-#ifndef __FORMAT_INFORMATION_H__
-#define __FORMAT_INFORMATION_H__
+#ifndef ZXING_FORMAT_INFORMATION_H
+#define ZXING_FORMAT_INFORMATION_H
 
 /*
  *  FormatInformation.h
@@ -51,4 +51,4 @@ public:
 }
 }
 
-#endif // __FORMAT_INFORMATION_H__
+#endif // ZXING_FORMAT_INFORMATION_H
diff --git a/src/zxing/zxing/qrcode/QRCodeReader.h b/src/zxing/zxing/qrcode/QRCodeReader.h
index d5f9b86..7eda09d 100644
--- a/src/zxing/zxing/qrcode/QRCodeReader.h
+++ b/src/zxing/zxing/qrcode/QRCodeReader.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __QR_CODE_READER_H__
-#define __QR_CODE_READER_H__
+#ifndef ZXING_QR_CODE_READER_H
+#define ZXING_QR_CODE_READER_H
 
 /*
  *  QRCodeReader.h
@@ -45,4 +45,4 @@ class QRCodeReader : public Reader {
 }
 }
 
-#endif // __QR_CODE_READER_H__
+#endif // ZXING_QR_CODE_READER_H
diff --git a/src/zxing/zxing/qrcode/Version.h b/src/zxing/zxing/qrcode/Version.h
index 0af4416..987a446 100644
--- a/src/zxing/zxing/qrcode/Version.h
+++ b/src/zxing/zxing/qrcode/Version.h
@@ -1,5 +1,5 @@
-#ifndef __VERSION_H__
-#define __VERSION_H__
+#ifndef ZXING_VERSION_H
+#define ZXING_VERSION_H
 
 /*
  *  Version.h
@@ -83,4 +83,4 @@ public:
 }
 }
 
-#endif // __VERSION_H__
+#endif // ZXING_VERSION_H
diff --git a/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h b/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h
index ed76f05..5b956f8 100644
--- a/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h
+++ b/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h
@@ -1,5 +1,5 @@
-#ifndef __BIT_MATRIX_PARSER_H__
-#define __BIT_MATRIX_PARSER_H__
+#ifndef ZXING_MATRIX_PARSER_H
+#define ZXING_MATRIX_PARSER_H
 
 /*
  *  BitMatrixParser.h
@@ -57,4 +57,4 @@ private:
 }
 }
 
-#endif // __BIT_MATRIX_PARSER_H__
+#endif // ZXING_MATRIX_PARSER_H
diff --git a/src/zxing/zxing/qrcode/decoder/DataBlock.h b/src/zxing/zxing/qrcode/decoder/DataBlock.h
index 96c76d4..d2c804e 100644
--- a/src/zxing/zxing/qrcode/decoder/DataBlock.h
+++ b/src/zxing/zxing/qrcode/decoder/DataBlock.h
@@ -1,5 +1,5 @@
-#ifndef __DATA_BLOCK_H__
-#define __DATA_BLOCK_H__
+#ifndef ZXING_DATA_BLOCK_H
+#define ZXING_DATA_BLOCK_H
 
 /*
  *  DataBlock.h
@@ -47,4 +47,4 @@ public:
 }
 }
 
-#endif // __DATA_BLOCK_H__
+#endif // ZXING_DATA_BLOCK_H
diff --git a/src/zxing/zxing/qrcode/decoder/DataMask.h b/src/zxing/zxing/qrcode/decoder/DataMask.h
index fa3088b..46f8c39 100644
--- a/src/zxing/zxing/qrcode/decoder/DataMask.h
+++ b/src/zxing/zxing/qrcode/decoder/DataMask.h
@@ -1,5 +1,5 @@
-#ifndef __DATA_MASK_H__
-#define __DATA_MASK_H__
+#ifndef ZXING_DATA_MASK_H
+#define ZXING_DATA_MASK_H
 
 /*
  *  DataMask.h
@@ -47,4 +47,4 @@ public:
 }
 }
 
-#endif // __DATA_MASK_H__
+#endif // ZXING_DATA_MASK_H
diff --git a/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h b/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h
index 077bf00..f1552af 100644
--- a/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h
+++ b/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __DECODED_BIT_STREAM_PARSER_H__
-#define __DECODED_BIT_STREAM_PARSER_H__
+#ifndef ZXING_DECODED_BIT_STREAM_PARSER_H
+#define ZXING_DECODED_BIT_STREAM_PARSER_H
 
 /*
  *  DecodedBitStreamParser.h
@@ -69,4 +69,4 @@ public:
 }
 }
 
-#endif // __DECODED_BIT_STREAM_PARSER_H__
+#endif // ZXING_DECODED_BIT_STREAM_PARSER_H
diff --git a/src/zxing/zxing/qrcode/decoder/Decoder.h b/src/zxing/zxing/qrcode/decoder/Decoder.h
index 401cfed..44a418e 100644
--- a/src/zxing/zxing/qrcode/decoder/Decoder.h
+++ b/src/zxing/zxing/qrcode/decoder/Decoder.h
@@ -1,5 +1,5 @@
-#ifndef __DECODER_H__
-#define __DECODER_H__
+#ifndef ZXING_DECODER_H
+#define ZXING_DECODER_H
 
 /*
  *  Decoder.h
@@ -43,4 +43,4 @@ public:
 }
 }
 
-#endif // __DECODER_H__
+#endif // ZXING_DECODER_H
diff --git a/src/zxing/zxing/qrcode/decoder/Mode.h b/src/zxing/zxing/qrcode/decoder/Mode.h
index 79fb382..dab5f9e 100644
--- a/src/zxing/zxing/qrcode/decoder/Mode.h
+++ b/src/zxing/zxing/qrcode/decoder/Mode.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __MODE_H__
-#define __MODE_H__
+#ifndef ZXING_MODE_H
+#define ZXING_MODE_H
 
 /*
  *  Mode.h
diff --git a/src/zxing/zxing/qrcode/detector/AlignmentPattern.h b/src/zxing/zxing/qrcode/detector/AlignmentPattern.h
index f95b92a..a506f6a 100644
--- a/src/zxing/zxing/qrcode/detector/AlignmentPattern.h
+++ b/src/zxing/zxing/qrcode/detector/AlignmentPattern.h
@@ -1,7 +1,7 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
 
-#ifndef __ALIGNMENT_PATTERN_H__
-#define __ALIGNMENT_PATTERN_H__
+#ifndef ZXING_ALIGNMENT_PATTERN_H
+#define ZXING_ALIGNMENT_PATTERN_H
 
 /*
  *  AlignmentPattern.h
@@ -42,4 +42,4 @@ namespace zxing {
 	}
 }
 
-#endif // __ALIGNMENT_PATTERN_H__
+#endif // ZXING_ALIGNMENT_PATTERN_H
diff --git a/src/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h b/src/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h
index 6bd9487..c04359e 100644
--- a/src/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h
+++ b/src/zxing/zxing/qrcode/detector/AlignmentPatternFinder.h
@@ -1,5 +1,5 @@
-#ifndef __ALIGNMENT_PATTERN_FINDER_H__
-#define __ALIGNMENT_PATTERN_FINDER_H__
+#ifndef ZXING_ALIGNMENT_PATTERN_FINDER_H
+#define ZXING_ALIGNMENT_PATTERN_FINDER_H
 
 /*
  *  AlignmentPatternFinder.h
@@ -65,4 +65,4 @@ private:
 }
 }
 
-#endif // __ALIGNMENT_PATTERN_FINDER_H__
+#endif // ZXING_ALIGNMENT_PATTERN_FINDER_H
diff --git a/src/zxing/zxing/qrcode/detector/Detector.h b/src/zxing/zxing/qrcode/detector/Detector.h
index 05ef044..4447fa5 100644
--- a/src/zxing/zxing/qrcode/detector/Detector.h
+++ b/src/zxing/zxing/qrcode/detector/Detector.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __DETECTOR_H__
-#define __DETECTOR_H__
+#ifndef ZXING_DETECTOR_H
+#define ZXING_DETECTOR_H
 
 /*
  *  Detector.h
@@ -66,4 +66,4 @@ public:
 }
 }
 
-#endif // __DETECTOR_H__
+#endif // ZXING_DETECTOR_H
diff --git a/src/zxing/zxing/qrcode/detector/FinderPattern.h b/src/zxing/zxing/qrcode/detector/FinderPattern.h
index 87b61c8..944cb9c 100644
--- a/src/zxing/zxing/qrcode/detector/FinderPattern.h
+++ b/src/zxing/zxing/qrcode/detector/FinderPattern.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __FINDER_PATTERN_H__
-#define __FINDER_PATTERN_H__
+#ifndef ZXING_FINDER_PATTERN_H
+#define ZXING_FINDER_PATTERN_H
 
 /*
  *  FinderPattern.h
@@ -45,4 +45,4 @@ namespace zxing {
 	}
 }
 
-#endif // __FINDER_PATTERN_H__
+#endif // ZXING_FINDER_PATTERN_H
diff --git a/src/zxing/zxing/qrcode/detector/FinderPatternFinder.h b/src/zxing/zxing/qrcode/detector/FinderPatternFinder.h
index af4a438..c90de19 100644
--- a/src/zxing/zxing/qrcode/detector/FinderPatternFinder.h
+++ b/src/zxing/zxing/qrcode/detector/FinderPatternFinder.h
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
-#ifndef __FINDER_PATTERN_FINDER_H__
-#define __FINDER_PATTERN_FINDER_H__
+#ifndef ZXING_FINDER_PATTERN_FINDER_H
+#define ZXING_FINDER_PATTERN_FINDER_H
 
 /*
  *  FinderPatternFinder.h
@@ -77,4 +77,4 @@ public:
 }
 }
 
-#endif // __FINDER_PATTERN_FINDER_H__
+#endif // ZXING_FINDER_PATTERN_FINDER_H
diff --git a/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h b/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h
index 6d13254..b02faa1 100644
--- a/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h
+++ b/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h
@@ -1,5 +1,5 @@
-#ifndef __FINDER_PATTERN_INFO_H__
-#define __FINDER_PATTERN_INFO_H__
+#ifndef ZXING_FINDER_PATTERN_INFO_H
+#define ZXING_FINDER_PATTERN_INFO_H
 
 /*
  *  FinderPatternInfo.h
@@ -44,4 +44,4 @@ public:
 }
 }
 
-#endif // __FINDER_PATTERN_INFO_H__
+#endif // ZXING_FINDER_PATTERN_INFO_H