diff --git a/src/Mod/Raytracing/App/LuxFeature.h b/src/Mod/Raytracing/App/LuxFeature.h
index b5f5280933..c5b9908085 100644
--- a/src/Mod/Raytracing/App/LuxFeature.h
+++ b/src/Mod/Raytracing/App/LuxFeature.h
@@ -39,8 +39,7 @@ class Property;
 
 /** Base class of all Feature classes in FreeCAD
  */
-//class LuxFeature: public Part::PartFeature
-class AppRaytracingExport LuxFeature: public Raytracing::RaySegment
+class RaytracingExport LuxFeature: public Raytracing::RaySegment
 {
     PROPERTY_HEADER(Raytracing::LuxFeature);
 public:
diff --git a/src/Mod/Raytracing/App/LuxProject.h b/src/Mod/Raytracing/App/LuxProject.h
index 64d85f9404..e67247a7ed 100644
--- a/src/Mod/Raytracing/App/LuxProject.h
+++ b/src/Mod/Raytracing/App/LuxProject.h
@@ -29,6 +29,7 @@
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyStandard.h>
 #include <App/PropertyFile.h>
+#include <Mod/Raytracing/RaytracingGlobal.h>
 
 namespace Raytracing
 {
@@ -38,7 +39,7 @@ class Property;
 /** Base class of all Feature classes in FreeCAD
  */
 //class RayFeature: public Part::PartFeature
-class AppRaytracingExport LuxProject: public App::DocumentObjectGroup
+class RaytracingExport LuxProject: public App::DocumentObjectGroup
 {
     PROPERTY_HEADER(Raytracing::LuxProject);
 
diff --git a/src/Mod/Raytracing/App/LuxTools.h b/src/Mod/Raytracing/App/LuxTools.h
index 7d27c93875..ae7f501a91 100644
--- a/src/Mod/Raytracing/App/LuxTools.h
+++ b/src/Mod/Raytracing/App/LuxTools.h
@@ -37,7 +37,7 @@ namespace Data { class ComplexGeoData; }
 namespace Raytracing
 {
     
-    class AppRaytracingExport LuxTools
+    class RaytracingExport LuxTools
     {
     public:
         /// returns the given camera position as luxray defines
diff --git a/src/Mod/Raytracing/App/PovTools.h b/src/Mod/Raytracing/App/PovTools.h
index 09088c5755..afcbc50958 100644
--- a/src/Mod/Raytracing/App/PovTools.h
+++ b/src/Mod/Raytracing/App/PovTools.h
@@ -26,6 +26,7 @@
 
 #include <gp_Vec.hxx>
 #include <vector>
+#include <Mod/Raytracing/RaytracingGlobal.h>
 
 class TopoDS_Shape;
 class TopoDS_Face;
@@ -71,7 +72,7 @@ public:
 };
 
 
-class AppRaytracingExport PovTools
+class RaytracingExport PovTools
 {
 public:
     /// returns the given camera position as povray defines in a file
diff --git a/src/Mod/Raytracing/App/PreCompiled.h b/src/Mod/Raytracing/App/PreCompiled.h
index eb516955c2..e335cc7b4e 100644
--- a/src/Mod/Raytracing/App/PreCompiled.h
+++ b/src/Mod/Raytracing/App/PreCompiled.h
@@ -26,15 +26,6 @@
 
 #include <FCConfig.h>
 
-// Importing of App classes
-#ifdef FC_OS_WIN32
-# define PartExport          __declspec(dllimport)
-# define AppRaytracingExport __declspec(dllexport)
-#else // for Linux
-# define PartExport
-# define AppRaytracingExport
-#endif
-
 #ifdef _PreComp_
 
 // standard
diff --git a/src/Mod/Raytracing/App/RayFeature.h b/src/Mod/Raytracing/App/RayFeature.h
index a769dafa38..38890a3e56 100644
--- a/src/Mod/Raytracing/App/RayFeature.h
+++ b/src/Mod/Raytracing/App/RayFeature.h
@@ -39,8 +39,7 @@ class Property;
 
 /** Base class of all Feature classes in FreeCAD
  */
-//class RayFeature: public Part::PartFeature
-class AppRaytracingExport RayFeature: public Raytracing::RaySegment
+class RaytracingExport RayFeature: public Raytracing::RaySegment
 {
     PROPERTY_HEADER(Raytracing::RayFeature);
 public:
diff --git a/src/Mod/Raytracing/App/RayProject.h b/src/Mod/Raytracing/App/RayProject.h
index be0c706715..401d9d74bf 100644
--- a/src/Mod/Raytracing/App/RayProject.h
+++ b/src/Mod/Raytracing/App/RayProject.h
@@ -29,6 +29,7 @@
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyStandard.h>
 #include <App/PropertyFile.h>
+#include <Mod/Raytracing/RaytracingGlobal.h>
 
 namespace Raytracing
 {
@@ -37,8 +38,7 @@ class Property;
 
 /** Base class of all Feature classes in FreeCAD
  */
-//class RayFeature: public Part::PartFeature
-class AppRaytracingExport RayProject: public App::DocumentObjectGroup
+class RaytracingExport RayProject: public App::DocumentObjectGroup
 {
     PROPERTY_HEADER(Raytracing::RayProject);
 
diff --git a/src/Mod/Raytracing/App/RaySegment.h b/src/Mod/Raytracing/App/RaySegment.h
index 9ed46ae4d2..61ff34f17e 100644
--- a/src/Mod/Raytracing/App/RaySegment.h
+++ b/src/Mod/Raytracing/App/RaySegment.h
@@ -30,6 +30,7 @@
 #include <App/DocumentObject.h>
 #include <App/PropertyStandard.h>
 #include <App/PropertyGeo.h>
+#include <Mod/Raytracing/RaytracingGlobal.h>
 
 
 namespace Raytracing
@@ -38,7 +39,7 @@ namespace Raytracing
 
 /** Base class of all View Features in the drawing module
  */
-class AppRaytracingExport RaySegment: public App::DocumentObject
+class RaytracingExport RaySegment: public App::DocumentObject
 {
   PROPERTY_HEADER(Raytracing::RaySegment);
 
diff --git a/src/Mod/Raytracing/Gui/PreCompiled.h b/src/Mod/Raytracing/Gui/PreCompiled.h
index 11722e9aad..6971ccacc5 100644
--- a/src/Mod/Raytracing/Gui/PreCompiled.h
+++ b/src/Mod/Raytracing/Gui/PreCompiled.h
@@ -25,17 +25,6 @@
 
 #include <FCConfig.h>
 
-// Importing of App classes
-#ifdef FC_OS_WIN32
-# define PartExport          __declspec(dllimport)
-# define AppRaytracingExport    __declspec(dllimport)
-# define AppRaytracingGuiExport __declspec(dllexport)
-#else // for Linux
-# define PartExport
-# define AppRaytracingExport
-# define AppRaytracingGuiExport
-#endif
-
 #ifdef _MSC_VER
 #   pragma warning(disable : 4005)
 #endif
diff --git a/src/Mod/Raytracing/RaytracingGlobal.h b/src/Mod/Raytracing/RaytracingGlobal.h
new file mode 100644
index 0000000000..30cd9132c3
--- /dev/null
+++ b/src/Mod/Raytracing/RaytracingGlobal.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   Copyright (c) 2021 Werner Mayer <wmayer[at]users.sourceforge.net>     *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <FCGlobal.h>
+
+#ifndef RAYTRACING_GLOBAL_H
+#define RAYTRACING_GLOBAL_H
+
+
+// Raytracing
+#ifndef RaytracingExport
+#ifdef Raytracing_EXPORTS
+#       define RaytracingExport   FREECAD_DECL_EXPORT
+#else
+#       define RaytracingExport   FREECAD_DECL_IMPORT
+#endif
+#endif
+
+// RaytracingGui
+#ifndef RaytracingGuiExport
+#ifdef RaytracingGui_EXPORTS
+#       define RaytracingGuiExport   FREECAD_DECL_EXPORT
+#else
+#       define RaytracingGuiExport   FREECAD_DECL_IMPORT
+#endif
+#endif
+
+#endif //RAYTRACING_GLOBAL_H