diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h
index 7aaa654fba8..8ef046965ba 100644
--- a/CGALimageIO/include/CGAL/ImageIO.h
+++ b/CGALimageIO/include/CGAL/ImageIO.h
@@ -21,7 +21,7 @@
 #define IMAGEIO_H
 
 #include <CGAL/config.h>
-#include <CGAL/ImageIO/export.h>
+#include <CGAL/export/ImageIO.h>
 
 #include <CGAL/auto_link/ImageIO.h>
 
diff --git a/CGALimageIO/include/CGAL/ImageIO/export.h b/CGALimageIO/include/CGAL/export/ImageIO.h
similarity index 100%
rename from CGALimageIO/include/CGAL/ImageIO/export.h
rename to CGALimageIO/include/CGAL/export/ImageIO.h
diff --git a/Core/include/CGAL/CORE/Config.h b/Core/include/CGAL/CORE/Config.h
index 255d37835f6..f348ba4f614 100644
--- a/Core/include/CGAL/CORE/Config.h
+++ b/Core/include/CGAL/CORE/Config.h
@@ -17,6 +17,6 @@
 #include <CGAL/auto_link/GMP.h>
 #include <CGAL/auto_link/MPFR.h>
 
-#include <CGAL/CORE/export.h>
+#include <CGAL/export/CORE.h>
 
 #endif // _CORE_CONFIG_H_
diff --git a/Core/include/CGAL/CORE/export.h b/Core/include/CGAL/export/CORE.h
similarity index 100%
rename from Core/include/CGAL/CORE/export.h
rename to Core/include/CGAL/export/CORE.h
diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h
index 9a32f9098b8..0351baabb4a 100644
--- a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h
+++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h
@@ -26,7 +26,7 @@
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <CGAL/auto_link/Qt4.h>
-#include <CGAL/Qt/export.h>
+#include <CGAL/export/Qt4.h>
 #include <CGAL/Qt/resources.h>
 
 // forward declaration
diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h
index 366f6890f02..c2380ccf467 100644
--- a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h
+++ b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation.h
@@ -22,7 +22,7 @@
 #define CGAL_QT_GRAPHICS_VIEW_NAVIGATION_H
 
 #include <CGAL/auto_link/Qt4.h>
-#include <CGAL/Qt/export.h>
+#include <CGAL/export/Qt4.h>
 #include <QObject>
 #include <QPointF>
 #include <QString>
diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h b/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h
index 320a218eb96..9795c0b2467 100644
--- a/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h
+++ b/GraphicsView/include/CGAL/Qt/GraphicsViewPolylineInput.h
@@ -22,7 +22,7 @@
 #define CGAL_QT_GRAPHICS_VIEW_POLYLINE_INPUT_H
 
 #include <CGAL/auto_link/Qt4.h>
-#include <CGAL/Qt/export.h>
+#include <CGAL/export/Qt4.h>
 #include <QPolygonF>
 #include <QPointF>
 
diff --git a/GraphicsView/include/CGAL/Qt/debug.h b/GraphicsView/include/CGAL/Qt/debug.h
index 33ee464b440..85421f3997e 100644
--- a/GraphicsView/include/CGAL/Qt/debug.h
+++ b/GraphicsView/include/CGAL/Qt/debug.h
@@ -22,7 +22,7 @@
 #define CGAL_QT_DEBUG_H
 
 #include <CGAL/auto_link/Qt4.h>
-#include <CGAL/Qt/export.h>
+#include <CGAL/export/Qt4.h>
 #include <QString>
 
 namespace CGAL {
diff --git a/GraphicsView/include/CGAL/Qt/resources.h b/GraphicsView/include/CGAL/Qt/resources.h
index 95d7e574ff7..385a3c7caef 100644
--- a/GraphicsView/include/CGAL/Qt/resources.h
+++ b/GraphicsView/include/CGAL/Qt/resources.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_QT_RESOURCES_H
 #define CGAL_QT_RESOURCES_H
 
-#include <CGAL/Qt/export.h>
+#include <CGAL/export/Qt4.h>
 
 // cannot use namespaces because of the Q_INIT_RESOURCE macro
 CGAL_QT4_EXPORT void CGAL_Qt4_init_resources();
diff --git a/GraphicsView/include/CGAL/Qt/utility.h b/GraphicsView/include/CGAL/Qt/utility.h
index 245239ab565..f6f8ddea842 100644
--- a/GraphicsView/include/CGAL/Qt/utility.h
+++ b/GraphicsView/include/CGAL/Qt/utility.h
@@ -24,7 +24,7 @@
 #include <QRectF>
 #include <QRect>
 #include <CGAL/auto_link/Qt4.h>
-#include <CGAL/Qt/export.h>
+#include <CGAL/export/Qt4.h>
 
 class QGraphicsScene;
 class QGraphicsView;
diff --git a/GraphicsView/include/CGAL/Qt/export.h b/GraphicsView/include/CGAL/export/Qt4.h
similarity index 100%
rename from GraphicsView/include/CGAL/Qt/export.h
rename to GraphicsView/include/CGAL/export/Qt4.h
diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
index 23e42aab9a9..4bae87ab6f5 100644
--- a/Installation/include/CGAL/config.h
+++ b/Installation/include/CGAL/config.h
@@ -45,7 +45,11 @@
 
 #include <CGAL/compiler_config.h>
 
-#include <CGAL/export.h>
+//----------------------------------------------------------------------//
+//  Support for DLL on Windows (CGAL_EXPORT macro)
+//----------------------------------------------------------------------//
+
+#include <CGAL/export/CGAL.h>
 
 //----------------------------------------------------------------------//
 //  Enable C++0x features with GCC -std=c++0x (even when not specified at build time)
diff --git a/Installation/include/CGAL/export.h b/Installation/include/CGAL/export/CGAL.h
similarity index 100%
rename from Installation/include/CGAL/export.h
rename to Installation/include/CGAL/export/CGAL.h