diff --git a/src/lib/openjp2/bio.h b/src/lib/openjp2/bio.h
index d55dd42a..448fdda2 100644
--- a/src/lib/openjp2/bio.h
+++ b/src/lib/openjp2/bio.h
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __BIO_H
-#define __BIO_H
+#ifndef OPJ_BIO_H
+#define OPJ_BIO_H
 
 #include <stddef.h> /* ptrdiff_t */
 
@@ -130,5 +130,5 @@ OPJ_BOOL opj_bio_inalign(opj_bio_t *bio);
 
 /*@}*/
 
-#endif /* __BIO_H */
+#endif /* OPJ_BIO_H */
 
diff --git a/src/lib/openjp2/cio.h b/src/lib/openjp2/cio.h
index ae13389d..6996a9a0 100644
--- a/src/lib/openjp2/cio.h
+++ b/src/lib/openjp2/cio.h
@@ -37,8 +37,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CIO_H
-#define __CIO_H
+#ifndef OPJ_CIO_H
+#define OPJ_CIO_H
 /**
 @file cio.h
 @brief Implementation of a byte input-output process (CIO)
@@ -408,5 +408,5 @@ OPJ_BOOL opj_stream_default_seek(OPJ_OFF_T p_nb_bytes, void * p_user_data);
 /*@}*/
 
 
-#endif /* __CIO_H */
+#endif /* OPJ_CIO_H */
 
diff --git a/src/lib/openjp2/dwt.h b/src/lib/openjp2/dwt.h
index b3939c6f..3c997efd 100644
--- a/src/lib/openjp2/dwt.h
+++ b/src/lib/openjp2/dwt.h
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __DWT_H
-#define __DWT_H
+#ifndef OPJ_DWT_H
+#define OPJ_DWT_H
 /**
 @file dwt.h
 @brief Implementation of a discrete wavelet transform (DWT)
@@ -122,4 +122,4 @@ void opj_dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, OPJ_UINT32 prec);
 
 /*@}*/
 
-#endif /* __DWT_H */
+#endif /* OPJ_DWT_H */
diff --git a/src/lib/openjp2/event.h b/src/lib/openjp2/event.h
index 964fc1a6..d880388d 100644
--- a/src/lib/openjp2/event.h
+++ b/src/lib/openjp2/event.h
@@ -30,8 +30,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __EVENT_H
-#define __EVENT_H
+#ifndef OPJ_EVENT_H
+#define OPJ_EVENT_H
 /**
 @file event.h
 @brief Implementation of a event callback system
@@ -105,4 +105,4 @@ void opj_set_default_event_handler(opj_event_mgr_t * p_manager);
 
 /*@}*/
 
-#endif /* __EVENT_H */
+#endif /* OPJ_EVENT_H */
diff --git a/src/lib/openjp2/function_list.h b/src/lib/openjp2/function_list.h
index 1a4046e1..81a3954a 100644
--- a/src/lib/openjp2/function_list.h
+++ b/src/lib/openjp2/function_list.h
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __FUNCTION_LIST_H
-#define __FUNCTION_LIST_H
+#ifndef OPJ_FUNCTION_LIST_H
+#define OPJ_FUNCTION_LIST_H
 
 /**
  * @file function_list.h
@@ -130,5 +130,5 @@ opj_procedure* opj_procedure_list_get_first_procedure(opj_procedure_list_t *
 void opj_procedure_list_clear(opj_procedure_list_t * p_validation_list);
 /*@}*/
 
-#endif /* __FUNCTION_LIST_H */
+#endif /* OPJ_FUNCTION_LIST_H */
 
diff --git a/src/lib/openjp2/image.h b/src/lib/openjp2/image.h
index e47b3aab..bad83c61 100644
--- a/src/lib/openjp2/image.h
+++ b/src/lib/openjp2/image.h
@@ -28,8 +28,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __IMAGE_H
-#define __IMAGE_H
+#ifndef OPJ_IMAGE_H
+#define OPJ_IMAGE_H
 /**
 @file image.h
 @brief Implementation of operations on images (IMAGE)
@@ -66,5 +66,5 @@ void opj_copy_image_header(const opj_image_t* p_image_src,
 
 /*@}*/
 
