diff --git a/libImaging/Jpeg2KDecode.c b/libImaging/Jpeg2KDecode.c
index 43a796c27..1b61b4f7d 100644
--- a/libImaging/Jpeg2KDecode.c
+++ b/libImaging/Jpeg2KDecode.c
@@ -517,7 +517,8 @@ j2k_decode_entry(Imaging im, ImagingCodecState state,
     opj_stream_set_read_function(stream, j2k_read);
     opj_stream_set_skip_function(stream, j2k_skip);
 
-#if OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR == 0
+    /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
+#ifndef OPJ_VERSION_MAJOR
     opj_stream_set_user_data(stream, decoder);
 #else
     opj_stream_set_user_data(stream, decoder, NULL);
diff --git a/libImaging/Jpeg2KEncode.c b/libImaging/Jpeg2KEncode.c
index f1748b97e..8e7d0d1f2 100644
--- a/libImaging/Jpeg2KEncode.c
+++ b/libImaging/Jpeg2KEncode.c
@@ -259,7 +259,8 @@ j2k_encode_entry(Imaging im, ImagingCodecState state,
     opj_stream_set_skip_function(stream, j2k_skip);
     opj_stream_set_seek_function(stream, j2k_seek);
 
-#if OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR == 0
+    /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
+#ifndef OPJ_VERSION_MAJOR
     opj_stream_set_user_data(stream, encoder);
 #else
     opj_stream_set_user_data(stream, encoder, NULL);