diff --git a/CHANGES b/CHANGES
index 4165a6d5..fdd4b96e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 November 15, 2010
+* [antonin] minor changes in header inclusions
 * [antonin] complete rewrite of opj_convert.c with correct values (from winfried)
 
 November 11, 2010
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 16f1d58d..d4b87e98 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -29,12 +29,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include <opj_config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
 
+#include "../opj_config.h"
 #include "openjpeg.h"
 #include "compat/getopt.h"
 #include "convert.h"
diff --git a/codec/j2k_dump.c b/codec/j2k_dump.c
index 8b567c55..20b65d73 100644
--- a/codec/j2k_dump.c
+++ b/codec/j2k_dump.c
@@ -1,4 +1,3 @@
-#include <opj_config.h>
 /*
  * Copyright (c) 20010, Mathieu Malaterre, GDCM
  * All rights reserved.
@@ -30,6 +29,7 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "../opj_config.h"
 #include "openjpeg.h"
 #include "../libopenjpeg/j2k.h"
 #include "../libopenjpeg/jp2.h"
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index 6a1da8f1..62b33e3b 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -29,12 +29,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include <opj_config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
 
+#include "../opj_config.h"
 #include "openjpeg.h"
 #include "compat/getopt.h"
 #include "convert.h"
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 48a1f8d0..518e4f12 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include <opj_config.h>
+#include "../opj_config.h"
 #ifdef HAVE_LIBLCMS2
 #include <math.h>
 #include <lcms2.h>
@@ -38,7 +38,6 @@
 #include <lcms.h>
 #endif
 #include "opj_includes.h"
-#include "opj_convert.h"
 
 /** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
 /*@{*/
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 99866b8a..a7bcf136 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -1,4 +1,3 @@
-#include <opj_config.h>
 /*
  * Copyright (c) 2005, Hervé Drolon, FreeImage Team
  * All rights reserved.
@@ -29,6 +28,7 @@
 #include <windows.h>
 #endif /* WIN32 */
 
+#include "../opj_config.h"
 #include "opj_includes.h"
 
 /* ---------------------------------------------------------------------- */
diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 53739abf..7ec641bc 100644
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -104,6 +104,7 @@ static INLINE long lrintf(float f){
 }
 #endif
 
+#include "opj_convert.h"
 #include "j2k_lib.h"
 #include "opj_malloc.h"
 #include "event.h"