-#endif /* __IMAGE_H */
+#endif /* OPJ_IMAGE_H */
 
diff --git a/src/lib/openjp2/invert.h b/src/lib/openjp2/invert.h
index f444d7fb..70402135 100644
--- a/src/lib/openjp2/invert.h
+++ b/src/lib/openjp2/invert.h
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __INVERT_H
-#define __INVERT_H
+#ifndef OPJ_INVERT_H
+#define OPJ_INVERT_H
 /**
 @file invert.h
 @brief Implementation of the matrix inversion
@@ -61,4 +61,4 @@ OPJ_BOOL opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,
 
 /*@}*/
 
-#endif /* __INVERT_H */
+#endif /* OPJ_INVERT_H */
diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h
index 64989a63..5c5a359d 100644
--- a/src/lib/openjp2/j2k.h
+++ b/src/lib/openjp2/j2k.h
@@ -39,8 +39,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __J2K_H
-#define __J2K_H
+#ifndef OPJ_J2K_H
+#define OPJ_J2K_H
 /**
 @file j2k.h
 @brief The JPEG-2000 Codestream Reader/Writer (J2K)
@@ -849,4 +849,4 @@ OPJ_BOOL opj_j2k_end_compress(opj_j2k_t *p_j2k,
 OPJ_BOOL opj_j2k_setup_mct_encoding(opj_tcp_t * p_tcp, opj_image_t * p_image);
 
 
-#endif /* __J2K_H */
+#endif /* OPJ_J2K_H */
diff --git a/src/lib/openjp2/jp2.h b/src/lib/openjp2/jp2.h
index 510a01bd..2e248061 100644
--- a/src/lib/openjp2/jp2.h
+++ b/src/lib/openjp2/jp2.h
@@ -33,8 +33,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __JP2_H
-#define __JP2_H
+#ifndef OPJ_JP2_H
+#define OPJ_JP2_H
 /**
 @file jp2.h
 @brief The JPEG-2000 file format Reader/Writer (JP2)
@@ -471,5 +471,5 @@ opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_t* p_jp2);
 
 /*@}*/
 
-#endif /* __JP2_H */
+#endif /* OPJ_JP2_H */
 
diff --git a/src/lib/openjp2/mct.h b/src/lib/openjp2/mct.h
index 293cdfe8..0ed980e8 100644
--- a/src/lib/openjp2/mct.h
+++ b/src/lib/openjp2/mct.h
@@ -37,8 +37,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MCT_H
-#define __MCT_H
+#ifndef OPJ_MCT_H
+#define OPJ_MCT_H
 /**
 @file mct.h
 @brief Implementation of a multi-component transforms (MCT)
@@ -156,4 +156,4 @@ const OPJ_FLOAT64 * opj_mct_get_mct_norms_real(void);
 
 /*@}*/
 
-#endif /* __MCT_H */
+#endif /* OPJ_MCT_H */
diff --git a/src/lib/openjp2/mqc.h b/src/lib/openjp2/mqc.h
index 0bc7b2b7..ac3aff10 100644
--- a/src/lib/openjp2/mqc.h
+++ b/src/lib/openjp2/mqc.h
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MQC_H
-#define __MQC_H
+#ifndef OPJ_MQC_H
+#define OPJ_MQC_H
 
 #include "opj_common.h"
 
@@ -268,4 +268,4 @@ Decode a symbol
 
 /*@}*/
 
