diff --git a/CMakeLists.txt b/CMakeLists.txt
index 589d6ff..ab901a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,7 +349,6 @@ set(ONDSELSOLVER_HEADERS
         OndselSolver/AngleZIeqcJeqc.h
         OndselSolver/AnyGeneralSpline.h
         OndselSolver/AnyPosICNewtonRaphson.h
-        OndselSolver/APIExport.h
         OndselSolver/ArcSine.h
         OndselSolver/ArcTan.h
         OndselSolver/ArcTan2.h
diff --git a/OndselSolver/APIExport.h b/OndselSolver/APIExport.h
deleted file mode 100644
index 7c92110..0000000
--- a/OndselSolver/APIExport.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2023 Ondsel, Inc.                                       *
- *                                                                         *
- *   This file is part of OndselSolver.                                    *
- *                                                                         *
- *   See LICENSE file for details about copyright.                         *
- ***************************************************************************/
-
-#ifdef _WIN32
-#define EXPORT __declspec(dllexport)
-#else
-#define EXPORT __attribute__((visibility("default")))
-#endif
\ No newline at end of file
diff --git a/OndselSolver/ASMTAngleJoint.h b/OndselSolver/ASMTAngleJoint.h
index 93d48f8..f49618a 100644
--- a/OndselSolver/ASMTAngleJoint.h
+++ b/OndselSolver/ASMTAngleJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTAngleJoint : public ASMTJoint
+    class ASMTAngleJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTAnimationParameters.h b/OndselSolver/ASMTAnimationParameters.h
index f5a1c08..181a0f8 100644
--- a/OndselSolver/ASMTAnimationParameters.h
+++ b/OndselSolver/ASMTAnimationParameters.h
@@ -11,7 +11,7 @@
 #include "ASMTItem.h"
 
 namespace MbD {
-    class EXPORT ASMTAnimationParameters : public ASMTItem
+    class ASMTAnimationParameters : public ASMTItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTAssembly.h b/OndselSolver/ASMTAssembly.h
index 8364634..7f24a76 100644
--- a/OndselSolver/ASMTAssembly.h
+++ b/OndselSolver/ASMTAssembly.h
@@ -28,7 +28,7 @@ namespace MbD {
 	class ASMTItemIJ;
 	class MBDynSystem;
 
-	class EXPORT ASMTAssembly : public ASMTSpatialContainer
+	class ASMTAssembly : public ASMTSpatialContainer
 	{
 		//
 	public:
diff --git a/OndselSolver/ASMTAtPointJoint.h b/OndselSolver/ASMTAtPointJoint.h
index 1ab0353..7c6626c 100644
--- a/OndselSolver/ASMTAtPointJoint.h
+++ b/OndselSolver/ASMTAtPointJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTAtPointJoint : public ASMTJoint
+    class ASMTAtPointJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTCompoundJoint.h b/OndselSolver/ASMTCompoundJoint.h
index 6ea01c3..1c48359 100644
--- a/OndselSolver/ASMTCompoundJoint.h
+++ b/OndselSolver/ASMTCompoundJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTCompoundJoint : public ASMTJoint
+    class ASMTCompoundJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTConstantGravity.h b/OndselSolver/ASMTConstantGravity.h
index 3afd1e7..1d9dbe2 100644
--- a/OndselSolver/ASMTConstantGravity.h
+++ b/OndselSolver/ASMTConstantGravity.h
@@ -15,7 +15,7 @@ namespace MbD {
     class System;
     class Units;
 
-    class EXPORT ASMTConstantGravity : public ASMTItem
+    class ASMTConstantGravity : public ASMTItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTConstantVelocityJoint.h b/OndselSolver/ASMTConstantVelocityJoint.h
index c3b9ebc..5bd1bed 100644
--- a/OndselSolver/ASMTConstantVelocityJoint.h
+++ b/OndselSolver/ASMTConstantVelocityJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTAtPointJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTConstantVelocityJoint : public ASMTAtPointJoint
+    class ASMTConstantVelocityJoint : public ASMTAtPointJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTConstraintSet.h b/OndselSolver/ASMTConstraintSet.h
index ed1b839..88bc167 100644
--- a/OndselSolver/ASMTConstraintSet.h
+++ b/OndselSolver/ASMTConstraintSet.h
@@ -13,7 +13,7 @@
 namespace MbD {
     class Joint;
 
-    class EXPORT ASMTConstraintSet : public ASMTItemIJ
+    class ASMTConstraintSet : public ASMTItemIJ
     {
         //
     public:
diff --git a/OndselSolver/ASMTCylSphJoint.h b/OndselSolver/ASMTCylSphJoint.h
index a172e7a..83280f4 100644
--- a/OndselSolver/ASMTCylSphJoint.h
+++ b/OndselSolver/ASMTCylSphJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTCompoundJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTCylSphJoint : public ASMTCompoundJoint
+    class ASMTCylSphJoint : public ASMTCompoundJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTCylindricalJoint.h b/OndselSolver/ASMTCylindricalJoint.h
index ca5a966..3abe9c3 100644
--- a/OndselSolver/ASMTCylindricalJoint.h
+++ b/OndselSolver/ASMTCylindricalJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTInLineJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTCylindricalJoint : public ASMTInLineJoint
+    class ASMTCylindricalJoint : public ASMTInLineJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTExtrusion.h b/OndselSolver/ASMTExtrusion.h
index a6961ad..48fcc3e 100644
--- a/OndselSolver/ASMTExtrusion.h
+++ b/OndselSolver/ASMTExtrusion.h
@@ -11,7 +11,7 @@
 #include "ASMTItem.h"
 
 namespace MbD {
-    class EXPORT ASMTExtrusion : public ASMTItem
+    class ASMTExtrusion : public ASMTItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTFixedJoint.h b/OndselSolver/ASMTFixedJoint.h
index e7010de..405ff8b 100644
--- a/OndselSolver/ASMTFixedJoint.h
+++ b/OndselSolver/ASMTFixedJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTAtPointJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTFixedJoint : public ASMTAtPointJoint
+    class ASMTFixedJoint : public ASMTAtPointJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTForceTorque.h b/OndselSolver/ASMTForceTorque.h
index 2551c3a..6886221 100644
--- a/OndselSolver/ASMTForceTorque.h
+++ b/OndselSolver/ASMTForceTorque.h
@@ -11,7 +11,7 @@
 #include "ASMTItemIJ.h"
 
 namespace MbD {
-    class EXPORT ASMTForceTorque : public ASMTItemIJ
+    class ASMTForceTorque : public ASMTItemIJ
     {
         //
     public:
diff --git a/OndselSolver/ASMTGearJoint.h b/OndselSolver/ASMTGearJoint.h
index c3f5019..9fbd9c5 100644
--- a/OndselSolver/ASMTGearJoint.h
+++ b/OndselSolver/ASMTGearJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTGearJoint : public ASMTJoint
+    class ASMTGearJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTGeneralMotion.h b/OndselSolver/ASMTGeneralMotion.h
index f34a7ef..a2c4fdb 100644
--- a/OndselSolver/ASMTGeneralMotion.h
+++ b/OndselSolver/ASMTGeneralMotion.h
@@ -11,7 +11,7 @@
 #include "ASMTMotion.h"
 
 namespace MbD {
-    class EXPORT ASMTGeneralMotion : public ASMTMotion
+    class ASMTGeneralMotion : public ASMTMotion
     {
         //
     public:
diff --git a/OndselSolver/ASMTInLineJoint.h b/OndselSolver/ASMTInLineJoint.h
index 371084f..bac3829 100644
--- a/OndselSolver/ASMTInLineJoint.h
+++ b/OndselSolver/ASMTInLineJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTInLineJoint : public ASMTJoint
+    class ASMTInLineJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTInPlaneJoint.h b/OndselSolver/ASMTInPlaneJoint.h
index 445dcc8..d6bdf3d 100644
--- a/OndselSolver/ASMTInPlaneJoint.h
+++ b/OndselSolver/ASMTInPlaneJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTInPlaneJoint : public ASMTJoint
+    class ASMTInPlaneJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTItem.h b/OndselSolver/ASMTItem.h
index 9ea04a9..6754b30 100644
--- a/OndselSolver/ASMTItem.h
+++ b/OndselSolver/ASMTItem.h
@@ -8,7 +8,6 @@
  
 #pragma once
 #include "CREATE.h"
-#include "APIExport.h"
 
 namespace MbD {
 	class ASMTAssembly;
@@ -16,7 +15,7 @@ namespace MbD {
 	class ASMTSpatialContainer;
 	class ASMTPart;
 
-	class EXPORT ASMTItem
+	class ASMTItem
 	{
 		//
 	public:
diff --git a/OndselSolver/ASMTItemIJ.h b/OndselSolver/ASMTItemIJ.h
index 7445a5f..4788499 100644
--- a/OndselSolver/ASMTItemIJ.h
+++ b/OndselSolver/ASMTItemIJ.h
@@ -11,7 +11,7 @@
 #include "ASMTItem.h"
 
 namespace MbD {
-    class EXPORT ASMTItemIJ : public ASMTItem
+    class ASMTItemIJ : public ASMTItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTJoint.h b/OndselSolver/ASMTJoint.h
index ce10530..647ef23 100644
--- a/OndselSolver/ASMTJoint.h
+++ b/OndselSolver/ASMTJoint.h
@@ -13,7 +13,7 @@
 namespace MbD {
     class ForceTorqueData;
 
-    class EXPORT ASMTJoint : public ASMTConstraintSet
+    class ASMTJoint : public ASMTConstraintSet
     {
         //
     public:
diff --git a/OndselSolver/ASMTKinematicIJ.h b/OndselSolver/ASMTKinematicIJ.h
index 1948e57..d6871e7 100644
--- a/OndselSolver/ASMTKinematicIJ.h
+++ b/OndselSolver/ASMTKinematicIJ.h
@@ -11,7 +11,7 @@
 #include "ASMTItemIJ.h"
 
 namespace MbD {
-    class EXPORT ASMTKinematicIJ : public ASMTItemIJ
+    class ASMTKinematicIJ : public ASMTItemIJ
     {
         //
     public:
diff --git a/OndselSolver/ASMTLineInPlaneJoint.h b/OndselSolver/ASMTLineInPlaneJoint.h
index fd54159..3918c2e 100644
--- a/OndselSolver/ASMTLineInPlaneJoint.h
+++ b/OndselSolver/ASMTLineInPlaneJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTInPlaneJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTLineInPlaneJoint : public ASMTInPlaneJoint
+    class ASMTLineInPlaneJoint : public ASMTInPlaneJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTMarker.h b/OndselSolver/ASMTMarker.h
index 07ed6f6..fd06052 100644
--- a/OndselSolver/ASMTMarker.h
+++ b/OndselSolver/ASMTMarker.h
@@ -14,7 +14,7 @@
 #include "ASMTPart.h"
 
 namespace MbD {
-    class EXPORT ASMTMarker : public ASMTSpatialItem
+    class ASMTMarker : public ASMTSpatialItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTMotion.h b/OndselSolver/ASMTMotion.h
index 7a4e2e0..3b3b911 100644
--- a/OndselSolver/ASMTMotion.h
+++ b/OndselSolver/ASMTMotion.h
@@ -12,7 +12,7 @@
 #include "ForceTorqueData.h"
 
 namespace MbD {
-    class EXPORT ASMTMotion : public ASMTConstraintSet
+    class ASMTMotion : public ASMTConstraintSet
     {
         //
     public:
diff --git a/OndselSolver/ASMTNoRotationJoint.h b/OndselSolver/ASMTNoRotationJoint.h
index 8775eab..4939153 100644
--- a/OndselSolver/ASMTNoRotationJoint.h
+++ b/OndselSolver/ASMTNoRotationJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTNoRotationJoint : public ASMTJoint
+    class ASMTNoRotationJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTParallelAxesJoint.h b/OndselSolver/ASMTParallelAxesJoint.h
index 8899066..77576cb 100644
--- a/OndselSolver/ASMTParallelAxesJoint.h
+++ b/OndselSolver/ASMTParallelAxesJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTParallelAxesJoint : public ASMTJoint
+    class ASMTParallelAxesJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTPart.h b/OndselSolver/ASMTPart.h
index 7b50ab4..c52f5ae 100644
--- a/OndselSolver/ASMTPart.h
+++ b/OndselSolver/ASMTPart.h
@@ -13,7 +13,7 @@
 namespace MbD {
     class PosVelAccData;
 
-    class EXPORT ASMTPart : public ASMTSpatialContainer
+    class ASMTPart : public ASMTSpatialContainer
     {
         //
     public:
diff --git a/OndselSolver/ASMTPerpendicularJoint.h b/OndselSolver/ASMTPerpendicularJoint.h
index 5053343..0fdfc56 100644
--- a/OndselSolver/ASMTPerpendicularJoint.h
+++ b/OndselSolver/ASMTPerpendicularJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTPerpendicularJoint : public ASMTJoint
+    class ASMTPerpendicularJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTPlanarJoint.h b/OndselSolver/ASMTPlanarJoint.h
index 05b661c..8be2a61 100644
--- a/OndselSolver/ASMTPlanarJoint.h
+++ b/OndselSolver/ASMTPlanarJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTInPlaneJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTPlanarJoint : public ASMTInPlaneJoint
+    class ASMTPlanarJoint : public ASMTInPlaneJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTPointInLineJoint.h b/OndselSolver/ASMTPointInLineJoint.h
index b6028c3..7abd0c2 100644
--- a/OndselSolver/ASMTPointInLineJoint.h
+++ b/OndselSolver/ASMTPointInLineJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTInLineJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTPointInLineJoint : public ASMTInLineJoint
+    class ASMTPointInLineJoint : public ASMTInLineJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTPointInPlaneJoint.h b/OndselSolver/ASMTPointInPlaneJoint.h
index df1e903..6163d62 100644
--- a/OndselSolver/ASMTPointInPlaneJoint.h
+++ b/OndselSolver/ASMTPointInPlaneJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTInPlaneJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTPointInPlaneJoint : public ASMTInPlaneJoint
+    class ASMTPointInPlaneJoint : public ASMTInPlaneJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTPrincipalMassMarker.h b/OndselSolver/ASMTPrincipalMassMarker.h
index c4eed88..e2f09a9 100644
--- a/OndselSolver/ASMTPrincipalMassMarker.h
+++ b/OndselSolver/ASMTPrincipalMassMarker.h
@@ -11,7 +11,7 @@
 #include "ASMTSpatialItem.h"
 
 namespace MbD {
-	class EXPORT ASMTPrincipalMassMarker : public ASMTSpatialItem
+	class ASMTPrincipalMassMarker : public ASMTSpatialItem
 	{
 		//
 	public:
diff --git a/OndselSolver/ASMTRackPinionJoint.h b/OndselSolver/ASMTRackPinionJoint.h
index 070ab7c..b439a46 100644
--- a/OndselSolver/ASMTRackPinionJoint.h
+++ b/OndselSolver/ASMTRackPinionJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTRackPinionJoint : public ASMTJoint
+    class ASMTRackPinionJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTRefCurve.h b/OndselSolver/ASMTRefCurve.h
index e1e8126..695b7a0 100644
--- a/OndselSolver/ASMTRefCurve.h
+++ b/OndselSolver/ASMTRefCurve.h
@@ -11,7 +11,7 @@
 #include "ASMTRefItem.h"
 
 namespace MbD {
-    class EXPORT ASMTRefCurve : public ASMTRefItem
+    class ASMTRefCurve : public ASMTRefItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTRefItem.h b/OndselSolver/ASMTRefItem.h
index 10deb6d..c536b41 100644
--- a/OndselSolver/ASMTRefItem.h
+++ b/OndselSolver/ASMTRefItem.h
@@ -13,7 +13,7 @@
 
 namespace MbD {
 
-    class EXPORT ASMTRefItem : public ASMTSpatialItem
+    class ASMTRefItem : public ASMTSpatialItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTRefPoint.h b/OndselSolver/ASMTRefPoint.h
index 32c40e1..9c1897f 100644
--- a/OndselSolver/ASMTRefPoint.h
+++ b/OndselSolver/ASMTRefPoint.h
@@ -13,7 +13,7 @@
 #include <string>
 
 namespace MbD {
-    class EXPORT ASMTRefPoint : public ASMTRefItem
+    class ASMTRefPoint : public ASMTRefItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTRefSurface.h b/OndselSolver/ASMTRefSurface.h
index 5a9abc9..034c8d1 100644
--- a/OndselSolver/ASMTRefSurface.h
+++ b/OndselSolver/ASMTRefSurface.h
@@ -11,7 +11,7 @@
 #include "ASMTRefItem.h"
 
 namespace MbD {
-    class EXPORT ASMTRefSurface : public ASMTRefItem
+    class ASMTRefSurface : public ASMTRefItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTRevCylJoint.h b/OndselSolver/ASMTRevCylJoint.h
index 86ed87a..15c5eb0 100644
--- a/OndselSolver/ASMTRevCylJoint.h
+++ b/OndselSolver/ASMTRevCylJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTCompoundJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTRevCylJoint : public ASMTCompoundJoint
+    class ASMTRevCylJoint : public ASMTCompoundJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTRevoluteJoint.h b/OndselSolver/ASMTRevoluteJoint.h
index 71cc274..56969c7 100644
--- a/OndselSolver/ASMTRevoluteJoint.h
+++ b/OndselSolver/ASMTRevoluteJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTAtPointJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTRevoluteJoint : public ASMTAtPointJoint
+    class ASMTRevoluteJoint : public ASMTAtPointJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTRotationalMotion.h b/OndselSolver/ASMTRotationalMotion.h
index 3386358..f991d68 100644
--- a/OndselSolver/ASMTRotationalMotion.h
+++ b/OndselSolver/ASMTRotationalMotion.h
@@ -12,7 +12,7 @@
 #include "ZRotation.h"
 
 namespace MbD {
-    class EXPORT ASMTRotationalMotion : public ASMTMotion
+    class ASMTRotationalMotion : public ASMTMotion
     {
         //
     public:
diff --git a/OndselSolver/ASMTScrewJoint.h b/OndselSolver/ASMTScrewJoint.h
index a173357..a5962c6 100644
--- a/OndselSolver/ASMTScrewJoint.h
+++ b/OndselSolver/ASMTScrewJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTScrewJoint : public ASMTJoint
+    class ASMTScrewJoint : public ASMTJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTSimulationParameters.h b/OndselSolver/ASMTSimulationParameters.h
index c6b05ad..8083a3f 100644
--- a/OndselSolver/ASMTSimulationParameters.h
+++ b/OndselSolver/ASMTSimulationParameters.h
@@ -11,7 +11,7 @@
 #include "ASMTItem.h"
 
 namespace MbD {
-	class EXPORT ASMTSimulationParameters : public ASMTItem
+	class ASMTSimulationParameters : public ASMTItem
 	{
 		//
 	public:
diff --git a/OndselSolver/ASMTSpatialContainer.h b/OndselSolver/ASMTSpatialContainer.h
index c763e6a..415ac21 100644
--- a/OndselSolver/ASMTSpatialContainer.h
+++ b/OndselSolver/ASMTSpatialContainer.h
@@ -29,7 +29,7 @@ namespace MbD {
     class ASMTMotion;
     class ASMTMarker;
 
-    class EXPORT ASMTSpatialContainer : public ASMTSpatialItem
+    class ASMTSpatialContainer : public ASMTSpatialItem
     {
         //
     public:
diff --git a/OndselSolver/ASMTSpatialItem.h b/OndselSolver/ASMTSpatialItem.h
index 29bb7ad..16b81ea 100644
--- a/OndselSolver/ASMTSpatialItem.h
+++ b/OndselSolver/ASMTSpatialItem.h
@@ -11,7 +11,7 @@
 #include "ASMTItem.h"
 
 namespace MbD {
-	class EXPORT ASMTSpatialItem : public ASMTItem
+	class ASMTSpatialItem : public ASMTItem
 	{
 		//
 	public:
diff --git a/OndselSolver/ASMTSphSphJoint.h b/OndselSolver/ASMTSphSphJoint.h
index e824b95..92e43b8 100644
--- a/OndselSolver/ASMTSphSphJoint.h
+++ b/OndselSolver/ASMTSphSphJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTCompoundJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTSphSphJoint : public ASMTCompoundJoint
+    class ASMTSphSphJoint : public ASMTCompoundJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTSphericalJoint.h b/OndselSolver/ASMTSphericalJoint.h
index fa677cc..1d8b529 100644
--- a/OndselSolver/ASMTSphericalJoint.h
+++ b/OndselSolver/ASMTSphericalJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTAtPointJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTSphericalJoint : public ASMTAtPointJoint
+    class ASMTSphericalJoint : public ASMTAtPointJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTTranslationalJoint.h b/OndselSolver/ASMTTranslationalJoint.h
index 1c99b23..85272ff 100644
--- a/OndselSolver/ASMTTranslationalJoint.h
+++ b/OndselSolver/ASMTTranslationalJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTInLineJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTTranslationalJoint : public ASMTInLineJoint
+    class ASMTTranslationalJoint : public ASMTInLineJoint
     {
         //
     public:
diff --git a/OndselSolver/ASMTTranslationalMotion.h b/OndselSolver/ASMTTranslationalMotion.h
index f7c1e67..5aebf3d 100644
--- a/OndselSolver/ASMTTranslationalMotion.h
+++ b/OndselSolver/ASMTTranslationalMotion.h
@@ -11,7 +11,7 @@
 #include "ASMTMotion.h"
 
 namespace MbD {
-    class EXPORT ASMTTranslationalMotion : public ASMTMotion
+    class ASMTTranslationalMotion : public ASMTMotion
     {
         //
     public:
diff --git a/OndselSolver/ASMTUniversalJoint.h b/OndselSolver/ASMTUniversalJoint.h
index db45fcd..d9e17fc 100644
--- a/OndselSolver/ASMTUniversalJoint.h
+++ b/OndselSolver/ASMTUniversalJoint.h
@@ -11,7 +11,7 @@
 #include "ASMTAtPointJoint.h"
 
 namespace MbD {
-    class EXPORT ASMTUniversalJoint : public ASMTAtPointJoint
+    class ASMTUniversalJoint : public ASMTAtPointJoint
     {
         //
     public: