diff --git a/CGAL_ImageIO/include/CGAL/ImageIO_impl.h b/CGAL_ImageIO/include/CGAL/ImageIO_impl.h
index 5b55ed1eafd..2ba5536e3f7 100644
--- a/CGAL_ImageIO/include/CGAL/ImageIO_impl.h
+++ b/CGAL_ImageIO/include/CGAL/ImageIO_impl.h
@@ -51,15 +51,15 @@
    GIF        |  .gif            |     X     |     
    BMP        |  .gif            |     X     |     
 */
-#include <CGAL/inr.h>
-#include <CGAL/gif.h>
-#include <CGAL/gis.h>
-#include <CGAL/pnm.h>
-#include <CGAL/bmp.h>
-#include <CGAL/iris.h>
-#include <CGAL/analyze.h>
+#include "inr.h"
+#include "gif.h"
+#include "gis.h"
+#include "pnm.h"
+#include "bmp.h"
+#include "iris.h"
+#include "analyze.h"
 #ifdef MINC_FILES
-#  include <CGAL/mincio.h>
+#include "mincio.h"
 #endif
 
 
diff --git a/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h b/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h
index 9f8501f663f..830b62b78f8 100644
--- a/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h
+++ b/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_IMAGE_3_VTK_INTERFACE_H
 #define CGAL_IMAGE_3_VTK_INTERFACE_H
 
-#include <CGAL/config.h>
+#include "config.h"
 
 #ifdef CGAL_USE_VTK
 #include <CGAL/Image_3.h>
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
index c9cce722fec..81ed9bdfd5b 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
@@ -48,7 +48,7 @@ if(OPENGL_FOUND)
 
   use_essential_libs()
 
-  include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} )
+  include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} .)
   
   link_directories    ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/analyze.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/analyze.cpp
index 9d92a1e7ed8..a40db327bba 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/analyze.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/analyze.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/analyze.h>
-#include <CGAL/analyze_impl.h>
+#include "analyze.h"
+#include "analyze_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/analyze.h b/CGAL_ImageIO/src/CGAL_ImageIO/analyze.h
index ad14b461697..7014b92b6de 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/analyze.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/analyze.h
@@ -68,7 +68,7 @@ int writeAnalyzeHeader( const _image* im ) ;
 int writeAnalyzeData( const _image* im ) ;
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/analyze_impl.h>
+#include "analyze_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmp.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/bmp.cpp
index e055502e450..e9b862ecc81 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmp.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmp.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/bmp.h>
-#include <CGAL/bmp_impl.h>
+#include "bmp.h"
+#include "bmp_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmp.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmp.h
index 0b4c4e0aa9f..2d0e8653d1c 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmp.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmp.h
@@ -59,7 +59,7 @@ extern void IoBmp_verbose ( );
 extern void IoBmp_noverbose ( );
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/bmp_impl.h>
+#include "bmp_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif /* _bmp_h_ */
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmp_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmp_impl.h
index 2edf84d2f9c..155f38d939f 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmp_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmp_impl.h
@@ -27,9 +27,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <CGAL/bmptypes.h>
-#include <CGAL/bmpendian.h>
-#include <CGAL/bmpread.h>
+#include "bmptypes.h"
+#include "bmpendian.h"
+#include "bmpread.h"
 
 
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.cpp
index 19770b56744..f252541763b 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/bmpendian.h>
-#include <CGAL/bmpendian_impl.h>
+#include "bmpendian.h"
+#include "bmpendian_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.h
index abb592824ee..40cf71ef279 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.h
@@ -31,7 +31,9 @@
 
 #ifndef __ENDIAN_H_INCLUDED__
 #define __ENDIAN_H_INCLUDED__
- 
+
+#include "bmptypes.h"
+
 /*
  * Read the basic types as little-endian values.  The return value will be
  * zero if successful, EOF, otherwise.
@@ -55,7 +57,7 @@ int writeUINT16little(FILE *f, CGAL_UINT16 i);
 int writeUINT32little(FILE *f, CGAL_UINT32 i);
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/bmpendian_impl.h>
+#include "bmpendian_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif  /* __ENDIAN_H_INCLUDED__ */
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian_impl.h
index 4d4ee37cee8..8686a187759 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian_impl.h
@@ -33,7 +33,7 @@
  */
 
 #include <stdio.h>