-#endif /* __MQC_H */
+#endif /* OPJ_MQC_H */
diff --git a/src/lib/openjp2/mqc_inl.h b/src/lib/openjp2/mqc_inl.h
index 832331ee..d95d9492 100644
--- a/src/lib/openjp2/mqc_inl.h
+++ b/src/lib/openjp2/mqc_inl.h
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MQC_INL_H
-#define __MQC_INL_H
+#ifndef OPJ_MQC_INL_H
+#define OPJ_MQC_INL_H
 
 /* For internal use of opj_mqc_decode_macro() */
 #define opj_mqc_mpsexchange_macro(d, curctx, a) \
@@ -193,4 +193,4 @@ Decode a symbol
 #define opj_mqc_decode(d, mqc) \
     opj_mqc_decode_macro(d, mqc, mqc->curctx, mqc->a, mqc->c, mqc->ct)
 
-#endif /* __MQC_INL_H */
+#endif /* OPJ_MQC_INL_H */
diff --git a/src/lib/openjp2/opj_clock.h b/src/lib/openjp2/opj_clock.h
index a50eef24..76366f53 100644
--- a/src/lib/openjp2/opj_clock.h
+++ b/src/lib/openjp2/opj_clock.h
@@ -28,8 +28,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __OPJ_CLOCK_H
-#define __OPJ_CLOCK_H
+#ifndef OPJ_CLOCK_H
+#define OPJ_CLOCK_H
 /**
 @file opj_clock.h
 @brief Internal function for timing
@@ -55,5 +55,5 @@ OPJ_FLOAT64 opj_clock(void);
 
 /*@}*/
 
-#endif /* __OPJ_CLOCK_H */
+#endif /* OPJ_CLOCK_H */
 
diff --git a/src/lib/openjp2/opj_codec.h b/src/lib/openjp2/opj_codec.h
index 00ce9ab9..2dbeac96 100644
--- a/src/lib/openjp2/opj_codec.h
+++ b/src/lib/openjp2/opj_codec.h
@@ -29,8 +29,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __OPJ_CODEC_H
-#define __OPJ_CODEC_H
+#ifndef OPJ_CODEC_H
+#define OPJ_CODEC_H
 /**
 @file opj_codec.h
 */
