diff --git a/ChangeLog b/ChangeLog
index bd2aaed3..3b62d45b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 January 31, 2007
+! [FOD] Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_to_j2k.c -> no more warnings in linux compilation
 ! [FOD] Linux Makefile added for the codec
 
 January 30, 2007
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 4ecf0df1..98745ee6 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -978,7 +978,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 
 			}
 			break;
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
 
 				/* ------------------------------------------------------ */
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 1416684f..6e232f27 100644
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -1586,7 +1586,7 @@ opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio) {
 			}
 
 		}
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
 		if (id >> 8 != 0xff) {
 			opj_image_destroy(image);
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 78da551c..e90fbb68 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -261,7 +261,7 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
 				parameters->jpwl_sens_TPH[i] = -1; /* absent */
 			}
 		};
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
 	}
 }