diff --git a/GraphicsView/include/CGAL/Qt/camera.h b/GraphicsView/include/CGAL/Qt/camera.h
index 1a449ae0b73..47d6761403e 100644
--- a/GraphicsView/include/CGAL/Qt/camera.h
+++ b/GraphicsView/include/CGAL/Qt/camera.h
@@ -29,7 +29,7 @@
 #include <QDomElement>
 #include <CGAL/Qt/vec.h>
 #include <CGAL/Qt/quaternion.h>
-#include <CGAL/Qt/config.h>
+#include <CGAL/export/Qt.h>
 #include <QOpenGLFunctions_2_1>
 class QGLViewer;
 
@@ -99,7 +99,7 @@ class ManipulatedCameraFrame;
   A Camera can also be used outside of a QGLViewer or even without OpenGL for
   its coordinate system conversion capabilities. Note however that some of them
   explicitly rely on the presence of a Z-buffer. \nosubgrouping */
-class QGLVIEWER_EXPORT Camera : public QObject {
+class CGAL_QT_EXPORT Camera : public QObject {
 #ifndef DOXYGEN
   friend class ::QGLViewer;
 #endif
diff --git a/GraphicsView/include/CGAL/Qt/constraint.h b/GraphicsView/include/CGAL/Qt/constraint.h
index bba540399a4..1c6535fa439 100644
--- a/GraphicsView/include/CGAL/Qt/constraint.h
+++ b/GraphicsView/include/CGAL/Qt/constraint.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/Qt/quaternion.h>
 #include <CGAL/Qt/vec.h>
+#include <CGAL/export/Qt.h>
 
 
 namespace qglviewer {
@@ -119,7 +120,7 @@ class Camera;
   }
   \endcode
   */
-class QGLVIEWER_EXPORT Constraint {
+class CGAL_QT_EXPORT Constraint {
 public:
   /*! Virtual destructor. Empty. */
   virtual ~Constraint() {}
@@ -180,7 +181,7 @@ public:
    However, adding an extra pointer to the QGLViewer::camera() in all the
    AxisPlaneConstraint derived classes (which the user would have to update in a
    multi-viewer application) was judged as an overkill. */
-class QGLVIEWER_EXPORT AxisPlaneConstraint : public Constraint {
+class CGAL_QT_EXPORT AxisPlaneConstraint : public Constraint {
 public:
   AxisPlaneConstraint();
   /*! Virtual destructor. Empty. */
@@ -310,7 +311,7 @@ private:
 
   See the <a href="../examples/constrainedFrame.html">constrainedFrame</a>
   example for an illustration. */
-class QGLVIEWER_EXPORT LocalConstraint : public AxisPlaneConstraint {
+class CGAL_QT_EXPORT LocalConstraint : public AxisPlaneConstraint {
 public:
   /*! Virtual destructor. Empty. */
   virtual ~LocalConstraint(){};
@@ -328,7 +329,7 @@ public:
   See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and
   <a href="../examples/multiView.html">multiView</a> examples for an
   illustration. */
-class QGLVIEWER_EXPORT WorldConstraint : public AxisPlaneConstraint {
+class CGAL_QT_EXPORT WorldConstraint : public AxisPlaneConstraint {
 public:
   /*! Virtual destructor. Empty. */
   virtual ~WorldConstraint(){};
@@ -346,7 +347,7 @@ public:
   See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and
   <a href="../examples/constrainedCamera.html">constrainedCamera</a> examples
   for an illustration. */
-class QGLVIEWER_EXPORT CameraConstraint : public AxisPlaneConstraint {
+class CGAL_QT_EXPORT CameraConstraint : public AxisPlaneConstraint {
 public:
   explicit CameraConstraint(const Camera *const camera);
   /*! Virtual destructor. Empty. */
diff --git a/GraphicsView/include/CGAL/Qt/frame.h b/GraphicsView/include/CGAL/Qt/frame.h
index b747f159b20..5968a10e8c4 100644
--- a/GraphicsView/include/CGAL/Qt/frame.h
+++ b/GraphicsView/include/CGAL/Qt/frame.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <QString>
-#include <CGAL/Qt/config.h>
+#include <CGAL/export/Qt.h>
 #include <CGAL/Qt/vec.h>
 #include <CGAL/Qt/quaternion.h>
 
@@ -134,7 +134,7 @@ class Constraint;
   scene with the mouse.
 
   \nosubgrouping */
-class QGLVIEWER_EXPORT Frame : public QObject {
+class CGAL_QT_EXPORT Frame : public QObject {
   Q_OBJECT
 
 public:
diff --git a/GraphicsView/include/CGAL/Qt/keyFrameInterpolator.h b/GraphicsView/include/CGAL/Qt/keyFrameInterpolator.h
index 27d4e910f3c..b2a9d41d5fe 100644
--- a/GraphicsView/include/CGAL/Qt/keyFrameInterpolator.h
+++ b/GraphicsView/include/CGAL/Qt/keyFrameInterpolator.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <QTimer>
-
+#include <CGAL/export/Qt.h>
 #include <CGAL/Qt/quaternion.h>
 // Not actually needed, but some bad compilers (Microsoft VS6) complain.
 //#include <CGAL/Qt/frame.h>
@@ -129,7 +129,7 @@ class Frame;
   \endcode
   You may want to temporally disconnect the \c kfi interpolated() signal from
   the QGLViewer::update() slot before calling this code. \nosubgrouping */
-class QGLVIEWER_EXPORT KeyFrameInterpolator : public QObject {
+class CGAL_QT_EXPORT KeyFrameInterpolator : public QObject {
   // todo closedPath, insertKeyFrames, deleteKeyFrame, replaceKeyFrame
   Q_OBJECT
 
diff --git a/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame.h b/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame.h
index 9f7a0dcfa82..d6edf7a8f63 100644
--- a/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame.h
+++ b/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame.h
@@ -26,7 +26,7 @@
 #define QGLVIEWER_MANIPULATED_CAMERA_FRAME_H
 #include <QTimer>
 
-#include <CGAL/Qt/config.h>
+#include <CGAL/export/Qt.h>
 #include <CGAL/Qt/manipulatedFrame.h>
 #include <CGAL/Qt/camera.h>
 
@@ -52,7 +52,7 @@ namespace qglviewer {
   See the <a href="../mouse.html">mouse page</a> for a description of the
   possible actions that can be performed using the mouse and their bindings.
   \nosubgrouping */
-class QGLVIEWER_EXPORT ManipulatedCameraFrame : public ManipulatedFrame {
+class CGAL_QT_EXPORT ManipulatedCameraFrame : public ManipulatedFrame {
 #ifndef DOXYGEN
   friend class Camera;
   friend class ::QGLViewer;
diff --git a/GraphicsView/include/CGAL/Qt/manipulatedFrame.h b/GraphicsView/include/CGAL/Qt/manipulatedFrame.h
index f05b8484edd..92ab375fdc8 100644
--- a/GraphicsView/include/CGAL/Qt/manipulatedFrame.h
+++ b/GraphicsView/include/CGAL/Qt/manipulatedFrame.h
@@ -24,7 +24,7 @@
 
 #ifndef QGLVIEWER_MANIPULATED_FRAME_H
 #define QGLVIEWER_MANIPULATED_FRAME_H
-#include <CGAL/Qt/config.h>
+#include <CGAL/export/Qt.h>
 #include <CGAL/Qt/frame.h>
 #include <CGAL/Qt/camera.h>
 #include <CGAL/Qt/mouseGrabber.h>
@@ -103,7 +103,7 @@ namespace qglviewer {
   button while moving the mouse fast enough (see spinningSensitivity()). See
   also translationSensitivity() and rotationSensitivity() for sensitivity
   tuning. \nosubgrouping */
-class QGLVIEWER_EXPORT ManipulatedFrame : public Frame, public MouseGrabber {
+class CGAL_QT_EXPORT ManipulatedFrame : public Frame, public MouseGrabber {
 #ifndef DOXYGEN
   friend class Camera;
   friend class ::QGLViewer;
diff --git a/GraphicsView/include/CGAL/Qt/mouseGrabber.h b/GraphicsView/include/CGAL/Qt/mouseGrabber.h
index 68350a84960..333d06b85af 100644
--- a/GraphicsView/include/CGAL/Qt/mouseGrabber.h
+++ b/GraphicsView/include/CGAL/Qt/mouseGrabber.h
@@ -25,7 +25,7 @@
 #ifndef QGLVIEWER_MOUSE_GRABBER_H
 #define QGLVIEWER_MOUSE_GRABBER_H
 
-#include <CGAL/Qt/config.h>
+#include <CGAL/export/Qt.h>
 
 #include <QEvent>
 
@@ -133,7 +133,7 @@ class Camera;
   \endcode
   Note that the different event callback methods are called only once the
   MouseGrabber grabsMouse(). \nosubgrouping */
-class QGLVIEWER_EXPORT MouseGrabber {
+class CGAL_QT_EXPORT MouseGrabber {
 #ifndef DOXYGEN
   friend class ::QGLViewer;
 #endif
diff --git a/GraphicsView/include/CGAL/Qt/qglviewer.h b/GraphicsView/include/CGAL/Qt/qglviewer.h
index 44a5bc8c7a8..abc37dee69a 100644
--- a/GraphicsView/include/CGAL/Qt/qglviewer.h
+++ b/GraphicsView/include/CGAL/Qt/qglviewer.h
@@ -24,7 +24,7 @@
 
 #ifndef QGLVIEWER_QGLVIEWER_H
 #define QGLVIEWER_QGLVIEWER_H
-#include <CGAL/Qt/config.h>
+#include <CGAL/export/Qt.h>
 #include <CGAL/Qt/viewer_actions.h>
 #include <CGAL/Qt/vec.h>
 #include <CGAL/Qt/camera.h>
@@ -76,7 +76,7 @@ href="../examples/callback.html">callback example</a> for a complete
 implementation.
 
 \nosubgrouping */
-class QGLVIEWER_EXPORT QGLViewer : public QOpenGLWidget, public QOpenGLFunctions_2_1 {
+class CGAL_QT_EXPORT QGLViewer : public QOpenGLWidget, public QOpenGLFunctions_2_1 {
   Q_OBJECT
 
 public:  
diff --git a/GraphicsView/include/CGAL/Qt/quaternion.h b/GraphicsView/include/CGAL/Qt/quaternion.h
index ac55b649502..21d46efacd7 100644
--- a/GraphicsView/include/CGAL/Qt/quaternion.h
+++ b/GraphicsView/include/CGAL/Qt/quaternion.h
@@ -24,10 +24,11 @@
 
 #ifndef QGLVIEWER_QUATERNION_H
 #define QGLVIEWER_QUATERNION_H
-#include <CGAL/Qt/config.h>
+#include <CGAL/export/Qt.h>
 #include <CGAL/Qt/vec.h>
 #include <iostream>
 #include <math.h>
+#include <QOpenGLWidget>
 
 namespace qglviewer {
 /*! \brief The Quaternion class represents 3D rotations and orientations.
@@ -68,7 +69,7 @@ namespace qglviewer {
 
         See also the Vec and Frame classes' documentations.
         \nosubgrouping */
-class QGLVIEWER_EXPORT Quaternion {
+class CGAL_QT_EXPORT Quaternion {
 public:
   /*! @name Defining a Quaternion */
   //@{
diff --git a/GraphicsView/include/CGAL/Qt/vec.h b/GraphicsView/include/CGAL/Qt/vec.h
index 462ca9db578..b4aecb8058a 100644
--- a/GraphicsView/include/CGAL/Qt/vec.h
+++ b/GraphicsView/include/CGAL/Qt/vec.h
@@ -31,7 +31,7 @@
 #include <QDomElement>
 
 // Included by all files as vec.h is at the end of the include hierarchy
-#include <CGAL/Qt/config.h> // Specific configuration options.
+#include <CGAL/export/Qt.h>
 
 namespace qglviewer {
 
@@ -64,7 +64,7 @@ namespace qglviewer {
 
   See also the Quaternion and the Frame documentations.
   \nosubgrouping */
-class QGLVIEWER_EXPORT Vec {
+class CGAL_QT_EXPORT Vec {
 
 // If your compiler complains the "The class "qglviewer::Vec" has no member
 // "x"." Add your architecture Q_OS_XXXX flag (see qglobal.h) in this list.