@@ -162,5 +162,5 @@ typedef struct opj_codec_private {
 opj_codec_private_t;
 
 
-#endif /* __OPJ_CODEC_H */
+#endif /* OPJ_CODEC_H */
 
diff --git a/src/lib/openjp2/opj_intmath.h b/src/lib/openjp2/opj_intmath.h
index 64c87ed9..cf97c15b 100644
--- a/src/lib/openjp2/opj_intmath.h
+++ b/src/lib/openjp2/opj_intmath.h
@@ -34,8 +34,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __INT_H
-#define __INT_H
+#ifndef OPJ_INTMATH_H
+#define OPJ_INTMATH_H
 /**
 @file opj_intmath.h
 @brief Implementation of operations on integers (INT)
@@ -240,4 +240,4 @@ static INLINE OPJ_INT32 opj_int_fix_mul_t1(OPJ_INT32 a, OPJ_INT32 b)
 
 /*@}*/
 
-#endif
+#endif /* OPJ_INTMATH_H */
diff --git a/src/lib/openjp2/opj_malloc.h b/src/lib/openjp2/opj_malloc.h
index 87c0e605..cbc4106c 100644
--- a/src/lib/openjp2/opj_malloc.h
+++ b/src/lib/openjp2/opj_malloc.h
@@ -29,8 +29,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __OPJ_MALLOC_H
-#define __OPJ_MALLOC_H
+#ifndef OPJ_MALLOC_H
+#define OPJ_MALLOC_H
 
 #include <stddef.h>
 /**
@@ -102,5 +102,5 @@ void opj_free(void * m);
 
 /*@}*/
 
-#endif /* __OPJ_MALLOC_H */
+#endif /* OPJ_MALLOC_H */
 
diff --git a/src/lib/openjp2/pi.h b/src/lib/openjp2/pi.h
index cc7f9b00..8c0dc25c 100644
--- a/src/lib/openjp2/pi.h
+++ b/src/lib/openjp2/pi.h
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __PI_H
-#define __PI_H
+#ifndef OPJ_PI_H
+#define OPJ_PI_H
 /**
 @file pi.h
 @brief Implementation of a packet iterator (PI)
@@ -187,4 +187,4 @@ OPJ_BOOL opj_pi_next(opj_pi_iterator_t * pi);
 
 /*@}*/
 
-#endif /* __PI_H */
+#endif /* OPJ_PI_H */
diff --git a/src/lib/openjp2/t1.h b/src/lib/openjp2/t1.h
index 9d755b74..6802d188 100644
--- a/src/lib/openjp2/t1.h
+++ b/src/lib/openjp2/t1.h
@@ -36,8 +36,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __T1_H
-#define __T1_H
+#ifndef OPJ_T1_H
+#define OPJ_T1_H
 /**
 @file t1.h
 @brief Implementation of the tier-1 coding (coding of code-block coefficients) (T1)
@@ -258,4 +258,4 @@ void opj_t1_destroy(opj_t1_t *p_t1);
 
 /*@}*/
 
-#endif /* __T1_H */
+#endif /* OPJ_T1_H */
diff --git a/src/lib/openjp2/t2.h b/src/lib/openjp2/t2.h
index 63f7a21f..4013b9db 100644
--- a/src/lib/openjp2/t2.h
+++ b/src/lib/openjp2/t2.h
@@ -36,8 +36,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __T2_H
-#define __T2_H
+#ifndef OPJ_T2_H
+#define OPJ_T2_H
 /**
 @file t2.h
 @brief Implementation of a tier-2 coding (packetization of code-block data) (T2)
@@ -132,4 +132,4 @@ void opj_t2_destroy(opj_t2_t *t2);
 
 /*@}*/
 
-#endif /* __T2_H */
+#endif /* OPJ_T2_H */
diff --git a/src/lib/openjp2/tcd.h b/src/lib/openjp2/tcd.h
index 4f842b41..cd750d1b 100644
--- a/src/lib/openjp2/tcd.h
+++ b/src/lib/openjp2/tcd.h
@@ -36,8 +36,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __TCD_H
-#define __TCD_H
+#ifndef OPJ_TCD_H
+#define OPJ_TCD_H
 /**
 @file tcd.h
 @brief Implementation of a tile coder/decoder (TCD)
@@ -386,4 +386,4 @@ OPJ_BOOL opj_tcd_is_band_empty(opj_tcd_band_t* band);
 
 /*@}*/
 
-#endif /* __TCD_H */
+#endif /* OPJ_TCD_H */
diff --git a/src/lib/openjp2/tgt.h b/src/lib/openjp2/tgt.h
index acc817dd..9818208b 100644
--- a/src/lib/openjp2/tgt.h
+++ b/src/lib/openjp2/tgt.h
@@ -38,8 +38,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __TGT_H
-#define __TGT_H
+#ifndef OPJ_TGT_H
+#define OPJ_TGT_H
 /**
 @file tgt.h
 @brief Implementation of a tag-tree coder (TGT)
@@ -145,4 +145,4 @@ OPJ_UINT32 opj_tgt_decode(opj_bio_t *bio,
 
 /*@}*/
 
-#endif /* __TGT_H */
+#endif /* OPJ_TGT_H */
diff --git a/src/lib/openjp2/tls_keys.h b/src/lib/openjp2/tls_keys.h
index ba0373a7..23f84754 100644
--- a/src/lib/openjp2/tls_keys.h
+++ b/src/lib/openjp2/tls_keys.h
@@ -29,9 +29,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TLS_KEYS_H
-#define TLS_KEYS_H
+#ifndef OPJ_TLS_KEYS_H
+#define OPJ_TLS_KEYS_H
 
 #define OPJ_TLS_KEY_T1  0
 
-#endif
+#endif /* OPJ_TLS_KEY_H */