-#include <CGAL/bmptypes.h>
+#include "bmptypes.h"
 
 /*****************************************************************************
 *
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.cpp
index b7d59256044..6e77cb06b59 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/bmpread.h>
-#include <CGAL/bmpread_impl.h>
+#include "bmpread.h"
+#include "bmpread_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.h
index d122cf0dd63..9fe7cb963dd 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.h
@@ -61,7 +61,7 @@ int readMultipleImage(FILE *fp, RGB ***argbs, char ***xorMasks,
 		      int *imageCount);
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/bmpread_impl.h>
+#include "bmpread_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/bmpread_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread_impl.h
index fb4fbbbe488..1b36398081a 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/bmpread_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread_impl.h
@@ -38,8 +38,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <CGAL/bmptypes.h>
-#include <CGAL/bmpendian.h>
+#include "bmptypes.h"
+#include "bmpendian.h"
 
 /*****************************************************************************
  *
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/convert.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/convert.cpp
index 5600fd8c17a..52e879286b4 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/convert.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/convert.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/convert.h>
-#include <CGAL/convert_impl.h>
+#include "convert.h"
+#include "convert_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/convert.h b/CGAL_ImageIO/src/CGAL_ImageIO/convert.h
index 4611aaf1e6d..3f163f762a6 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/convert.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/convert.h
@@ -48,7 +48,7 @@
 
 #include <stdio.h> /* memcpy */
 #include <string.h> /* memcpy */
-#include <CGAL/typedefs.h>
+#include "typedefs.h"
 
 
 
@@ -102,7 +102,7 @@ extern void Convert_r32_to_u16( r32 *theBuf,
 
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/convert_impl.h>
+#include "convert_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.cpp
index 14448f28ea3..f5c95d1284e 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/fgetns.h>
-#include <CGAL/fgetns_impl.h>
+#include "fgetns.h"
+#include "fgetns_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.h b/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.h
index 71bc10194cc..73f2f58bd13 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.h
@@ -29,7 +29,7 @@
 char *fgetns(char *str, int n,  _image *im );
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/fgetns_impl.h>
+#include "fgetns_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif // FGETNS_H
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/gif.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/gif.cpp
index 837980c5ef9..c1735c610b4 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/gif.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/gif.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/gif.h>
-#include <CGAL/gif_impl.h>
+#include "gif.h"
+#include "gif_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/gif.h b/CGAL_ImageIO/src/CGAL_ImageIO/gif.h
index 2d5c60c2ef6..467f9183f2a 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/gif.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/gif.h
@@ -32,7 +32,7 @@ int testGifHeader(char *magic,const char *name);
 PTRIMAGE_FORMAT createGifFormat();
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/gif_impl.h>
+#include "gif_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/gis.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/gis.cpp
index c2e4f238718..bc3bd71310c 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/gis.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/gis.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/gis.h>
-#include <CGAL/gis_impl.h>
+#include "gis.h"
+#include "gis_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/gis.h b/CGAL_ImageIO/src/CGAL_ImageIO/gis.h
index aeb1928c297..c12cc7641b7 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/gis.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/gis.h
@@ -135,7 +135,7 @@ int writeGisHeader( const _image* im ) ;
 int writeGisData( const _image* im ) ;
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/gis_impl.h>
+#include "gis_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/gis_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/gis_impl.h
index 1527b4ed5db..fbd3b53a819 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/gis_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/gis_impl.h
@@ -27,9 +27,10 @@
 
 #include <string>
 #include <sstream>
+#include <cstring>
 
-#include <CGAL/inr.h>
-#include <CGAL/fgetns.h>
+#include "inr.h"
+#include "fgetns.h"
 
 #define _LGTH_STRING_ 1024
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp
index 313868af57d..6560f7462f3 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/inr.h>
-#include <CGAL/inr_impl.h>
+#include "inr.h"
+#include "inr_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/inr.h b/CGAL_ImageIO/src/CGAL_ImageIO/inr.h
index bb8a4dfd914..5ec646040ba 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/inr.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/inr.h
@@ -58,7 +58,7 @@ int writeInrimage(char *basename,_image *im);
 PTRIMAGE_FORMAT createInrimageFormat();
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/inr_impl.h>
+#include "inr_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/inr_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/inr_impl.h
index c1f7bba3569..a2c9fe065ba 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/inr_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/inr_impl.h
@@ -25,7 +25,7 @@
 #define CGAL_INLINE_FUNCTION
 #endif
 
-#include <CGAL/fgetns.h>
+#include "fgetns.h"
 
 #include <string>
 #include <sstream>
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/iris.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/iris.cpp
index 6ca0f32e7a1..711313748c6 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/iris.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/iris.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/iris.h>
-#include <CGAL/iris_impl.h>
+#include "iris.h"
+#include "iris_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/mincio.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/mincio.cpp
index 1d31fdd08a0..8bf8b3351d7 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/mincio.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/mincio.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/mincio.h>
-#include <CGAL/mincio_impl.h>
+#include "mincio.h"
+#include "mincio_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/mincio.h b/CGAL_ImageIO/src/CGAL_ImageIO/mincio.h
index f6847890695..46cd034abca 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/mincio.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/mincio.h
@@ -71,7 +71,7 @@ int writeMincFile( const _image* im, const char *name, const char *sourceName,
 #endif
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/mincio_impl.h>
+#include "mincio_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/pnm.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/pnm.cpp
index 60874645812..47e0eb2ac45 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/pnm.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/pnm.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/pnm.h>
-#include <CGAL/pnm_impl.h>
+#include "pnm.h"
+#include "pnm_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/pnm.h b/CGAL_ImageIO/src/CGAL_ImageIO/pnm.h
index 560cb3b2ed5..6a5d379dd4a 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/pnm.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/pnm.h
@@ -40,7 +40,7 @@ PTRIMAGE_FORMAT createPgmAscIIFormat();
 PTRIMAGE_FORMAT createPpmFormat();
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/pnm_impl.h>
+#include "pnm_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/pnm_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/pnm_impl.h
index 3de3eef6c12..58c5a98ca34 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/pnm_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/pnm_impl.h
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <sstream>
 
-#include <CGAL/fgetns.h>
+#include "fgetns.h"
 
 
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.cpp
index 77e7e762e90..e5d6f002a90 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/recbuffer.h>
-#include <CGAL/recbuffer_impl.h>
+#include "recbuffer.h"
+#include "recbuffer_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.h b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.h
index 5bd219893a8..79951bff04a 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.h
@@ -49,8 +49,8 @@
 #define _recbuffer_h_
 
 
-#include <CGAL/typedefs.h>
-#include <CGAL/recline.h>
+#include "typedefs.h"
+#include "recline.h"
 
 
 
@@ -196,7 +196,7 @@ extern void Recbuffer_noverbose ( );
 
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/recbuffer_impl.h>
+#include "recbuffer_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer_impl.h
index 3c829f9d0b6..0f882c0b626 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer_impl.h
@@ -58,7 +58,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include <CGAL/convert.h>
+#include "convert.h"
 
 #ifdef CGAL_HEADER_ONLY
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/recline.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/recline.cpp
index c167c75d82b..4217062f3e4 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/recline.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/recline.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/recline.h>
-#include <CGAL/recline_impl.h>
+#include "recline.h"
+#include "recline_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/recline.h b/CGAL_ImageIO/src/CGAL_ImageIO/recline.h
index cf6f416c813..d2f2bc3965e 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/recline.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/recline.h
@@ -229,7 +229,7 @@ extern void Recline_verbose ( );
 extern void Recline_noverbose ( );
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/recline_impl.h>
+#include "recline_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 #endif /* _recline_h_ */
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.cpp
index 44870bc0cbe..2c0157823ac 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.cpp
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/reech4x4.h>
-#include <CGAL/reech4x4_impl.h>
+#include "reech4x4.h"
+#include "reech4x4_impl.h"
 
 #endif // CGAL_HEADER_ONLY
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.h b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.h
index 8f7d113a3c3..11f84f794b8 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.h
@@ -281,7 +281,7 @@ extern void Reech4x4_verbose ( );
 extern void Reech4x4_noverbose ( );
 
 #ifdef CGAL_HEADER_ONLY
-#include <CGAL/reech4x4_impl.h>
+#include "reech4x4_impl.h"
 #endif // CGAL_HEADER_ONLY
 
 
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4_impl.h b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4_impl.h
index 9ef071bb558..a09c9e363c4 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4_impl.h
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4_impl.h
@@ -51,7 +51,7 @@
  */
 
 #include <stdio.h>
-#include <CGAL/typedefs.h>
+#include "typedefs.h"
 
 #define _CONVERTR_(R) ( R )
 #define _CONVERTI_(R) ( (R) >= 0.0 ? ((int)((R)+0.5)) : ((int)((R)-0.5)) )