diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index f3f20a689d..cd154c3419 100644
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -414,7 +414,7 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC
     foreach(OCCT_PACKAGE ${USED_PACKAGES})
       EXTRACT_PACKAGE_FILES (${THE_RELATIVE_PATH} ${OCCT_PACKAGE} ALL_FILES _)
       set (HEADER_FILES_FILTERING ${ALL_FILES})
-      list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|lxx)")
+      list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|g|p|lxx)")
       list (APPEND OCCT_HEADER_FILES_COMPLETE ${HEADER_FILES_FILTERING})
     endforeach()
   endforeach()
@@ -453,7 +453,9 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC
     endif()
   endforeach()
 
-  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}")
+  set (OCCT_HEADER_FILES_INSTALLATION ${OCCT_HEADER_FILES_COMPLETE})
+  list (FILTER OCCT_HEADER_FILES_INSTALLATION INCLUDE REGEX ".*[.](h|lxx)$")
+  install (FILES ${OCCT_HEADER_FILES_INSTALLATION} DESTINATION "${INSTALL_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}")
 endfunction()
 
 function(ADD_PRECOMPILED_HEADER INPUT_TARGET PRECOMPILED_HEADER THE_IS_PRIVATE)
diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
index b7d8531d46..1a7eb59b5c 100644
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -64,7 +64,7 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
   set (HEADER_FILES_FILTERING ${ALL_FILES})
   set (SOURCE_FILES_FILTERING ${ALL_FILES})
   
-  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|lxx)")
+  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|p|g|lxx)")
   
   if(APPLE)
     list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|mm)")
diff --git a/src/RWStepAP203/FILES b/src/RWStepAP203/FILES
index 9451eba559..c7b3424b60 100644
--- a/src/RWStepAP203/FILES
+++ b/src/RWStepAP203/FILES
@@ -1,22 +1,22 @@
 RWStepAP203_RWCcDesignApproval.cxx
-RWStepAP203_RWCcDesignApproval.hxx
+RWStepAP203_RWCcDesignApproval.pxx
 RWStepAP203_RWCcDesignCertification.cxx
-RWStepAP203_RWCcDesignCertification.hxx
+RWStepAP203_RWCcDesignCertification.pxx
 RWStepAP203_RWCcDesignContract.cxx
-RWStepAP203_RWCcDesignContract.hxx
+RWStepAP203_RWCcDesignContract.pxx
 RWStepAP203_RWCcDesignDateAndTimeAssignment.cxx
-RWStepAP203_RWCcDesignDateAndTimeAssignment.hxx
+RWStepAP203_RWCcDesignDateAndTimeAssignment.pxx
 RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.cxx
-RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.hxx
+RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.pxx
 RWStepAP203_RWCcDesignSecurityClassification.cxx
-RWStepAP203_RWCcDesignSecurityClassification.hxx
+RWStepAP203_RWCcDesignSecurityClassification.pxx
 RWStepAP203_RWCcDesignSpecificationReference.cxx
-RWStepAP203_RWCcDesignSpecificationReference.hxx
+RWStepAP203_RWCcDesignSpecificationReference.pxx
 RWStepAP203_RWChange.cxx
-RWStepAP203_RWChange.hxx
+RWStepAP203_RWChange.pxx
 RWStepAP203_RWChangeRequest.cxx
-RWStepAP203_RWChangeRequest.hxx
+RWStepAP203_RWChangeRequest.pxx
 RWStepAP203_RWStartRequest.cxx
-RWStepAP203_RWStartRequest.hxx
+RWStepAP203_RWStartRequest.pxx
 RWStepAP203_RWStartWork.cxx
-RWStepAP203_RWStartWork.hxx
+RWStepAP203_RWStartWork.pxx
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.cxx b/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.cxx
index 0479a7be8f..fa02ef4b86 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWCcDesignApproval.hxx>
+#include "RWStepAP203_RWCcDesignApproval.pxx"
 #include <StepAP203_CcDesignApproval.hxx>
 #include <StepAP203_HArray1OfApprovedItem.hxx>
 #include <StepBasic_Approval.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.hxx b/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWCcDesignApproval.hxx
rename to src/RWStepAP203/RWStepAP203_RWCcDesignApproval.pxx
index 23e0ffa99a..7085e34a57 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignApproval.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWCcDesignApproval();
+  Standard_HIDDEN RWStepAP203_RWCcDesignApproval();
   
   //! Reads CcDesignApproval
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignApproval)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignApproval)& ent) const;
   
   //! Writes CcDesignApproval
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignApproval)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignApproval)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_CcDesignApproval)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_CcDesignApproval)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.cxx b/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.cxx
index 229ef4996b..ef2bfbdc7b 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWCcDesignCertification.hxx>
+#include "RWStepAP203_RWCcDesignCertification.pxx"
 #include <StepAP203_CcDesignCertification.hxx>
 #include <StepAP203_CertifiedItem.hxx>
 #include <StepAP203_HArray1OfCertifiedItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.hxx b/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWCcDesignCertification.hxx
rename to src/RWStepAP203/RWStepAP203_RWCcDesignCertification.pxx
index 1ee7e08fef..3d73475106 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignCertification.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWCcDesignCertification();
+  Standard_HIDDEN RWStepAP203_RWCcDesignCertification();
   
   //! Reads CcDesignCertification
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignCertification)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignCertification)& ent) const;
   
   //! Writes CcDesignCertification
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignCertification)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignCertification)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_CcDesignCertification)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_CcDesignCertification)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignContract.cxx b/src/RWStepAP203/RWStepAP203_RWCcDesignContract.cxx
index 534e31f22d..9176027046 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignContract.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignContract.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWCcDesignContract.hxx>
+#include "RWStepAP203_RWCcDesignContract.pxx"
 #include <StepAP203_CcDesignContract.hxx>
 #include <StepAP203_ContractedItem.hxx>
 #include <StepAP203_HArray1OfContractedItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignContract.hxx b/src/RWStepAP203/RWStepAP203_RWCcDesignContract.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWCcDesignContract.hxx
rename to src/RWStepAP203/RWStepAP203_RWCcDesignContract.pxx
index 2cf876e822..fd258cf5af 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignContract.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignContract.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWCcDesignContract();
+  Standard_HIDDEN RWStepAP203_RWCcDesignContract();
   
   //! Reads CcDesignContract
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignContract)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignContract)& ent) const;
   
   //! Writes CcDesignContract
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignContract)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignContract)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_CcDesignContract)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_CcDesignContract)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.cxx b/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.cxx
index 9bc82a05c0..a345c85f15 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWCcDesignDateAndTimeAssignment.hxx>
+#include "RWStepAP203_RWCcDesignDateAndTimeAssignment.pxx"
 #include <StepAP203_CcDesignDateAndTimeAssignment.hxx>
 #include <StepAP203_DateTimeItem.hxx>
 #include <StepAP203_HArray1OfDateTimeItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.hxx b/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.hxx
rename to src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.pxx
index 391ba6fc17..7c864bee5d 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWCcDesignDateAndTimeAssignment();
+  Standard_HIDDEN RWStepAP203_RWCcDesignDateAndTimeAssignment();
   
   //! Reads CcDesignDateAndTimeAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignDateAndTimeAssignment)& ent) const;
   
   //! Writes CcDesignDateAndTimeAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignDateAndTimeAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_CcDesignDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_CcDesignDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.cxx b/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.cxx
index 596d5ee57c..c79f610697 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.hxx>
+#include "RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.pxx"
 #include <StepAP203_CcDesignPersonAndOrganizationAssignment.hxx>
 #include <StepAP203_HArray1OfPersonOrganizationItem.hxx>
 #include <StepAP203_PersonOrganizationItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.hxx b/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.pxx
similarity index 88%
rename from src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.hxx
rename to src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.pxx
index dded8c77e9..f33b970f62 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWCcDesignPersonAndOrganizationAssignment();
+  Standard_HIDDEN RWStepAP203_RWCcDesignPersonAndOrganizationAssignment();
   
   //! Reads CcDesignPersonAndOrganizationAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignPersonAndOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignPersonAndOrganizationAssignment)& ent) const;
   
   //! Writes CcDesignPersonAndOrganizationAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignPersonAndOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignPersonAndOrganizationAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_CcDesignPersonAndOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_CcDesignPersonAndOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.cxx b/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.cxx
index 97f7b7f5b7..7f040b624d 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWCcDesignSecurityClassification.hxx>
+#include "RWStepAP203_RWCcDesignSecurityClassification.pxx"
 #include <StepAP203_CcDesignSecurityClassification.hxx>
 #include <StepAP203_ClassifiedItem.hxx>
 #include <StepAP203_HArray1OfClassifiedItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.hxx b/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.hxx
rename to src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.pxx
index 2304581028..e9d17e90fb 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWCcDesignSecurityClassification();
+  Standard_HIDDEN RWStepAP203_RWCcDesignSecurityClassification();
   
   //! Reads CcDesignSecurityClassification
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignSecurityClassification)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignSecurityClassification)& ent) const;
   
   //! Writes CcDesignSecurityClassification
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignSecurityClassification)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignSecurityClassification)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_CcDesignSecurityClassification)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_CcDesignSecurityClassification)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.cxx b/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.cxx
index 1491e540af..27339b3e60 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWCcDesignSpecificationReference.hxx>
+#include "RWStepAP203_RWCcDesignSpecificationReference.pxx"
 #include <StepAP203_CcDesignSpecificationReference.hxx>
 #include <StepAP203_HArray1OfSpecifiedItem.hxx>
 #include <StepAP203_SpecifiedItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.hxx b/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.hxx
rename to src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.pxx
index 0c87939c20..55eca479a7 100644
--- a/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWCcDesignSpecificationReference();
+  Standard_HIDDEN RWStepAP203_RWCcDesignSpecificationReference();
   
   //! Reads CcDesignSpecificationReference
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignSpecificationReference)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_CcDesignSpecificationReference)& ent) const;
   
   //! Writes CcDesignSpecificationReference
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignSpecificationReference)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_CcDesignSpecificationReference)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_CcDesignSpecificationReference)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_CcDesignSpecificationReference)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWChange.cxx b/src/RWStepAP203/RWStepAP203_RWChange.cxx
index 6968c959da..c90ffcd04e 100644
--- a/src/RWStepAP203/RWStepAP203_RWChange.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWChange.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWChange.hxx>
+#include "RWStepAP203_RWChange.pxx"
 #include <StepAP203_Change.hxx>
 #include <StepAP203_HArray1OfWorkItem.hxx>
 #include <StepAP203_WorkItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWChange.hxx b/src/RWStepAP203/RWStepAP203_RWChange.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWChange.hxx
rename to src/RWStepAP203/RWStepAP203_RWChange.pxx
index 954b0b0e66..8653f3ba7a 100644
--- a/src/RWStepAP203/RWStepAP203_RWChange.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWChange.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWChange();
+  Standard_HIDDEN RWStepAP203_RWChange();
   
   //! Reads Change
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_Change)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_Change)& ent) const;
   
   //! Writes Change
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_Change)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_Change)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_Change)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_Change)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWChangeRequest.cxx b/src/RWStepAP203/RWStepAP203_RWChangeRequest.cxx
index 3000d5440a..1d9da713dc 100644
--- a/src/RWStepAP203/RWStepAP203_RWChangeRequest.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWChangeRequest.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWChangeRequest.hxx>
+#include "RWStepAP203_RWChangeRequest.pxx"
 #include <StepAP203_ChangeRequest.hxx>
 #include <StepAP203_ChangeRequestItem.hxx>
 #include <StepAP203_HArray1OfChangeRequestItem.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWChangeRequest.hxx b/src/RWStepAP203/RWStepAP203_RWChangeRequest.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWChangeRequest.hxx
rename to src/RWStepAP203/RWStepAP203_RWChangeRequest.pxx
index ce8914e5b0..df76f42a2e 100644
--- a/src/RWStepAP203/RWStepAP203_RWChangeRequest.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWChangeRequest.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWChangeRequest();
+  Standard_HIDDEN RWStepAP203_RWChangeRequest();
   
   //! Reads ChangeRequest
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_ChangeRequest)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_ChangeRequest)& ent) const;
   
   //! Writes ChangeRequest
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_ChangeRequest)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_ChangeRequest)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_ChangeRequest)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_ChangeRequest)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWStartRequest.cxx b/src/RWStepAP203/RWStepAP203_RWStartRequest.cxx
index 57dc2e0997..aaaeae8605 100644
--- a/src/RWStepAP203/RWStepAP203_RWStartRequest.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWStartRequest.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWStartRequest.hxx>
+#include "RWStepAP203_RWStartRequest.pxx"
 #include <StepAP203_StartRequest.hxx>
 #include <StepAP203_StartRequestItem.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWStartRequest.hxx b/src/RWStepAP203/RWStepAP203_RWStartRequest.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWStartRequest.hxx
rename to src/RWStepAP203/RWStepAP203_RWStartRequest.pxx
index b66fa5c5ad..4a8ed3c763 100644
--- a/src/RWStepAP203/RWStepAP203_RWStartRequest.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWStartRequest.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWStartRequest();
+  Standard_HIDDEN RWStepAP203_RWStartRequest();
   
   //! Reads StartRequest
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_StartRequest)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_StartRequest)& ent) const;
   
   //! Writes StartRequest
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_StartRequest)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_StartRequest)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_StartRequest)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_StartRequest)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP203/RWStepAP203_RWStartWork.cxx b/src/RWStepAP203/RWStepAP203_RWStartWork.cxx
index fe486e5d50..84e2c869f1 100644
--- a/src/RWStepAP203/RWStepAP203_RWStartWork.cxx
+++ b/src/RWStepAP203/RWStepAP203_RWStartWork.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP203_RWStartWork.hxx>
+#include "RWStepAP203_RWStartWork.pxx"
 #include <StepAP203_StartWork.hxx>
 #include <StepAP203_WorkItem.hxx>
 #include <StepBasic_Action.hxx>
diff --git a/src/RWStepAP203/RWStepAP203_RWStartWork.hxx b/src/RWStepAP203/RWStepAP203_RWStartWork.pxx
similarity index 87%
rename from src/RWStepAP203/RWStepAP203_RWStartWork.hxx
rename to src/RWStepAP203/RWStepAP203_RWStartWork.pxx
index a2d5052533..969a282d43 100644
--- a/src/RWStepAP203/RWStepAP203_RWStartWork.hxx
+++ b/src/RWStepAP203/RWStepAP203_RWStartWork.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP203_RWStartWork();
+  Standard_HIDDEN RWStepAP203_RWStartWork();
   
   //! Reads StartWork
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_StartWork)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP203_StartWork)& ent) const;
   
   //! Writes StartWork
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_StartWork)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP203_StartWork)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP203_StartWork)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP203_StartWork)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/FILES b/src/RWStepAP214/FILES
index 5410d1d7e8..269f9de267 100755
--- a/src/RWStepAP214/FILES
+++ b/src/RWStepAP214/FILES
@@ -1,58 +1,58 @@
 RWStepAP214.cxx
-RWStepAP214.hxx
+RWStepAP214.pxx
 RWStepAP214_GeneralModule.cxx
-RWStepAP214_GeneralModule.hxx
+RWStepAP214_GeneralModule.pxx
 RWStepAP214_ReadWriteModule.cxx
-RWStepAP214_ReadWriteModule.hxx
+RWStepAP214_ReadWriteModule.pxx
 RWStepAP214_RWAppliedApprovalAssignment.cxx
-RWStepAP214_RWAppliedApprovalAssignment.hxx
+RWStepAP214_RWAppliedApprovalAssignment.pxx
 RWStepAP214_RWAppliedDateAndTimeAssignment.cxx
-RWStepAP214_RWAppliedDateAndTimeAssignment.hxx
+RWStepAP214_RWAppliedDateAndTimeAssignment.pxx
 RWStepAP214_RWAppliedDateAssignment.cxx
-RWStepAP214_RWAppliedDateAssignment.hxx
+RWStepAP214_RWAppliedDateAssignment.pxx
 RWStepAP214_RWAppliedDocumentReference.cxx
-RWStepAP214_RWAppliedDocumentReference.hxx
+RWStepAP214_RWAppliedDocumentReference.pxx
 RWStepAP214_RWAppliedExternalIdentificationAssignment.cxx
-RWStepAP214_RWAppliedExternalIdentificationAssignment.hxx
+RWStepAP214_RWAppliedExternalIdentificationAssignment.pxx
 RWStepAP214_RWAppliedGroupAssignment.cxx
-RWStepAP214_RWAppliedGroupAssignment.hxx
+RWStepAP214_RWAppliedGroupAssignment.pxx
 RWStepAP214_RWAppliedOrganizationAssignment.cxx
-RWStepAP214_RWAppliedOrganizationAssignment.hxx
+RWStepAP214_RWAppliedOrganizationAssignment.pxx
 RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx
-RWStepAP214_RWAppliedPersonAndOrganizationAssignment.hxx
+RWStepAP214_RWAppliedPersonAndOrganizationAssignment.pxx
 RWStepAP214_RWAppliedPresentedItem.cxx
-RWStepAP214_RWAppliedPresentedItem.hxx
+RWStepAP214_RWAppliedPresentedItem.pxx
 RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx
-RWStepAP214_RWAppliedSecurityClassificationAssignment.hxx
+RWStepAP214_RWAppliedSecurityClassificationAssignment.pxx
 RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx
-RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.hxx
+RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.pxx
 RWStepAP214_RWAutoDesignActualDateAssignment.cxx
-RWStepAP214_RWAutoDesignActualDateAssignment.hxx
+RWStepAP214_RWAutoDesignActualDateAssignment.pxx
 RWStepAP214_RWAutoDesignApprovalAssignment.cxx
-RWStepAP214_RWAutoDesignApprovalAssignment.hxx
+RWStepAP214_RWAutoDesignApprovalAssignment.pxx
 RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx
-RWStepAP214_RWAutoDesignDateAndPersonAssignment.hxx
+RWStepAP214_RWAutoDesignDateAndPersonAssignment.pxx
 RWStepAP214_RWAutoDesignDocumentReference.cxx
-RWStepAP214_RWAutoDesignDocumentReference.hxx
+RWStepAP214_RWAutoDesignDocumentReference.pxx
 RWStepAP214_RWAutoDesignGroupAssignment.cxx
-RWStepAP214_RWAutoDesignGroupAssignment.hxx
+RWStepAP214_RWAutoDesignGroupAssignment.pxx
 RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx
-RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.hxx
+RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.pxx
 RWStepAP214_RWAutoDesignNominalDateAssignment.cxx
-RWStepAP214_RWAutoDesignNominalDateAssignment.hxx
+RWStepAP214_RWAutoDesignNominalDateAssignment.pxx
 RWStepAP214_RWAutoDesignOrganizationAssignment.cxx
-RWStepAP214_RWAutoDesignOrganizationAssignment.hxx
+RWStepAP214_RWAutoDesignOrganizationAssignment.pxx
 RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx
-RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.hxx
+RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.pxx
 RWStepAP214_RWAutoDesignPresentedItem.cxx
-RWStepAP214_RWAutoDesignPresentedItem.hxx
+RWStepAP214_RWAutoDesignPresentedItem.pxx
 RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx
-RWStepAP214_RWAutoDesignSecurityClassificationAssignment.hxx
+RWStepAP214_RWAutoDesignSecurityClassificationAssignment.pxx
 RWStepAP214_RWClass.cxx
-RWStepAP214_RWClass.hxx
+RWStepAP214_RWClass.pxx
 RWStepAP214_RWExternallyDefinedClass.cxx
-RWStepAP214_RWExternallyDefinedClass.hxx
+RWStepAP214_RWExternallyDefinedClass.pxx
 RWStepAP214_RWExternallyDefinedGeneralProperty.cxx
-RWStepAP214_RWExternallyDefinedGeneralProperty.hxx
+RWStepAP214_RWExternallyDefinedGeneralProperty.pxx
 RWStepAP214_RWRepItemGroup.cxx
-RWStepAP214_RWRepItemGroup.hxx
+RWStepAP214_RWRepItemGroup.pxx
diff --git a/src/RWStepAP214/RWStepAP214.cxx b/src/RWStepAP214/RWStepAP214.cxx
index b1608e0442..3adad8e66d 100644
--- a/src/RWStepAP214/RWStepAP214.cxx
+++ b/src/RWStepAP214/RWStepAP214.cxx
@@ -11,13 +11,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepAP214.hxx>
+#include "RWStepAP214.pxx"
 
 #include <Interface_GeneralLib.hxx>
 #include <Interface_ReaderLib.hxx>
 #include <RWHeaderSection.hxx>
-#include <RWStepAP214_GeneralModule.hxx>
-#include <RWStepAP214_ReadWriteModule.hxx>
+#include "RWStepAP214_GeneralModule.pxx"
+#include "RWStepAP214_ReadWriteModule.pxx"
 #include <StepAP214.hxx>
 #include <StepAP214_Protocol.hxx>
 #include <StepData_WriterLib.hxx>
diff --git a/src/RWStepAP214/RWStepAP214.hxx b/src/RWStepAP214/RWStepAP214.pxx
similarity index 96%
rename from src/RWStepAP214/RWStepAP214.hxx
rename to src/RWStepAP214/RWStepAP214.pxx
index 0d6af9fedc..f07537a339 100644
--- a/src/RWStepAP214/RWStepAP214.hxx
+++ b/src/RWStepAP214/RWStepAP214.pxx
@@ -32,7 +32,7 @@ public:
 
   
   //! enforced the initialisation of the  libraries
-  Standard_EXPORT static void Init();
+  Standard_HIDDEN static void Init();
 
 };
 
diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
index 43d4b0286f..12bc7ce3c1 100644
--- a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
+++ b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
@@ -21,469 +21,469 @@
 #include <Interface_EntityIterator.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepAP203_RWCcDesignApproval.hxx>
-#include <RWStepAP203_RWCcDesignCertification.hxx>
-#include <RWStepAP203_RWCcDesignContract.hxx>
-#include <RWStepAP203_RWCcDesignDateAndTimeAssignment.hxx>
-#include <RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.hxx>
-#include <RWStepAP203_RWCcDesignSecurityClassification.hxx>
-#include <RWStepAP203_RWCcDesignSpecificationReference.hxx>
-#include <RWStepAP203_RWChange.hxx>
-#include <RWStepAP203_RWChangeRequest.hxx>
-#include <RWStepAP203_RWStartRequest.hxx>
-#include <RWStepAP203_RWStartWork.hxx>
-#include <RWStepAP214_GeneralModule.hxx>
-#include <RWStepAP214_RWAppliedApprovalAssignment.hxx>
-#include <RWStepAP214_RWAppliedDateAndTimeAssignment.hxx>
-#include <RWStepAP214_RWAppliedDateAssignment.hxx>
-#include <RWStepAP214_RWAppliedDocumentReference.hxx>
-#include <RWStepAP214_RWAppliedExternalIdentificationAssignment.hxx>
-#include <RWStepAP214_RWAppliedGroupAssignment.hxx>
-#include <RWStepAP214_RWAppliedOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAppliedPersonAndOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAppliedPresentedItem.hxx>
-#include <RWStepAP214_RWAppliedSecurityClassificationAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignActualDateAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignApprovalAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignDateAndPersonAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignDocumentReference.hxx>
-#include <RWStepAP214_RWAutoDesignGroupAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignNominalDateAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignPresentedItem.hxx>
-#include <RWStepAP214_RWAutoDesignSecurityClassificationAssignment.hxx>
-#include <RWStepAP214_RWClass.hxx>
-#include <RWStepAP214_RWExternallyDefinedClass.hxx>
-#include <RWStepAP214_RWExternallyDefinedGeneralProperty.hxx>
-#include <RWStepBasic_RWAction.hxx>
-#include <RWStepBasic_RWActionAssignment.hxx>
-#include <RWStepBasic_RWActionMethod.hxx>
-#include <RWStepBasic_RWActionRequestAssignment.hxx>
-#include <RWStepBasic_RWActionRequestSolution.hxx>
-#include <RWStepBasic_RWApplicationContextElement.hxx>
-#include <RWStepBasic_RWApplicationProtocolDefinition.hxx>
-#include <RWStepBasic_RWApproval.hxx>
-#include <RWStepBasic_RWApprovalDateTime.hxx>
-#include <RWStepBasic_RWApprovalPersonOrganization.hxx>
-#include <RWStepBasic_RWApprovalRelationship.hxx>
-#include <RWStepBasic_RWCertification.hxx>
-#include <RWStepBasic_RWCertificationAssignment.hxx>
-#include <RWStepBasic_RWCertificationType.hxx>
-#include <RWStepBasic_RWContract.hxx>
-#include <RWStepBasic_RWContractAssignment.hxx>
-#include <RWStepBasic_RWContractType.hxx>
-#include <RWStepBasic_RWConversionBasedUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndLengthUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx>
-#include <RWStepBasic_RWDateAndTime.hxx>
-#include <RWStepBasic_RWDerivedUnit.hxx>
-#include <RWStepBasic_RWDerivedUnitElement.hxx>
-#include <RWStepBasic_RWDocument.hxx>
-#include <RWStepBasic_RWDocumentFile.hxx>
-#include <RWStepBasic_RWDocumentProductAssociation.hxx>
-#include <RWStepBasic_RWDocumentProductEquivalence.hxx>
-#include <RWStepBasic_RWDocumentRelationship.hxx>
-#include <RWStepBasic_RWDocumentRepresentationType.hxx>
-#include <RWStepBasic_RWDocumentType.hxx>
-#include <RWStepBasic_RWDocumentUsageConstraint.hxx>
-#include <RWStepBasic_RWEffectivity.hxx>
-#include <RWStepBasic_RWEffectivityAssignment.hxx>
-#include <RWStepBasic_RWEulerAngles.hxx>
-#include <RWStepBasic_RWExternalIdentificationAssignment.hxx>
-#include <RWStepBasic_RWExternallyDefinedItem.hxx>
-#include <RWStepBasic_RWGeneralProperty.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
-#include <RWStepBasic_RWGroupRelationship.hxx>
-#include <RWStepBasic_RWIdentificationAssignment.hxx>
-#include <RWStepBasic_RWIdentificationRole.hxx>
-#include <RWStepBasic_RWLengthMeasureWithUnit.hxx>
-#include <RWStepBasic_RWLengthUnit.hxx>
-#include <RWStepBasic_RWLocalTime.hxx>
-#include <RWStepBasic_RWMassUnit.hxx>
-#include <RWStepBasic_RWMeasureWithUnit.hxx>
-#include <RWStepBasic_RWMechanicalContext.hxx>
-#include <RWStepBasic_RWNameAssignment.hxx>
-#include <RWStepBasic_RWNamedUnit.hxx>
-#include <RWStepBasic_RWObjectRole.hxx>
-#include <RWStepBasic_RWOrganizationalAddress.hxx>
-#include <RWStepBasic_RWPersonalAddress.hxx>
-#include <RWStepBasic_RWPersonAndOrganization.hxx>
-#include <RWStepBasic_RWPlaneAngleMeasureWithUnit.hxx>
-#include <RWStepBasic_RWPlaneAngleUnit.hxx>
-#include <RWStepBasic_RWProduct.hxx>
-#include <RWStepBasic_RWProductCategoryRelationship.hxx>
-#include <RWStepBasic_RWProductConceptContext.hxx>
-#include <RWStepBasic_RWProductContext.hxx>
-#include <RWStepBasic_RWProductDefinition.hxx>
-#include <RWStepBasic_RWProductDefinitionContext.hxx>
-#include <RWStepBasic_RWProductDefinitionEffectivity.hxx>
-#include <RWStepBasic_RWProductDefinitionFormation.hxx>
-#include <RWStepBasic_RWProductDefinitionFormationRelationship.hxx>
-#include <RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.hxx>
-#include <RWStepBasic_RWProductDefinitionRelationship.hxx>
-#include <RWStepBasic_RWProductDefinitionWithAssociatedDocuments.hxx>
-#include <RWStepBasic_RWProductRelatedProductCategory.hxx>
-#include <RWStepBasic_RWProductType.hxx>
-#include <RWStepBasic_RWRatioMeasureWithUnit.hxx>
-#include <RWStepBasic_RWRoleAssociation.hxx>
-#include <RWStepBasic_RWSecurityClassification.hxx>
-#include <RWStepBasic_RWSolidAngleMeasureWithUnit.hxx>
-#include <RWStepBasic_RWSolidAngleUnit.hxx>
-#include <RWStepBasic_RWThermodynamicTemperatureUnit.hxx>
-#include <RWStepBasic_RWUncertaintyMeasureWithUnit.hxx>
-#include <RWStepBasic_RWVersionedActionRequest.hxx>
-#include <RWStepDimTol_RWAngularityTolerance.hxx>
-#include <RWStepDimTol_RWCircularRunoutTolerance.hxx>
-#include <RWStepDimTol_RWCoaxialityTolerance.hxx>
-#include <RWStepDimTol_RWCommonDatum.hxx>
-#include <RWStepDimTol_RWConcentricityTolerance.hxx>
-#include <RWStepDimTol_RWCylindricityTolerance.hxx>
-#include <RWStepDimTol_RWDatum.hxx>
-#include <RWStepDimTol_RWDatumFeature.hxx>
-#include <RWStepDimTol_RWDatumReference.hxx>
-#include <RWStepDimTol_RWDatumTarget.hxx>
-#include <RWStepDimTol_RWFlatnessTolerance.hxx>
-#include <RWStepDimTol_RWGeometricTolerance.hxx>
-#include <RWStepDimTol_RWGeometricToleranceRelationship.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
-#include <RWStepDimTol_RWLineProfileTolerance.hxx>
-#include <RWStepDimTol_RWModifiedGeometricTolerance.hxx>
-#include <RWStepDimTol_RWParallelismTolerance.hxx>
-#include <RWStepDimTol_RWPerpendicularityTolerance.hxx>
-#include <RWStepDimTol_RWPlacedDatumTargetFeature.hxx>
-#include <RWStepDimTol_RWPositionTolerance.hxx>
-#include <RWStepDimTol_RWRoundnessTolerance.hxx>
-#include <RWStepDimTol_RWStraightnessTolerance.hxx>
-#include <RWStepDimTol_RWSurfaceProfileTolerance.hxx>
-#include <RWStepDimTol_RWSymmetryTolerance.hxx>
-#include <RWStepDimTol_RWTotalRunoutTolerance.hxx>
-#include <RWStepElement_RWAnalysisItemWithinRepresentation.hxx>
-#include <RWStepElement_RWCurve3dElementDescriptor.hxx>
-#include <RWStepElement_RWCurveElementEndReleasePacket.hxx>
-#include <RWStepElement_RWCurveElementSectionDefinition.hxx>
-#include <RWStepElement_RWCurveElementSectionDerivedDefinitions.hxx>
-#include <RWStepElement_RWElementDescriptor.hxx>
-#include <RWStepElement_RWElementMaterial.hxx>
-#include <RWStepElement_RWSurface3dElementDescriptor.hxx>
-#include <RWStepElement_RWSurfaceElementProperty.hxx>
-#include <RWStepElement_RWSurfaceSection.hxx>
-#include <RWStepElement_RWSurfaceSectionField.hxx>
-#include <RWStepElement_RWSurfaceSectionFieldConstant.hxx>
-#include <RWStepElement_RWSurfaceSectionFieldVarying.hxx>
-#include <RWStepElement_RWUniformSurfaceSection.hxx>
-#include <RWStepElement_RWVolume3dElementDescriptor.hxx>
-#include <RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWConstantSurface3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWCurve3dElementProperty.hxx>
-#include <RWStepFEA_RWCurve3dElementRepresentation.hxx>
-#include <RWStepFEA_RWCurveElementEndOffset.hxx>
-#include <RWStepFEA_RWCurveElementEndRelease.hxx>
-#include <RWStepFEA_RWCurveElementInterval.hxx>
-#include <RWStepFEA_RWCurveElementIntervalConstant.hxx>
-#include <RWStepFEA_RWCurveElementIntervalLinearlyVarying.hxx>
-#include <RWStepFEA_RWCurveElementLocation.hxx>
-#include <RWStepFEA_RWDummyNode.hxx>
-#include <RWStepFEA_RWElementGeometricRelationship.hxx>
-#include <RWStepFEA_RWElementGroup.hxx>
-#include <RWStepFEA_RWElementRepresentation.hxx>
-#include <RWStepFEA_RWFeaAreaDensity.hxx>
-#include <RWStepFEA_RWFeaAxis2Placement3d.hxx>
-#include <RWStepFEA_RWFeaCurveSectionGeometricRelationship.hxx>
-#include <RWStepFEA_RWFeaGroup.hxx>
-#include <RWStepFEA_RWFeaLinearElasticity.hxx>
-#include <RWStepFEA_RWFeaMassDensity.hxx>
-#include <RWStepFEA_RWFeaMaterialPropertyRepresentation.hxx>
-#include <RWStepFEA_RWFeaMaterialPropertyRepresentationItem.hxx>
-#include <RWStepFEA_RWFeaModel.hxx>
-#include <RWStepFEA_RWFeaModel3d.hxx>
-#include <RWStepFEA_RWFeaModelDefinition.hxx>
-#include <RWStepFEA_RWFeaMoistureAbsorption.hxx>
-#include <RWStepFEA_RWFeaParametricPoint.hxx>
-#include <RWStepFEA_RWFeaRepresentationItem.hxx>
-#include <RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.hxx>
-#include <RWStepFEA_RWFeaShellBendingStiffness.hxx>
-#include <RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.hxx>
-#include <RWStepFEA_RWFeaShellMembraneStiffness.hxx>
-#include <RWStepFEA_RWFeaShellShearStiffness.hxx>
-#include <RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.hxx>
-#include <RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.hxx>
-#include <RWStepFEA_RWFreedomAndCoefficient.hxx>
-#include <RWStepFEA_RWFreedomsList.hxx>
-#include <RWStepFEA_RWGeometricNode.hxx>
-#include <RWStepFEA_RWNode.hxx>
-#include <RWStepFEA_RWNodeDefinition.hxx>
-#include <RWStepFEA_RWNodeGroup.hxx>
-#include <RWStepFEA_RWNodeRepresentation.hxx>
-#include <RWStepFEA_RWNodeSet.hxx>
-#include <RWStepFEA_RWNodeWithSolutionCoordinateSystem.hxx>
-#include <RWStepFEA_RWNodeWithVector.hxx>
-#include <RWStepFEA_RWParametricCurve3dElementCoordinateDirection.hxx>
-#include <RWStepFEA_RWParametricCurve3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWParametricSurface3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWSurface3dElementRepresentation.hxx>
-#include <RWStepFEA_RWVolume3dElementRepresentation.hxx>
-#include <RWStepGeom_RWAxis1Placement.hxx>
-#include <RWStepGeom_RWAxis2Placement2d.hxx>
-#include <RWStepGeom_RWAxis2Placement3d.hxx>
-#include <RWStepGeom_RWBezierCurve.hxx>
-#include <RWStepGeom_RWBezierCurveAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWBezierSurface.hxx>
-#include <RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWBoundaryCurve.hxx>
-#include <RWStepGeom_RWBSplineCurve.hxx>
-#include <RWStepGeom_RWBSplineCurveWithKnots.hxx>
-#include <RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWBSplineSurface.hxx>
-#include <RWStepGeom_RWBSplineSurfaceWithKnots.hxx>
-#include <RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWCartesianTransformationOperator.hxx>
-#include <RWStepGeom_RWCartesianTransformationOperator3d.hxx>
-#include <RWStepGeom_RWCircle.hxx>
-#include <RWStepGeom_RWCompositeCurve.hxx>
-#include <RWStepGeom_RWCompositeCurveOnSurface.hxx>
-#include <RWStepGeom_RWCompositeCurveSegment.hxx>
-#include <RWStepGeom_RWConic.hxx>
-#include <RWStepGeom_RWConicalSurface.hxx>
-#include <RWStepGeom_RWCurveBoundedSurface.hxx>
-#include <RWStepGeom_RWCurveReplica.hxx>
-#include <RWStepGeom_RWCylindricalSurface.hxx>
-#include <RWStepGeom_RWDegeneratePcurve.hxx>
-#include <RWStepGeom_RWDegenerateToroidalSurface.hxx>
-#include <RWStepGeom_RWDirection.hxx>
-#include <RWStepGeom_RWElementarySurface.hxx>
-#include <RWStepGeom_RWEllipse.hxx>
-#include <RWStepGeom_RWEvaluatedDegeneratePcurve.hxx>
-#include <RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
-#include <RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.hxx>
-#include <RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
-#include <RWStepGeom_RWHyperbola.hxx>
-#include <RWStepGeom_RWIntersectionCurve.hxx>
-#include <RWStepGeom_RWLine.hxx>
-#include <RWStepGeom_RWOffsetCurve3d.hxx>
-#include <RWStepGeom_RWOffsetSurface.hxx>
-#include <RWStepGeom_RWOrientedSurface.hxx>
-#include <RWStepGeom_RWOuterBoundaryCurve.hxx>
-#include <RWStepGeom_RWParabola.hxx>
-#include <RWStepGeom_RWPcurve.hxx>
-#include <RWStepGeom_RWPlacement.hxx>
-#include <RWStepGeom_RWPlane.hxx>
-#include <RWStepGeom_RWPointOnCurve.hxx>
-#include <RWStepGeom_RWPointOnSurface.hxx>
-#include <RWStepGeom_RWPointReplica.hxx>
-#include <RWStepGeom_RWPolyline.hxx>
-#include <RWStepGeom_RWQuasiUniformCurve.hxx>
-#include <RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWQuasiUniformSurface.hxx>
-#include <RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWRectangularCompositeSurface.hxx>
-#include <RWStepGeom_RWRectangularTrimmedSurface.hxx>
-#include <RWStepGeom_RWReparametrisedCompositeCurveSegment.hxx>
-#include <RWStepGeom_RWSeamCurve.hxx>
-#include <RWStepGeom_RWSphericalSurface.hxx>
-#include <RWStepGeom_RWSurfaceCurve.hxx>
-#include <RWStepGeom_RWSurfaceCurveAndBoundedCurve.hxx>
-#include <RWStepGeom_RWSurfaceOfLinearExtrusion.hxx>
-#include <RWStepGeom_RWSurfaceOfRevolution.hxx>
-#include <RWStepGeom_RWSurfacePatch.hxx>
-#include <RWStepGeom_RWSurfaceReplica.hxx>
-#include <RWStepGeom_RWSweptSurface.hxx>
-#include <RWStepGeom_RWToroidalSurface.hxx>
-#include <RWStepGeom_RWTrimmedCurve.hxx>
-#include <RWStepGeom_RWUniformCurve.hxx>
-#include <RWStepGeom_RWUniformCurveAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWUniformSurface.hxx>
-#include <RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWVector.hxx>
-#include <RWStepGeom_RWSuParameters.hxx>
-#include <RWStepRepr_RWAssemblyComponentUsage.hxx>
-#include <RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx>
-#include <RWStepRepr_RWCompositeShapeAspect.hxx>
-#include <RWStepRepr_RWCompoundRepresentationItem.hxx>
-#include <RWStepRepr_RWConfigurationDesign.hxx>
-#include <RWStepRepr_RWConfigurationEffectivity.hxx>
-#include <RWStepRepr_RWConstructiveGeometryRepresentation.hxx>
-#include <RWStepRepr_RWConstructiveGeometryRepresentationRelationship.hxx>
-#include <RWStepRepr_RWDataEnvironment.hxx>
-#include <RWStepRepr_RWDefinitionalRepresentation.hxx>
-#include <RWStepRepr_RWDerivedShapeAspect.hxx>
-#include <RWStepRepr_RWExtension.hxx>
-#include <RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx>
-#include <RWStepRepr_RWGlobalUnitAssignedContext.hxx>
-#include <RWStepRepr_RWItemDefinedTransformation.hxx>
-#include <RWStepRepr_RWMakeFromUsageOption.hxx>
-#include <RWStepRepr_RWMappedItem.hxx>
-#include <RWStepRepr_RWMaterialDesignation.hxx>
-#include <RWStepRepr_RWMaterialProperty.hxx>
-#include <RWStepRepr_RWMaterialPropertyRepresentation.hxx>
-#include <RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx>
-#include <RWStepRepr_RWMeasureRepresentationItem.hxx>
-#include <RWStepRepr_RWProductConcept.hxx>
-#include <RWStepRepr_RWProductDefinitionShape.hxx>
-#include <RWStepRepr_RWPropertyDefinition.hxx>
-#include <RWStepRepr_RWPropertyDefinitionRelationship.hxx>
-#include <RWStepRepr_RWPropertyDefinitionRepresentation.hxx>
-#include <RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx>
-#include <RWStepRepr_RWRepresentation.hxx>
-#include <RWStepRepr_RWRepresentationContextReference.hxx>
-#include <RWStepRepr_RWRepresentationReference.hxx>
-#include <RWStepRepr_RWRepresentationMap.hxx>
-#include <RWStepRepr_RWRepresentationRelationship.hxx>
-#include <RWStepRepr_RWRepresentationRelationshipWithTransformation.hxx>
-#include <RWStepRepr_RWShapeAspect.hxx>
-#include <RWStepRepr_RWShapeAspectRelationship.hxx>
-#include <RWStepRepr_RWFeatureForDatumTargetRelationship.hxx>
-#include <RWStepRepr_RWShapeAspectTransition.hxx>
-#include <RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.hxx>
-#include <RWStepRepr_RWSpecifiedHigherUsageOccurrence.hxx>
-#include <RWStepRepr_RWStructuralResponseProperty.hxx>
-#include <RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.hxx>
-#include <RWStepShape_RWAdvancedBrepShapeRepresentation.hxx>
-#include <RWStepShape_RWAdvancedFace.hxx>
-#include <RWStepShape_RWAngularLocation.hxx>
-#include <RWStepShape_RWAngularSize.hxx>
-#include <RWStepShape_RWBlock.hxx>
-#include <RWStepShape_RWBooleanResult.hxx>
-#include <RWStepShape_RWBoxDomain.hxx>
-#include <RWStepShape_RWBoxedHalfSpace.hxx>
-#include <RWStepShape_RWBrepWithVoids.hxx>
-#include <RWStepShape_RWClosedShell.hxx>
-#include <RWStepShape_RWCompoundShapeRepresentation.hxx>
-#include <RWStepShape_RWConnectedEdgeSet.hxx>
-#include <RWStepShape_RWConnectedFaceSet.hxx>
-#include <RWStepShape_RWConnectedFaceShapeRepresentation.hxx>
-#include <RWStepShape_RWConnectedFaceSubSet.hxx>
-#include <RWStepShape_RWContextDependentShapeRepresentation.hxx>
-#include <RWStepShape_RWCsgShapeRepresentation.hxx>
-#include <RWStepShape_RWCsgSolid.hxx>
-#include <RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.hxx>
-#include <RWStepShape_RWDimensionalCharacteristicRepresentation.hxx>
-#include <RWStepShape_RWDimensionalLocation.hxx>
-#include <RWStepShape_RWDimensionalLocationWithPath.hxx>
-#include <RWStepShape_RWDimensionalSize.hxx>
-#include <RWStepShape_RWDimensionalSizeWithPath.hxx>
-#include <RWStepShape_RWEdgeBasedWireframeModel.hxx>
-#include <RWStepShape_RWEdgeBasedWireframeShapeRepresentation.hxx>
-#include <RWStepShape_RWEdgeCurve.hxx>
-#include <RWStepShape_RWEdgeLoop.hxx>
-#include <RWStepShape_RWExtrudedAreaSolid.hxx>
-#include <RWStepShape_RWExtrudedFaceSolid.hxx>
-#include <RWStepShape_RWFace.hxx>
-#include <RWStepShape_RWFaceBasedSurfaceModel.hxx>
-#include <RWStepShape_RWFaceBound.hxx>
-#include <RWStepShape_RWFaceOuterBound.hxx>
-#include <RWStepShape_RWFaceSurface.hxx>
-#include <RWStepShape_RWFacetedBrep.hxx>
-#include <RWStepShape_RWFacetedBrepAndBrepWithVoids.hxx>
-#include <RWStepShape_RWFacetedBrepShapeRepresentation.hxx>
-#include <RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.hxx>
-#include <RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx>
-#include <RWStepShape_RWGeometricCurveSet.hxx>
-#include <RWStepShape_RWGeometricSet.hxx>
-#include <RWStepShape_RWHalfSpaceSolid.hxx>
-#include <RWStepShape_RWLoopAndPath.hxx>
-#include <RWStepShape_RWManifoldSolidBrep.hxx>
-#include <RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx>
-#include <RWStepShape_RWMeasureQualification.hxx>
-#include <RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.hxx>
-#include <RWStepShape_RWNonManifoldSurfaceShapeRepresentation.hxx>
-#include <RWStepShape_RWOpenShell.hxx>
-#include <RWStepShape_RWOrientedClosedShell.hxx>
-#include <RWStepShape_RWOrientedEdge.hxx>
-#include <RWStepShape_RWOrientedFace.hxx>
-#include <RWStepShape_RWOrientedOpenShell.hxx>
-#include <RWStepShape_RWOrientedPath.hxx>
-#include <RWStepShape_RWPath.hxx>
-#include <RWStepShape_RWPlusMinusTolerance.hxx>
-#include <RWStepShape_RWPointRepresentation.hxx>
-#include <RWStepShape_RWPolyLoop.hxx>
-#include <RWStepShape_RWQualifiedRepresentationItem.hxx>
-#include <RWStepShape_RWRevolvedAreaSolid.hxx>
-#include <RWStepShape_RWRevolvedFaceSolid.hxx>
-#include <RWStepShape_RWRightAngularWedge.hxx>
-#include <RWStepShape_RWRightCircularCone.hxx>
-#include <RWStepShape_RWRightCircularCylinder.hxx>
-#include <RWStepShape_RWSeamEdge.hxx>
-#include <RWStepShape_RWShapeDefinitionRepresentation.hxx>
-#include <RWStepShape_RWShapeDimensionRepresentation.hxx>
-#include <RWStepShape_RWShapeRepresentation.hxx>
-#include <RWStepShape_RWShapeRepresentationWithParameters.hxx>
-#include <RWStepShape_RWShellBasedSurfaceModel.hxx>
-#include <RWStepShape_RWSolidReplica.hxx>
-#include <RWStepShape_RWSphere.hxx>
-#include <RWStepShape_RWSubedge.hxx>
-#include <RWStepShape_RWSubface.hxx>
-#include <RWStepShape_RWSweptAreaSolid.hxx>
-#include <RWStepShape_RWSweptFaceSolid.hxx>
-#include <RWStepShape_RWToleranceValue.hxx>
-#include <RWStepShape_RWTorus.hxx>
-#include <RWStepShape_RWTransitionalShapeRepresentation.hxx>
-#include <RWStepShape_RWVertexLoop.hxx>
-#include <RWStepShape_RWVertexPoint.hxx>
-#include <RWStepVisual_RWAreaInSet.hxx>
-#include <RWStepVisual_RWBackgroundColour.hxx>
-#include <RWStepVisual_RWCameraImage.hxx>
-#include <RWStepVisual_RWCameraModelD2.hxx>
-#include <RWStepVisual_RWCameraModelD3.hxx>
-#include <RWStepVisual_RWCameraUsage.hxx>
-#include <RWStepVisual_RWCompositeText.hxx>
-#include <RWStepVisual_RWCompositeTextWithExtent.hxx>
-#include <RWStepVisual_RWContextDependentInvisibility.hxx>
-#include <RWStepVisual_RWContextDependentOverRidingStyledItem.hxx>
-#include <RWStepVisual_RWCurveStyle.hxx>
-#include <RWStepVisual_RWCurveStyleFont.hxx>
-#include <RWStepVisual_RWDraughtingModel.hxx>
-#include <RWStepVisual_RWExternallyDefinedCurveFont.hxx>
-#include <RWStepVisual_RWFillAreaStyle.hxx>
-#include <RWStepVisual_RWFillAreaStyleColour.hxx>
-#include <RWStepVisual_RWInvisibility.hxx>
-#include <RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx>
-#include <RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx>
-#include <RWStepVisual_RWOverRidingStyledItem.hxx>
-#include <RWStepVisual_RWPlanarBox.hxx>
-#include <RWStepVisual_RWPointStyle.hxx>
-#include <RWStepVisual_RWPresentationArea.hxx>
-#include <RWStepVisual_RWPresentationLayerAssignment.hxx>
-#include <RWStepVisual_RWPresentationLayerUsage.hxx>
-#include <RWStepVisual_RWPresentationRepresentation.hxx>
-#include <RWStepVisual_RWPresentationSize.hxx>
-#include <RWStepVisual_RWPresentationStyleAssignment.hxx>
-#include <RWStepVisual_RWPresentationStyleByContext.hxx>
-#include <RWStepVisual_RWPresentationView.hxx>
-#include <RWStepVisual_RWPresentedItemRepresentation.hxx>
-#include <RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx>
-#include <RWStepVisual_RWRepositionedTessellatedItem.hxx>
-#include <RWStepVisual_RWStyledItem.hxx>
-#include <RWStepVisual_RWSurfaceSideStyle.hxx>
-#include <RWStepVisual_RWSurfaceStyleBoundary.hxx>
-#include <RWStepVisual_RWSurfaceStyleControlGrid.hxx>
-#include <RWStepVisual_RWSurfaceStyleFillArea.hxx>
-#include <RWStepVisual_RWSurfaceStyleParameterLine.hxx>
-#include <RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx>
-#include <RWStepVisual_RWSurfaceStyleRendering.hxx>
-#include <RWStepVisual_RWSurfaceStyleRenderingWithProperties.hxx>
-#include <RWStepVisual_RWSurfaceStyleSegmentationCurve.hxx>
-#include <RWStepVisual_RWSurfaceStyleSilhouette.hxx>
-#include <RWStepVisual_RWSurfaceStyleTransparent.hxx>
-#include <RWStepVisual_RWSurfaceStyleUsage.hxx>
-#include <RWStepVisual_RWTemplate.hxx>
-#include <RWStepVisual_RWTemplateInstance.hxx>
-#include <RWStepVisual_RWTextLiteral.hxx>
-#include <RWStepVisual_RWTextStyle.hxx>
-#include <RWStepVisual_RWTextStyleForDefinedFont.hxx>
-#include <RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx>
-#include <RWStepVisual_RWViewVolume.hxx>
+#include "../RWStepAP203/RWStepAP203_RWCcDesignApproval.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignCertification.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignContract.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.pxx"
+#include "../RWStepAP203/RWStepAP203_RWChange.pxx"
+#include "../RWStepAP203/RWStepAP203_RWChangeRequest.pxx"
+#include "../RWStepAP203/RWStepAP203_RWStartRequest.pxx"
+#include "../RWStepAP203/RWStepAP203_RWStartWork.pxx"
+#include "RWStepAP214_GeneralModule.pxx"
+#include "RWStepAP214_RWAppliedApprovalAssignment.pxx"
+#include "RWStepAP214_RWAppliedDateAndTimeAssignment.pxx"
+#include "RWStepAP214_RWAppliedDateAssignment.pxx"
+#include "RWStepAP214_RWAppliedDocumentReference.pxx"
+#include "RWStepAP214_RWAppliedExternalIdentificationAssignment.pxx"
+#include "RWStepAP214_RWAppliedGroupAssignment.pxx"
+#include "RWStepAP214_RWAppliedOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAppliedPersonAndOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAppliedPresentedItem.pxx"
+#include "RWStepAP214_RWAppliedSecurityClassificationAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignActualDateAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignApprovalAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignDateAndPersonAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignDocumentReference.pxx"
+#include "RWStepAP214_RWAutoDesignGroupAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignNominalDateAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignPresentedItem.pxx"
+#include "RWStepAP214_RWAutoDesignSecurityClassificationAssignment.pxx"
+#include "RWStepAP214_RWClass.pxx"
+#include "RWStepAP214_RWExternallyDefinedClass.pxx"
+#include "RWStepAP214_RWExternallyDefinedGeneralProperty.pxx"
+#include "../RWStepBasic/RWStepBasic_RWAction.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionMethod.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionRequestAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionRequestSolution.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApplicationContextElement.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApproval.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalDateTime.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCertification.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCertificationAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCertificationType.pxx"
+#include "../RWStepBasic/RWStepBasic_RWContract.pxx"
+#include "../RWStepBasic/RWStepBasic_RWContractAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWContractType.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDateAndTime.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDerivedUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDerivedUnitElement.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocument.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentFile.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentProductAssociation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentRepresentationType.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentType.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.pxx"
+#include "../RWStepBasic/RWStepBasic_RWEffectivity.pxx"
+#include "../RWStepBasic/RWStepBasic_RWEffectivityAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWEulerAngles.pxx"
+#include "../RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWExternallyDefinedItem.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGeneralProperty.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGroupRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWIdentificationAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWIdentificationRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWLengthUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWLocalTime.pxx"
+#include "../RWStepBasic/RWStepBasic_RWMassUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWMechanicalContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWNameAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWNamedUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWObjectRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWOrganizationalAddress.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPersonalAddress.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPersonAndOrganization.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPlaneAngleUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProduct.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductCategoryRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductConceptContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinition.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionFormation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductType.pxx"
+#include "../RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWRoleAssociation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSecurityClassification.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSolidAngleUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWVersionedActionRequest.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWAngularityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCommonDatum.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatum.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumFeature.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumReference.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumTarget.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWParallelismTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWPositionTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.pxx"
+#include "../RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.pxx"
+#include "../RWStepElement/RWStepElement_RWCurve3dElementDescriptor.pxx"
+#include "../RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.pxx"
+#include "../RWStepElement/RWStepElement_RWCurveElementSectionDefinition.pxx"
+#include "../RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.pxx"
+#include "../RWStepElement/RWStepElement_RWElementDescriptor.pxx"
+#include "../RWStepElement/RWStepElement_RWElementMaterial.pxx"
+#include "../RWStepElement/RWStepElement_RWSurface3dElementDescriptor.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceElementProperty.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSection.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSectionField.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.pxx"
+#include "../RWStepElement/RWStepElement_RWUniformSurfaceSection.pxx"
+#include "../RWStepElement/RWStepElement_RWVolume3dElementDescriptor.pxx"
+#include "../RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurve3dElementProperty.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementEndOffset.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementEndRelease.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementInterval.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementLocation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWDummyNode.pxx"
+#include "../RWStepFEA/RWStepFEA_RWElementGeometricRelationship.pxx"
+#include "../RWStepFEA/RWStepFEA_RWElementGroup.pxx"
+#include "../RWStepFEA/RWStepFEA_RWElementRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaAreaDensity.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaGroup.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaLinearElasticity.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMassDensity.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaModel.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaModel3d.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaModelDefinition.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaParametricPoint.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaRepresentationItem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFreedomsList.pxx"
+#include "../RWStepFEA/RWStepFEA_RWGeometricNode.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNode.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeDefinition.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeGroup.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeSet.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeWithVector.pxx"
+#include "../RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.pxx"
+#include "../RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.pxx"
+#include "../RWStepGeom/RWStepGeom_RWAxis1Placement.pxx"
+#include "../RWStepGeom/RWStepGeom_RWAxis2Placement2d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWAxis2Placement3d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBoundaryCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCircle.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCompositeCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCompositeCurveSegment.pxx"
+#include "../RWStepGeom/RWStepGeom_RWConic.pxx"
+#include "../RWStepGeom/RWStepGeom_RWConicalSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCurveBoundedSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCurveReplica.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCylindricalSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWDegeneratePcurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWDirection.pxx"
+#include "../RWStepGeom/RWStepGeom_RWElementarySurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWEllipse.pxx"
+#include "../RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.pxx"
+#include "../RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.pxx"
+#include "../RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.pxx"
+#include "../RWStepGeom/RWStepGeom_RWHyperbola.pxx"
+#include "../RWStepGeom/RWStepGeom_RWIntersectionCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWLine.pxx"
+#include "../RWStepGeom/RWStepGeom_RWOffsetCurve3d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWOffsetSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWOrientedSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWParabola.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPcurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPlacement.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPlane.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPointOnCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPointOnSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPointReplica.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPolyline.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSeamCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSphericalSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfacePatch.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceReplica.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSweptSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWToroidalSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWTrimmedCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWVector.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSuParameters.pxx"
+#include "../RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.pxx"
+#include "../RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompositeShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConfigurationDesign.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConfigurationEffectivity.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWDataEnvironment.pxx"
+#include "../RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWDerivedShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWExtension.pxx"
+#include "../RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.pxx"
+#include "../RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.pxx"
+#include "../RWStepRepr/RWStepRepr_RWItemDefinedTransformation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMakeFromUsageOption.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMappedItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMaterialDesignation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMaterialProperty.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWProductConcept.pxx"
+#include "../RWStepRepr/RWStepRepr_RWProductDefinitionShape.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPropertyDefinition.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationContextReference.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationReference.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationMap.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeAspectRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeAspectTransition.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.pxx"
+#include "../RWStepRepr/RWStepRepr_RWStructuralResponseProperty.pxx"
+#include "../RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWAdvancedFace.pxx"
+#include "../RWStepShape/RWStepShape_RWAngularLocation.pxx"
+#include "../RWStepShape/RWStepShape_RWAngularSize.pxx"
+#include "../RWStepShape/RWStepShape_RWBlock.pxx"
+#include "../RWStepShape/RWStepShape_RWBooleanResult.pxx"
+#include "../RWStepShape/RWStepShape_RWBoxDomain.pxx"
+#include "../RWStepShape/RWStepShape_RWBoxedHalfSpace.pxx"
+#include "../RWStepShape/RWStepShape_RWBrepWithVoids.pxx"
+#include "../RWStepShape/RWStepShape_RWClosedShell.pxx"
+#include "../RWStepShape/RWStepShape_RWCompoundShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedEdgeSet.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedFaceSet.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedFaceSubSet.pxx"
+#include "../RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWCsgShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWCsgSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalLocation.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalLocationWithPath.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalSize.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalSizeWithPath.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeCurve.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeLoop.pxx"
+#include "../RWStepShape/RWStepShape_RWExtrudedAreaSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWExtrudedFaceSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWFace.pxx"
+#include "../RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.pxx"
+#include "../RWStepShape/RWStepShape_RWFaceBound.pxx"
+#include "../RWStepShape/RWStepShape_RWFaceOuterBound.pxx"
+#include "../RWStepShape/RWStepShape_RWFaceSurface.pxx"
+#include "../RWStepShape/RWStepShape_RWFacetedBrep.pxx"
+#include "../RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.pxx"
+#include "../RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricCurveSet.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricSet.pxx"
+#include "../RWStepShape/RWStepShape_RWHalfSpaceSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWLoopAndPath.pxx"
+#include "../RWStepShape/RWStepShape_RWManifoldSolidBrep.pxx"
+#include "../RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWMeasureQualification.pxx"
+#include "../RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.pxx"
+#include "../RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWOpenShell.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedClosedShell.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedEdge.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedFace.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedOpenShell.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedPath.pxx"
+#include "../RWStepShape/RWStepShape_RWPath.pxx"
+#include "../RWStepShape/RWStepShape_RWPlusMinusTolerance.pxx"
+#include "../RWStepShape/RWStepShape_RWPointRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWPolyLoop.pxx"
+#include "../RWStepShape/RWStepShape_RWQualifiedRepresentationItem.pxx"
+#include "../RWStepShape/RWStepShape_RWRevolvedAreaSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWRevolvedFaceSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWRightAngularWedge.pxx"
+#include "../RWStepShape/RWStepShape_RWRightCircularCone.pxx"
+#include "../RWStepShape/RWStepShape_RWRightCircularCylinder.pxx"
+#include "../RWStepShape/RWStepShape_RWSeamEdge.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeDimensionRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.pxx"
+#include "../RWStepShape/RWStepShape_RWShellBasedSurfaceModel.pxx"
+#include "../RWStepShape/RWStepShape_RWSolidReplica.pxx"
+#include "../RWStepShape/RWStepShape_RWSphere.pxx"
+#include "../RWStepShape/RWStepShape_RWSubedge.pxx"
+#include "../RWStepShape/RWStepShape_RWSubface.pxx"
+#include "../RWStepShape/RWStepShape_RWSweptAreaSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWSweptFaceSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWToleranceValue.pxx"
+#include "../RWStepShape/RWStepShape_RWTorus.pxx"
+#include "../RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWVertexLoop.pxx"
+#include "../RWStepShape/RWStepShape_RWVertexPoint.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAreaInSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWBackgroundColour.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraImage.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD2.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraUsage.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCompositeText.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.pxx"
+#include "../RWStepVisual/RWStepVisual_RWContextDependentInvisibility.pxx"
+#include "../RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCurveStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCurveStyleFont.pxx"
+#include "../RWStepVisual/RWStepVisual_RWDraughtingModel.pxx"
+#include "../RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.pxx"
+#include "../RWStepVisual/RWStepVisual_RWFillAreaStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWFillAreaStyleColour.pxx"
+#include "../RWStepVisual/RWStepVisual_RWInvisibility.pxx"
+#include "../RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWOverRidingStyledItem.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPlanarBox.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPointStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationLayerUsage.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationSize.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationStyleByContext.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationView.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.pxx"
+#include "../RWStepVisual/RWStepVisual_RWStyledItem.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceSideStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTemplate.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTemplateInstance.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTextLiteral.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTextStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.pxx"
+#include "../RWStepVisual/RWStepVisual_RWViewVolume.pxx"
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <StepAP203_CcDesignApproval.hxx>
@@ -1112,51 +1112,51 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 //  TR12J 04.06.2003 G&DT entities GKA 
 // added by skl 10.02.2004 for TRJ13
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndMassUnit.hxx>
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.pxx"
 #include <StepBasic_MassMeasureWithUnit.hxx>
-#include <RWStepBasic_RWMassMeasureWithUnit.hxx>
+#include "../RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.pxx"
 
 // Added by ika for GD&T AP242
-#include <RWStepRepr_RWApex.hxx>
-#include <RWStepRepr_RWCentreOfSymmetry.hxx>
-#include <RWStepRepr_RWGeometricAlignment.hxx>
-#include <RWStepRepr_RWParallelOffset.hxx>
-#include <RWStepRepr_RWPerpendicularTo.hxx>
-#include <RWStepRepr_RWTangent.hxx>
-#include <RWStepAP242_RWGeometricItemSpecificUsage.hxx>
-#include <RWStepAP242_RWIdAttribute.hxx>
-#include <RWStepAP242_RWItemIdentifiedRepresentationUsage.hxx>
-#include <RWStepRepr_RWAllAroundShapeAspect.hxx>
-#include <RWStepRepr_RWBetweenShapeAspect.hxx>
-#include <RWStepRepr_RWCompositeGroupShapeAspect.hxx>
-#include <RWStepRepr_RWContinuosShapeAspect.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithDefinedUnit.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithModifiers.hxx>
-#include <RWStepDimTol_RWUnequallyDisposedGeometricTolerance.hxx>
-#include <RWStepDimTol_RWNonUniformZoneDefinition.hxx>
-#include <RWStepDimTol_RWProjectedZoneDefinition.hxx>
-#include <RWStepDimTol_RWRunoutZoneDefinition.hxx>
-#include <RWStepDimTol_RWToleranceZone.hxx>
-#include <RWStepDimTol_RWToleranceZoneDefinition.hxx>
-#include <RWStepDimTol_RWDatumReferenceCompartment.hxx>
-#include <RWStepDimTol_RWDatumReferenceElement.hxx>
-#include <RWStepDimTol_RWDatumSystem.hxx>
-#include <RWStepDimTol_RWGeneralDatumReference.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
-#include <RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
-#include <RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx>
-#include <RWStepAP242_RWDraughtingModelItemAssociation.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationPlane.hxx>
-#include <RWStepVisual_RWDraughtingCallout.hxx>
+#include "../RWStepRepr/RWStepRepr_RWApex.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCentreOfSymmetry.pxx"
+#include "../RWStepRepr/RWStepRepr_RWGeometricAlignment.pxx"
+#include "../RWStepRepr/RWStepRepr_RWParallelOffset.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPerpendicularTo.pxx"
+#include "../RWStepRepr/RWStepRepr_RWTangent.pxx"
+#include "../RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.pxx"
+#include "../RWStepAP242/RWStepAP242_RWIdAttribute.pxx"
+#include "../RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.pxx"
+#include "../RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWBetweenShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWContinuosShapeAspect.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWToleranceZone.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumSystem.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.pxx"
+#include "../RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationOccurrence.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationPlane.pxx"
+#include "../RWStepVisual/RWStepVisual_RWDraughtingCallout.pxx"
 
 #include <StepRepr_Apex.hxx>
 #include <StepRepr_CentreOfSymmetry.hxx>
@@ -1207,101 +1207,101 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
 #include <StepVisual_TessellatedGeometricSet.hxx>
 
-#include <RWStepVisual_RWTessellatedAnnotationOccurrence.hxx>
-#include <RWStepVisual_RWTessellatedGeometricSet.hxx>
-#include <RWStepVisual_RWTessellatedCurveSet.hxx>
+#include "../RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedCurveSet.pxx"
 #include <StepRepr_CharacterizedRepresentation.hxx>
-#include <RWStepRepr_RWCharacterizedRepresentation.hxx>
+#include "../RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.pxx"
 #include <StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx>
-#include <RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx>
+#include "../RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.pxx"
 #include <StepVisual_AnnotationFillArea.hxx>
 #include <StepVisual_AnnotationFillAreaOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationFillArea.hxx>
-#include <RWStepVisual_RWAnnotationFillAreaOccurrence.hxx>
+#include "../RWStepVisual/RWStepVisual_RWAnnotationFillArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.pxx"
 #include <StepVisual_CameraModelD3MultiClipping.hxx>
 #include <StepVisual_CameraModelD3MultiClippingIntersection.hxx>
 #include <StepVisual_CameraModelD3MultiClippingUnion.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClipping.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx>
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.pxx"
 #include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx>
+#include "../RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.pxx"
 
 // Added for kinematics implementation
-#include <RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx>
-#include <RWStepKinematics_RWActuatedKinematicPair.hxx>
-#include <RWStepKinematics_RWContextDependentKinematicLinkRepresentation.hxx>
-#include <RWStepKinematics_RWCylindricalPair.hxx>
-#include <RWStepKinematics_RWCylindricalPairValue.hxx>
-#include <RWStepKinematics_RWCylindricalPairWithRange.hxx>
-#include <RWStepKinematics_RWFullyConstrainedPair.hxx>
-#include <RWStepKinematics_RWGearPair.hxx>
-#include <RWStepKinematics_RWGearPairValue.hxx>
-#include <RWStepKinematics_RWGearPairWithRange.hxx>
-#include <RWStepKinematics_RWHomokineticPair.hxx>
-#include <RWStepKinematics_RWKinematicJoint.hxx>
-#include <RWStepKinematics_RWKinematicLink.hxx>
-#include <RWStepKinematics_RWKinematicLinkRepresentationAssociation.hxx>
-#include <RWStepKinematics_RWKinematicPropertyMechanismRepresentation.hxx>
-#include <RWStepKinematics_RWKinematicTopologyDirectedStructure.hxx>
-#include <RWStepKinematics_RWKinematicTopologyNetworkStructure.hxx>
-#include <RWStepKinematics_RWKinematicTopologyStructure.hxx>
-#include <RWStepKinematics_RWLinearFlexibleAndPinionPair.hxx>
-#include <RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.hxx>
-#include <RWStepKinematics_RWLinearFlexibleLinkRepresentation.hxx>
-#include <RWStepKinematics_RWLowOrderKinematicPair.hxx>
-#include <RWStepKinematics_RWLowOrderKinematicPairValue.hxx>
-#include <RWStepKinematics_RWLowOrderKinematicPairWithRange.hxx>
-#include <RWStepKinematics_RWMechanismRepresentation.hxx>
-#include <RWStepKinematics_RWMechanismStateRepresentation.hxx>
-#include <RWStepKinematics_RWOrientedJoint.hxx>
-#include <RWStepKinematics_RWPairRepresentationRelationship.hxx>
-#include <RWStepKinematics_RWPlanarCurvePair.hxx>
-#include <RWStepKinematics_RWPlanarCurvePairRange.hxx>
-#include <RWStepKinematics_RWPlanarPair.hxx>
-#include <RWStepKinematics_RWPlanarPairValue.hxx>
-#include <RWStepKinematics_RWPlanarPairWithRange.hxx>
-#include <RWStepKinematics_RWPointOnPlanarCurvePair.hxx>
-#include <RWStepKinematics_RWPointOnPlanarCurvePairValue.hxx>
-#include <RWStepKinematics_RWPointOnPlanarCurvePairWithRange.hxx>
-#include <RWStepKinematics_RWPointOnSurfacePair.hxx>
-#include <RWStepKinematics_RWPointOnSurfacePairValue.hxx>
-#include <RWStepKinematics_RWPointOnSurfacePairWithRange.hxx>
-#include <RWStepKinematics_RWPrismaticPair.hxx>
-#include <RWStepKinematics_RWPrismaticPairValue.hxx>
-#include <RWStepKinematics_RWPrismaticPairWithRange.hxx>
-#include <RWStepKinematics_RWProductDefinitionKinematics.hxx>
-#include <RWStepKinematics_RWProductDefinitionRelationshipKinematics.hxx>
-#include <RWStepKinematics_RWRackAndPinionPair.hxx>
-#include <RWStepKinematics_RWRackAndPinionPairValue.hxx>
-#include <RWStepKinematics_RWRackAndPinionPairWithRange.hxx>
-#include <RWStepKinematics_RWRevolutePair.hxx>
-#include <RWStepKinematics_RWRevolutePairValue.hxx>
-#include <RWStepKinematics_RWRevolutePairWithRange.hxx>
-#include <RWStepKinematics_RWRigidLinkRepresentation.hxx>
-#include <RWStepKinematics_RWRollingCurvePair.hxx>
-#include <RWStepKinematics_RWRollingCurvePairValue.hxx>
-#include <RWStepKinematics_RWRollingSurfacePair.hxx>
-#include <RWStepKinematics_RWRollingSurfacePairValue.hxx>
-#include <RWStepKinematics_RWRotationAboutDirection.hxx>
-#include <RWStepKinematics_RWScrewPair.hxx>
-#include <RWStepKinematics_RWScrewPairValue.hxx>
-#include <RWStepKinematics_RWScrewPairWithRange.hxx>
-#include <RWStepKinematics_RWSlidingCurvePair.hxx>
-#include <RWStepKinematics_RWSlidingCurvePairValue.hxx>
-#include <RWStepKinematics_RWSlidingSurfacePair.hxx>
-#include <RWStepKinematics_RWSlidingSurfacePairValue.hxx>
-#include <RWStepKinematics_RWSphericalPair.hxx>
-#include <RWStepKinematics_RWSphericalPairValue.hxx>
-#include <RWStepKinematics_RWSphericalPairWithPin.hxx>
-#include <RWStepKinematics_RWSphericalPairWithPinAndRange.hxx>
-#include <RWStepKinematics_RWSphericalPairWithRange.hxx>
-#include <RWStepKinematics_RWSurfacePairWithRange.hxx>
-#include <RWStepKinematics_RWUnconstrainedPair.hxx>
-#include <RWStepKinematics_RWUnconstrainedPairValue.hxx>
-#include <RWStepKinematics_RWUniversalPair.hxx>
-#include <RWStepKinematics_RWUniversalPairValue.hxx>
-#include <RWStepKinematics_RWUniversalPairWithRange.hxx>
+#include "../RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWCylindricalPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWGearPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWGearPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWGearPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWHomokineticPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicJoint.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicLink.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWOrientedJoint.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPrismaticPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRevolutePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRevolutePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWScrewPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWScrewPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUniversalPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUniversalPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.pxx"
 
 #include <StepKinematics_ActuatedKinematicPair.hxx>
 #include <StepKinematics_ActuatedKinPairAndOrderKinPair.hxx>
@@ -1382,22 +1382,22 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <StepVisual_CubicBezierTriangulatedFace.hxx>
 #include <StepVisual_TriangulatedSurfaceSet.hxx>
 
-#include <RWStepVisual_RWTessellatedConnectingEdge.hxx>
-#include <RWStepVisual_RWTessellatedEdge.hxx>
-#include <RWStepVisual_RWTessellatedPointSet.hxx>
-#include <RWStepVisual_RWTessellatedShapeRepresentation.hxx>
-#include <RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx>
-#include <RWStepVisual_RWTessellatedShell.hxx>
-#include <RWStepVisual_RWTessellatedSolid.hxx>
-#include <RWStepVisual_RWTessellatedStructuredItem.hxx>
-#include <RWStepVisual_RWTessellatedVertex.hxx>
-#include <RWStepVisual_RWTessellatedWire.hxx>
-#include <RWStepVisual_RWTriangulatedFace.hxx>
-#include <RWStepVisual_RWComplexTriangulatedFace.hxx>
-#include <RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx>
-#include <RWStepVisual_RWCubicBezierTessellatedEdge.hxx>
-#include <RWStepVisual_RWCubicBezierTriangulatedFace.hxx>
-#include <RWStepVisual_RWTriangulatedSurfaceSet.hxx>
+#include "../RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedEdge.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedPointSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedShell.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedSolid.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedVertex.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedWire.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTriangulatedFace.pxx"
+#include "../RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.pxx"
+#include "../RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.pxx"
 
 static Standard_Integer catsh,catdr,catstr,catdsc,cataux;
 
diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.hxx b/src/RWStepAP214/RWStepAP214_GeneralModule.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_GeneralModule.hxx
rename to src/RWStepAP214/RWStepAP214_GeneralModule.pxx
index ec1bd04a04..129ef80ec6 100644
--- a/src/RWStepAP214/RWStepAP214_GeneralModule.hxx
+++ b/src/RWStepAP214/RWStepAP214_GeneralModule.pxx
@@ -43,27 +43,27 @@ public:
 
   
   //! Creates a GeneralModule
-  Standard_EXPORT RWStepAP214_GeneralModule();
+  Standard_HIDDEN RWStepAP214_GeneralModule();
   
   //! Specific filling of the list of Entities shared by an Entity
   //! <ent>, according to a Case Number <CN> (provided by StepAP214
   //! Protocol).
-  Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE;
+  Standard_HIDDEN void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE;
   
   //! Specific Checking of an Entity <ent>
-  Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE;
+  Standard_HIDDEN void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE;
   
   //! Specific Copy ("Deep") from <entfrom> to <entto> (same type)
   //! by using a CopyTool which provides its working Map.
   //! Use method Transferred from CopyTool to work
-  Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE;
+  Standard_HIDDEN void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE;
   
-  Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const Standard_OVERRIDE;
+  Standard_HIDDEN Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const Standard_OVERRIDE;
   
-  Standard_EXPORT virtual Standard_Integer CategoryNumber (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares) const Standard_OVERRIDE;
+  Standard_HIDDEN virtual Standard_Integer CategoryNumber (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares) const Standard_OVERRIDE;
   
   //! Returns the name of a STEP Entity according to its type
-  Standard_EXPORT virtual Handle(TCollection_HAsciiString) Name (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares) const Standard_OVERRIDE;
+  Standard_HIDDEN virtual Handle(TCollection_HAsciiString) Name (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares) const Standard_OVERRIDE;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx
index 6f2b432652..695261c388 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedApprovalAssignment.hxx>
+#include "RWStepAP214_RWAppliedApprovalAssignment.pxx"
 #include <StepAP214_AppliedApprovalAssignment.hxx>
 #include <StepAP214_ApprovalItem.hxx>
 #include <StepAP214_HArray1OfApprovalItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.pxx
index 5c39d54908..70b5a798bc 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedApprovalAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedApprovalAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedApprovalAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedApprovalAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedApprovalAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedApprovalAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedApprovalAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedApprovalAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx
index d6bce424a0..b536f04410 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedDateAndTimeAssignment.hxx>
+#include "RWStepAP214_RWAppliedDateAndTimeAssignment.pxx"
 #include <StepAP214_AppliedDateAndTimeAssignment.hxx>
 #include <StepAP214_DateAndTimeItem.hxx>
 #include <StepAP214_HArray1OfDateAndTimeItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.pxx
index 8ecf64792b..2c506ce5c5 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedDateAndTimeAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedDateAndTimeAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedDateAndTimeAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedDateAndTimeAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx
index 82c9de1e9d..6482210d88 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedDateAssignment.hxx>
+#include "RWStepAP214_RWAppliedDateAssignment.pxx"
 #include <StepAP214_AppliedDateAssignment.hxx>
 #include <StepAP214_DateItem.hxx>
 #include <StepAP214_HArray1OfDateItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.pxx
index 018dbc760a..c2959f2a19 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedDateAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedDateAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedDateAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedDateAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedDateAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedDateAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedDateAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedDateAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx
index 216bd47e08..1102a66e49 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedDocumentReference.hxx>
+#include "RWStepAP214_RWAppliedDocumentReference.pxx"
 #include <StepAP214_AppliedDocumentReference.hxx>
 #include <StepAP214_DocumentReferenceItem.hxx>
 #include <StepAP214_HArray1OfDocumentReferenceItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.pxx
index e66f46c6a1..2650357306 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedDocumentReference();
+  Standard_HIDDEN RWStepAP214_RWAppliedDocumentReference();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedDocumentReference)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedDocumentReference)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedDocumentReference)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedDocumentReference)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedDocumentReference)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedDocumentReference)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.cxx
index 84e5a59c2d..ec872496b5 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedExternalIdentificationAssignment.hxx>
+#include "RWStepAP214_RWAppliedExternalIdentificationAssignment.pxx"
 #include <StepAP214_AppliedExternalIdentificationAssignment.hxx>
 #include <StepAP214_ExternalIdentificationItem.hxx>
 #include <StepAP214_HArray1OfExternalIdentificationItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.pxx
similarity index 88%
rename from src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.pxx
index 481957e14d..db8fd89532 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedExternalIdentificationAssignment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP214_RWAppliedExternalIdentificationAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedExternalIdentificationAssignment();
   
   //! Reads AppliedExternalIdentificationAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedExternalIdentificationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedExternalIdentificationAssignment)& ent) const;
   
   //! Writes AppliedExternalIdentificationAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedExternalIdentificationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedExternalIdentificationAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedExternalIdentificationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedExternalIdentificationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.cxx
index bc6e29a650..e40ef61573 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedGroupAssignment.hxx>
+#include "RWStepAP214_RWAppliedGroupAssignment.pxx"
 #include <StepAP214_AppliedGroupAssignment.hxx>
 #include <StepAP214_GroupItem.hxx>
 #include <StepAP214_HArray1OfGroupItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.pxx
index 3a6b6dc333..da80bfdf91 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedGroupAssignment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP214_RWAppliedGroupAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedGroupAssignment();
   
   //! Reads AppliedGroupAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedGroupAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedGroupAssignment)& ent) const;
   
   //! Writes AppliedGroupAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedGroupAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedGroupAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedGroupAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedGroupAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx
index 212a144c17..c2c07ab764 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedOrganizationAssignment.hxx>
+#include "RWStepAP214_RWAppliedOrganizationAssignment.pxx"
 #include <StepAP214_AppliedOrganizationAssignment.hxx>
 #include <StepAP214_HArray1OfOrganizationItem.hxx>
 #include <StepAP214_OrganizationItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.pxx
index 46b3d91eda..f717244449 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedOrganizationAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedOrganizationAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx
index 08641a3f06..8c3bcde9e4 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedPersonAndOrganizationAssignment.hxx>
+#include "RWStepAP214_RWAppliedPersonAndOrganizationAssignment.pxx"
 #include <StepAP214_AppliedPersonAndOrganizationAssignment.hxx>
 #include <StepAP214_HArray1OfPersonAndOrganizationItem.hxx>
 #include <StepAP214_PersonAndOrganizationItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.pxx
index 40c20c3697..ea149845bd 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedPersonAndOrganizationAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedPersonAndOrganizationAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedPersonAndOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedPersonAndOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedPersonAndOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedPersonAndOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedPersonAndOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedPersonAndOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cxx
index a63da386f6..e82ef605bd 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedPresentedItem.hxx>
+#include "RWStepAP214_RWAppliedPresentedItem.pxx"
 #include <StepAP214_AppliedPresentedItem.hxx>
 #include <StepAP214_HArray1OfPresentedItemSelect.hxx>
 #include <StepAP214_PresentedItemSelect.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.pxx
index c024fc171d..3fc5f1fe3d 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedPresentedItem();
+  Standard_HIDDEN RWStepAP214_RWAppliedPresentedItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedPresentedItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedPresentedItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedPresentedItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedPresentedItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedPresentedItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedPresentedItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx
index abec76cb42..5d5a9ad97d 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAppliedSecurityClassificationAssignment.hxx>
+#include "RWStepAP214_RWAppliedSecurityClassificationAssignment.pxx"
 #include <StepAP214_AppliedSecurityClassificationAssignment.hxx>
 #include <StepAP214_HArray1OfSecurityClassificationItem.hxx>
 #include <StepAP214_SecurityClassificationItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.pxx
index cae9c7c3f8..3f66245d59 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAppliedSecurityClassificationAssignment();
+  Standard_HIDDEN RWStepAP214_RWAppliedSecurityClassificationAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedSecurityClassificationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AppliedSecurityClassificationAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedSecurityClassificationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AppliedSecurityClassificationAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AppliedSecurityClassificationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AppliedSecurityClassificationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx
index ad25f506b0..fca01097af 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.pxx"
 #include <StepAP214_AutoDesignActualDateAndTimeAssignment.hxx>
 #include <StepAP214_AutoDesignDateAndTimeItem.hxx>
 #include <StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.pxx
index ebcffc1bb7..c7637fd545 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignActualDateAndTimeAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignActualDateAndTimeAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignActualDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignActualDateAndTimeAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignActualDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignActualDateAndTimeAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignActualDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignActualDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx
index 11b9ac4182..fd1ca7a52a 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignActualDateAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignActualDateAssignment.pxx"
 #include <StepAP214_AutoDesignActualDateAssignment.hxx>
 #include <StepAP214_AutoDesignDatedItem.hxx>
 #include <StepAP214_HArray1OfAutoDesignDatedItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.pxx
index c72e52c3ee..88057733bd 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignActualDateAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignActualDateAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignActualDateAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignActualDateAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignActualDateAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignActualDateAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignActualDateAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignActualDateAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx
index 507ae30fc1..5f4f89d692 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignApprovalAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignApprovalAssignment.pxx"
 #include <StepAP214_AutoDesignApprovalAssignment.hxx>
 #include <StepAP214_AutoDesignGeneralOrgItem.hxx>
 #include <StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.pxx
index c92cd934db..d63ba85b17 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignApprovalAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignApprovalAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignApprovalAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignApprovalAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignApprovalAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignApprovalAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignApprovalAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignApprovalAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx
index dd69e73de1..9a4cb3cce5 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignDateAndPersonAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignDateAndPersonAssignment.pxx"
 #include <StepAP214_AutoDesignDateAndPersonAssignment.hxx>
 #include <StepAP214_AutoDesignDateAndPersonItem.hxx>
 #include <StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.pxx
index f7ade74c56..d2c83add89 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignDateAndPersonAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignDateAndPersonAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignDateAndPersonAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignDateAndPersonAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignDateAndPersonAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignDateAndPersonAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignDateAndPersonAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignDateAndPersonAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx
index 0c3203c71f..3a6060f105 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignDocumentReference.hxx>
+#include "RWStepAP214_RWAutoDesignDocumentReference.pxx"
 #include <StepAP214_AutoDesignDocumentReference.hxx>
 #include <StepAP214_AutoDesignReferencingItem.hxx>
 #include <StepAP214_HArray1OfAutoDesignReferencingItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.pxx
index 83fdbab428..dc2ca3659e 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignDocumentReference();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignDocumentReference();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignDocumentReference)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignDocumentReference)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignDocumentReference)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignDocumentReference)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignDocumentReference)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignDocumentReference)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cxx
index ffaa967262..2c54e0d6a3 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignGroupAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignGroupAssignment.pxx"
 #include <StepAP214_AutoDesignGroupAssignment.hxx>
 #include <StepAP214_AutoDesignGroupedItem.hxx>
 #include <StepAP214_HArray1OfAutoDesignGroupedItem.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.pxx
index 5bf3096999..0b669e9e9e 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignGroupAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignGroupAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignGroupAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignGroupAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignGroupAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignGroupAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignGroupAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignGroupAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx
index 0499f246a7..f12204c663 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.pxx"
 #include <StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx>
 #include <StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx>
 #include <StepBasic_DateAndTime.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.pxx
index 284691dce7..6b7e7aad26 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignNominalDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignNominalDateAndTimeAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignNominalDateAndTimeAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignNominalDateAndTimeAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignNominalDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignNominalDateAndTimeAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx
index 25d71d400b..2cdc342ea3 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignNominalDateAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignNominalDateAssignment.pxx"
 #include <StepAP214_AutoDesignNominalDateAssignment.hxx>
 #include <StepAP214_HArray1OfAutoDesignDatedItem.hxx>
 #include <StepBasic_Date.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.pxx
index 1f6a1b3e8d..2d29733c5f 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignNominalDateAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignNominalDateAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignNominalDateAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignNominalDateAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignNominalDateAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignNominalDateAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignNominalDateAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignNominalDateAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx
index bd6ce39a81..96f5c27a1c 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignOrganizationAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignOrganizationAssignment.pxx"
 #include <StepAP214_AutoDesignOrganizationAssignment.hxx>
 #include <StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_Organization.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.pxx
index f3c8149879..6283930147 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignOrganizationAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignOrganizationAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx
index 0ca49e6f37..7ba6062d3f 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.pxx"
 #include <StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx>
 #include <StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.pxx
index 7b4f306a85..6119504eb5 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignPersonAndOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignPersonAndOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignPersonAndOrganizationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignPersonAndOrganizationAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignPersonAndOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignPersonAndOrganizationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cxx
index e522d32f7f..d33e296161 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignPresentedItem.hxx>
+#include "RWStepAP214_RWAutoDesignPresentedItem.pxx"
 #include <StepAP214_AutoDesignPresentedItem.hxx>
 #include <StepAP214_AutoDesignPresentedItemSelect.hxx>
 #include <StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.pxx
index aeafd79fbe..32eb09c8e5 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignPresentedItem();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignPresentedItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignPresentedItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignPresentedItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignPresentedItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignPresentedItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignPresentedItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignPresentedItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx
index 8ca4e6a8e5..9c27673261 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWAutoDesignSecurityClassificationAssignment.hxx>
+#include "RWStepAP214_RWAutoDesignSecurityClassificationAssignment.pxx"
 #include <StepAP214_AutoDesignSecurityClassificationAssignment.hxx>
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_HArray1OfApproval.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.hxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.hxx
rename to src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.pxx
index 6069146145..2875f6f56b 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP214_RWAutoDesignSecurityClassificationAssignment();
+  Standard_HIDDEN RWStepAP214_RWAutoDesignSecurityClassificationAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignSecurityClassificationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_AutoDesignSecurityClassificationAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignSecurityClassificationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_AutoDesignSecurityClassificationAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepAP214_AutoDesignSecurityClassificationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_AutoDesignSecurityClassificationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWClass.cxx b/src/RWStepAP214/RWStepAP214_RWClass.cxx
index d7c8e7a7c2..6ea46a92c3 100644
--- a/src/RWStepAP214/RWStepAP214_RWClass.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWClass.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWClass.hxx>
+#include "RWStepAP214_RWClass.pxx"
 #include <StepAP214_Class.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWClass.hxx b/src/RWStepAP214/RWStepAP214_RWClass.pxx
similarity index 86%
rename from src/RWStepAP214/RWStepAP214_RWClass.hxx
rename to src/RWStepAP214/RWStepAP214_RWClass.pxx
index 5652a95f12..3efd468172 100644
--- a/src/RWStepAP214/RWStepAP214_RWClass.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWClass.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP214_RWClass();
+  Standard_HIDDEN RWStepAP214_RWClass();
   
   //! Reads Class
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_Class)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_Class)& ent) const;
   
   //! Writes Class
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_Class)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_Class)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP214_Class)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_Class)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.cxx b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.cxx
index 0e95548abe..67786de5d8 100644
--- a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWExternallyDefinedClass.hxx>
+#include "RWStepAP214_RWExternallyDefinedClass.pxx"
 #include <StepAP214_ExternallyDefinedClass.hxx>
 #include <StepBasic_ExternallyDefinedItem.hxx>
 #include <StepBasic_ExternalSource.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.hxx b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.hxx
rename to src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.pxx
index 2ee0507e31..d6c8163512 100644
--- a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedClass.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP214_RWExternallyDefinedClass();
+  Standard_HIDDEN RWStepAP214_RWExternallyDefinedClass();
   
   //! Reads ExternallyDefinedClass
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_ExternallyDefinedClass)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_ExternallyDefinedClass)& ent) const;
   
   //! Writes ExternallyDefinedClass
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_ExternallyDefinedClass)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_ExternallyDefinedClass)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP214_ExternallyDefinedClass)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_ExternallyDefinedClass)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.cxx b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.cxx
index b168f862d1..9c06f48849 100644
--- a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWExternallyDefinedGeneralProperty.hxx>
+#include "RWStepAP214_RWExternallyDefinedGeneralProperty.pxx"
 #include <StepAP214_ExternallyDefinedGeneralProperty.hxx>
 #include <StepBasic_ExternallyDefinedItem.hxx>
 #include <StepBasic_ExternalSource.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.hxx b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.hxx
rename to src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.pxx
index 288ef31b63..9dc1848855 100644
--- a/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWExternallyDefinedGeneralProperty.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP214_RWExternallyDefinedGeneralProperty();
+  Standard_HIDDEN RWStepAP214_RWExternallyDefinedGeneralProperty();
   
   //! Reads ExternallyDefinedGeneralProperty
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_ExternallyDefinedGeneralProperty)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_ExternallyDefinedGeneralProperty)& ent) const;
   
   //! Writes ExternallyDefinedGeneralProperty
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_ExternallyDefinedGeneralProperty)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_ExternallyDefinedGeneralProperty)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP214_ExternallyDefinedGeneralProperty)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_ExternallyDefinedGeneralProperty)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_RWRepItemGroup.cxx b/src/RWStepAP214/RWStepAP214_RWRepItemGroup.cxx
index f5a29edc47..628902f894 100644
--- a/src/RWStepAP214/RWStepAP214_RWRepItemGroup.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWRepItemGroup.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepAP214_RWRepItemGroup.hxx>
+#include "RWStepAP214_RWRepItemGroup.pxx"
 #include <StepAP214_RepItemGroup.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_RWRepItemGroup.hxx b/src/RWStepAP214/RWStepAP214_RWRepItemGroup.pxx
similarity index 87%
rename from src/RWStepAP214/RWStepAP214_RWRepItemGroup.hxx
rename to src/RWStepAP214/RWStepAP214_RWRepItemGroup.pxx
index cb05f02b13..6b4e84069c 100644
--- a/src/RWStepAP214/RWStepAP214_RWRepItemGroup.hxx
+++ b/src/RWStepAP214/RWStepAP214_RWRepItemGroup.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepAP214_RWRepItemGroup();
+  Standard_HIDDEN RWStepAP214_RWRepItemGroup();
   
   //! Reads RepItemGroup
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_RepItemGroup)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP214_RepItemGroup)& ent) const;
   
   //! Writes RepItemGroup
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_RepItemGroup)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP214_RepItemGroup)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepAP214_RepItemGroup)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepAP214_RepItemGroup)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
index 694d357944..25b7def284 100644
--- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
+++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
@@ -19,7 +19,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_ParamType.hxx>
 #include <Interface_ReaderLib.hxx>
-#include <RWStepAP214_ReadWriteModule.hxx>
+#include "RWStepAP214_ReadWriteModule.pxx"
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <StepAP214_Protocol.hxx>
@@ -459,26 +459,26 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepVisual_CubicBezierTriangulatedFace.hxx>
 #include <StepVisual_TriangulatedSurfaceSet.hxx>
 
-#include <RWStepVisual_RWTessellatedConnectingEdge.hxx>
-#include <RWStepVisual_RWTessellatedEdge.hxx>
-#include <RWStepVisual_RWTessellatedPointSet.hxx>
-#include <RWStepVisual_RWTessellatedShapeRepresentation.hxx>
-#include <RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx>
-#include <RWStepVisual_RWTessellatedShell.hxx>
-#include <RWStepVisual_RWTessellatedSolid.hxx>
-#include <RWStepVisual_RWTessellatedStructuredItem.hxx>
-#include <RWStepVisual_RWTessellatedVertex.hxx>
-#include <RWStepVisual_RWTessellatedWire.hxx>
-#include <RWStepVisual_RWTriangulatedFace.hxx>
-#include <RWStepVisual_RWComplexTriangulatedFace.hxx>
-#include <RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx>
-#include <RWStepVisual_RWCubicBezierTessellatedEdge.hxx>
-#include <RWStepVisual_RWCubicBezierTriangulatedFace.hxx>
-#include <RWStepVisual_RWTriangulatedSurfaceSet.hxx>
+#include "../RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedEdge.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedPointSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedShell.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedSolid.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedVertex.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedWire.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTriangulatedFace.pxx"
+#include "../RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.pxx"
+#include "../RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.pxx"
 
-#include <RWStepBasic_RWAddress.hxx>
-#include <RWStepShape_RWAdvancedBrepShapeRepresentation.hxx>
-#include <RWStepShape_RWAdvancedFace.hxx>
+#include "../RWStepBasic/RWStepBasic_RWAddress.pxx"
+#include "../RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWAdvancedFace.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWAnnotationCurveOccurrence.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWAnnotationFillArea.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWAnnotationFillAreaOccurrence.hxx>
@@ -488,377 +488,377 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWAnnotationSymbolOccurrence.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWAnnotationText.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWAnnotationTextOccurrence.hxx>
-#include <RWStepBasic_RWApplicationContext.hxx>
-#include <RWStepBasic_RWApplicationContextElement.hxx>
-#include <RWStepBasic_RWApplicationProtocolDefinition.hxx>
-#include <RWStepBasic_RWApproval.hxx>
-#include <RWStepBasic_RWApprovalPersonOrganization.hxx>
-#include <RWStepBasic_RWApprovalRelationship.hxx>
-#include <RWStepBasic_RWApprovalRole.hxx>
-#include <RWStepBasic_RWApprovalStatus.hxx>
-#include <RWStepVisual_RWAreaInSet.hxx>
-#include <RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignActualDateAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignApprovalAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignDateAndPersonAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignGroupAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignNominalDateAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAutoDesignPresentedItem.hxx>
-#include <RWStepAP214_RWAutoDesignSecurityClassificationAssignment.hxx>
+#include "../RWStepBasic/RWStepBasic_RWApplicationContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApplicationContextElement.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApproval.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalStatus.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAreaInSet.pxx"
+#include "RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignActualDateAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignApprovalAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignDateAndPersonAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignGroupAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignNominalDateAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAutoDesignPresentedItem.pxx"
+#include "RWStepAP214_RWAutoDesignSecurityClassificationAssignment.pxx"
 // Removed from Rev2 to Rev4 : <RWStepAP214_RWAutoDesignViewArea.hxx>
-#include <RWStepGeom_RWAxis1Placement.hxx>
-#include <RWStepGeom_RWAxis2Placement2d.hxx>
-#include <RWStepGeom_RWAxis2Placement3d.hxx>
-#include <RWStepGeom_RWBSplineCurve.hxx>
-#include <RWStepGeom_RWBSplineCurveWithKnots.hxx>
-#include <RWStepGeom_RWBSplineSurface.hxx>
-#include <RWStepGeom_RWBSplineSurfaceWithKnots.hxx>
-#include <RWStepVisual_RWBackgroundColour.hxx>
-#include <RWStepGeom_RWBezierCurve.hxx>
-#include <RWStepGeom_RWBezierSurface.hxx>
-#include <RWStepShape_RWBlock.hxx>
-#include <RWStepShape_RWBooleanResult.hxx>
-#include <RWStepGeom_RWBoundaryCurve.hxx>
-#include <RWStepGeom_RWBoundedCurve.hxx>
-#include <RWStepGeom_RWBoundedSurface.hxx>
-#include <RWStepShape_RWBoxDomain.hxx>
-#include <RWStepShape_RWBoxedHalfSpace.hxx>
-#include <RWStepShape_RWBrepWithVoids.hxx>
-#include <RWStepBasic_RWCalendarDate.hxx>
-#include <RWStepVisual_RWCameraImage.hxx>
-#include <RWStepVisual_RWCameraModel.hxx>
-#include <RWStepVisual_RWCameraModelD2.hxx>
-#include <RWStepVisual_RWCameraModelD3.hxx>
-#include <RWStepVisual_RWCameraUsage.hxx>
-#include <RWStepGeom_RWCartesianPoint.hxx>
-#include <RWStepGeom_RWCartesianTransformationOperator.hxx>
-#include <RWStepGeom_RWCartesianTransformationOperator3d.hxx>
-#include <RWStepGeom_RWCircle.hxx>
-#include <RWStepShape_RWClosedShell.hxx>
-#include <RWStepVisual_RWColour.hxx>
-#include <RWStepVisual_RWColourRgb.hxx>
-#include <RWStepVisual_RWColourSpecification.hxx>
-#include <RWStepGeom_RWCompositeCurve.hxx>
-#include <RWStepGeom_RWCompositeCurveOnSurface.hxx>
-#include <RWStepGeom_RWCompositeCurveSegment.hxx>
-#include <RWStepVisual_RWCompositeText.hxx>
+#include "../RWStepGeom/RWStepGeom_RWAxis1Placement.pxx"
+#include "../RWStepGeom/RWStepGeom_RWAxis2Placement2d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWAxis2Placement3d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.pxx"
+#include "../RWStepVisual/RWStepVisual_RWBackgroundColour.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierSurface.pxx"
+#include "../RWStepShape/RWStepShape_RWBlock.pxx"
+#include "../RWStepShape/RWStepShape_RWBooleanResult.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBoundaryCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBoundedCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBoundedSurface.pxx"
+#include "../RWStepShape/RWStepShape_RWBoxDomain.pxx"
+#include "../RWStepShape/RWStepShape_RWBoxedHalfSpace.pxx"
+#include "../RWStepShape/RWStepShape_RWBrepWithVoids.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCalendarDate.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraImage.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModel.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD2.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraUsage.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCartesianPoint.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCircle.pxx"
+#include "../RWStepShape/RWStepShape_RWClosedShell.pxx"
+#include "../RWStepVisual/RWStepVisual_RWColour.pxx"
+#include "../RWStepVisual/RWStepVisual_RWColourRgb.pxx"
+#include "../RWStepVisual/RWStepVisual_RWColourSpecification.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCompositeCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCompositeCurveSegment.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCompositeText.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWCompositeTextWithAssociatedCurves.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWCompositeTextWithBlankingBox.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
-#include <RWStepVisual_RWCompositeTextWithExtent.hxx>
+#include "../RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.pxx"
 
-#include <RWStepGeom_RWConic.hxx>
-#include <RWStepGeom_RWConicalSurface.hxx>
-#include <RWStepShape_RWConnectedFaceSet.hxx>
-#include <RWStepVisual_RWContextDependentInvisibility.hxx>
-#include <RWStepVisual_RWContextDependentOverRidingStyledItem.hxx>
-#include <RWStepBasic_RWConversionBasedUnit.hxx>
-#include <RWStepBasic_RWCoordinatedUniversalTimeOffset.hxx>
+#include "../RWStepGeom/RWStepGeom_RWConic.pxx"
+#include "../RWStepGeom/RWStepGeom_RWConicalSurface.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedFaceSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWContextDependentInvisibility.pxx"
+#include "../RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.pxx"
 // Removed from Rev2 to Rev4 : <RWStepShape_RWCsgRepresentation.hxx>
-#include <RWStepShape_RWCsgShapeRepresentation.hxx>
-#include <RWStepShape_RWCsgSolid.hxx>
-#include <RWStepGeom_RWCurve.hxx>
-#include <RWStepGeom_RWCurveBoundedSurface.hxx>
-#include <RWStepGeom_RWCurveReplica.hxx>
-#include <RWStepVisual_RWCurveStyle.hxx>
-#include <RWStepVisual_RWCurveStyleFont.hxx>
-#include <RWStepVisual_RWCurveStyleFontPattern.hxx>
-#include <RWStepGeom_RWCylindricalSurface.hxx>
-#include <RWStepBasic_RWDate.hxx>
-#include <RWStepBasic_RWDateAndTime.hxx>
-#include <RWStepBasic_RWDateRole.hxx>
-#include <RWStepBasic_RWDateTimeRole.hxx>
+#include "../RWStepShape/RWStepShape_RWCsgShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWCsgSolid.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCurveBoundedSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCurveReplica.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCurveStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCurveStyleFont.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.pxx"
+#include "../RWStepGeom/RWStepGeom_RWCylindricalSurface.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDate.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDateAndTime.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDateRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDateTimeRole.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDefinedSymbol.hxx>
-#include <RWStepRepr_RWDefinitionalRepresentation.hxx>
-#include <RWStepGeom_RWDegeneratePcurve.hxx>
-#include <RWStepGeom_RWDegenerateToroidalSurface.hxx>
-#include <RWStepRepr_RWDescriptiveRepresentationItem.hxx>
+#include "../RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.pxx"
+#include "../RWStepGeom/RWStepGeom_RWDegeneratePcurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.pxx"
+#include "../RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDimensionCurve.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDimensionCurveTerminator.hxx>
-#include <RWStepBasic_RWDimensionalExponents.hxx>
-#include <RWStepGeom_RWDirection.hxx>
+#include "../RWStepBasic/RWStepBasic_RWDimensionalExponents.pxx"
+#include "../RWStepGeom/RWStepGeom_RWDirection.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDraughtingAnnotationOccurrence.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDraughtingCallout.hxx>
-#include <RWStepVisual_RWDraughtingPreDefinedColour.hxx>
-#include <RWStepVisual_RWDraughtingPreDefinedCurveFont.hxx>
+#include "../RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.pxx"
+#include "../RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDraughtingSubfigureRepresentation.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDraughtingSymbolRepresentation.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDraughtingTextLiteralWithDelineation.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDrawingDefinition.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWDrawingRevision.hxx>
-#include <RWStepShape_RWEdge.hxx>
-#include <RWStepShape_RWEdgeCurve.hxx>
-#include <RWStepShape_RWEdgeLoop.hxx>
-#include <RWStepGeom_RWElementarySurface.hxx>
-#include <RWStepGeom_RWEllipse.hxx>
-#include <RWStepGeom_RWEvaluatedDegeneratePcurve.hxx>
-#include <RWStepBasic_RWExternalSource.hxx>
-#include <RWStepVisual_RWExternallyDefinedCurveFont.hxx>
+#include "../RWStepShape/RWStepShape_RWEdge.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeCurve.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeLoop.pxx"
+#include "../RWStepGeom/RWStepGeom_RWElementarySurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWEllipse.pxx"
+#include "../RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.pxx"
+#include "../RWStepBasic/RWStepBasic_RWExternalSource.pxx"
+#include "../RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWExternallyDefinedHatchStyle.hxx>
-#include <RWStepBasic_RWExternallyDefinedItem.hxx>
+#include "../RWStepBasic/RWStepBasic_RWExternallyDefinedItem.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWExternallyDefinedSymbol.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWExternallyDefinedTextFont.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWExternallyDefinedTileStyle.hxx>
-#include <RWStepShape_RWExtrudedAreaSolid.hxx>
-#include <RWStepShape_RWFace.hxx>
+#include "../RWStepShape/RWStepShape_RWExtrudedAreaSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWFace.pxx"
 // Removed from Rev2 to Rev4 : <RWStepShape_RWFaceBasedSurfaceModel.hxx>
-#include <RWStepShape_RWFaceBound.hxx>
-#include <RWStepShape_RWFaceOuterBound.hxx>
-#include <RWStepShape_RWFaceSurface.hxx>
-#include <RWStepShape_RWFacetedBrep.hxx>
-#include <RWStepShape_RWFacetedBrepShapeRepresentation.hxx>
-#include <RWStepVisual_RWFillAreaStyle.hxx>
-#include <RWStepVisual_RWFillAreaStyleColour.hxx>
+#include "../RWStepShape/RWStepShape_RWFaceBound.pxx"
+#include "../RWStepShape/RWStepShape_RWFaceOuterBound.pxx"
+#include "../RWStepShape/RWStepShape_RWFaceSurface.pxx"
+#include "../RWStepShape/RWStepShape_RWFacetedBrep.pxx"
+#include "../RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWFillAreaStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWFillAreaStyleColour.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWFillAreaStyleHatching.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWFillAreaStyleTileSymbolWithStyle.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWFillAreaStyleTiles.hxx>
-#include <RWStepRepr_RWFunctionallyDefinedTransformation.hxx>
-#include <RWStepShape_RWGeometricCurveSet.hxx>
-#include <RWStepGeom_RWGeometricRepresentationContext.hxx>
-#include <RWStepGeom_RWGeometricRepresentationItem.hxx>
-#include <RWStepShape_RWGeometricSet.hxx>
-#include <RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.hxx>
-#include <RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx>
-#include <RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx>
-#include <RWStepRepr_RWGlobalUnitAssignedContext.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
-#include <RWStepBasic_RWGroup.hxx>
-#include <RWStepBasic_RWGroupRelationship.hxx>
-#include <RWStepShape_RWHalfSpaceSolid.hxx>
-#include <RWStepGeom_RWHyperbola.hxx>
-#include <RWStepGeom_RWIntersectionCurve.hxx>
-#include <RWStepVisual_RWInvisibility.hxx>
-#include <RWStepBasic_RWLengthMeasureWithUnit.hxx>
-#include <RWStepBasic_RWLengthUnit.hxx>
-#include <RWStepGeom_RWLine.hxx>
-#include <RWStepBasic_RWLocalTime.hxx>
-#include <RWStepShape_RWLoop.hxx>
-#include <RWStepShape_RWManifoldSolidBrep.hxx>
-#include <RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx>
-#include <RWStepRepr_RWMappedItem.hxx>
-#include <RWStepBasic_RWMeasureWithUnit.hxx>
-#include <RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx>
-#include <RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx>
-#include <RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx>
+#include "../RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricCurveSet.pxx"
+#include "../RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.pxx"
+#include "../RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricSet.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.pxx"
+#include "../RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGroup.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGroupRelationship.pxx"
+#include "../RWStepShape/RWStepShape_RWHalfSpaceSolid.pxx"
+#include "../RWStepGeom/RWStepGeom_RWHyperbola.pxx"
+#include "../RWStepGeom/RWStepGeom_RWIntersectionCurve.pxx"
+#include "../RWStepVisual/RWStepVisual_RWInvisibility.pxx"
+#include "../RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWLengthUnit.pxx"
+#include "../RWStepGeom/RWStepGeom_RWLine.pxx"
+#include "../RWStepBasic/RWStepBasic_RWLocalTime.pxx"
+#include "../RWStepShape/RWStepShape_RWLoop.pxx"
+#include "../RWStepShape/RWStepShape_RWManifoldSolidBrep.pxx"
+#include "../RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMappedItem.pxx"
+#include "../RWStepBasic/RWStepBasic_RWMeasureWithUnit.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.pxx"
+#include "../RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWMechanicalDesignPresentationArea.hxx>
-#include <RWStepBasic_RWNamedUnit.hxx>
-#include <RWStepGeom_RWOffsetCurve3d.hxx>
-#include <RWStepGeom_RWOffsetSurface.hxx>
+#include "../RWStepBasic/RWStepBasic_RWNamedUnit.pxx"
+#include "../RWStepGeom/RWStepGeom_RWOffsetCurve3d.pxx"
+#include "../RWStepGeom/RWStepGeom_RWOffsetSurface.pxx"
 // Removed from Rev2 to Rev4 : <RWStepAP214_RWOneDirectionRepeatFactor.hxx>
-#include <RWStepShape_RWOpenShell.hxx>
-#include <RWStepBasic_RWOrdinalDate.hxx>
-#include <RWStepBasic_RWOrganization.hxx>
-#include <RWStepBasic_RWOrganizationRole.hxx>
-#include <RWStepBasic_RWOrganizationalAddress.hxx>
-#include <RWStepShape_RWOrientedClosedShell.hxx>
-#include <RWStepShape_RWOrientedEdge.hxx>
-#include <RWStepShape_RWOrientedFace.hxx>
-#include <RWStepShape_RWOrientedOpenShell.hxx>
-#include <RWStepShape_RWOrientedPath.hxx>
-#include <RWStepGeom_RWOuterBoundaryCurve.hxx>
-#include <RWStepVisual_RWOverRidingStyledItem.hxx>
-#include <RWStepGeom_RWParabola.hxx>
-#include <RWStepRepr_RWParametricRepresentationContext.hxx>
-#include <RWStepShape_RWPath.hxx>
-#include <RWStepGeom_RWPcurve.hxx>
-#include <RWStepBasic_RWPerson.hxx>
-#include <RWStepBasic_RWPersonAndOrganization.hxx>
-#include <RWStepBasic_RWPersonAndOrganizationRole.hxx>
-#include <RWStepBasic_RWPersonalAddress.hxx>
-#include <RWStepGeom_RWPlacement.hxx>
-#include <RWStepVisual_RWPlanarBox.hxx>
-#include <RWStepVisual_RWPlanarExtent.hxx>
-#include <RWStepGeom_RWPlane.hxx>
-#include <RWStepBasic_RWPlaneAngleMeasureWithUnit.hxx>
-#include <RWStepBasic_RWPlaneAngleUnit.hxx>
-#include <RWStepGeom_RWPoint.hxx>
-#include <RWStepGeom_RWPointOnCurve.hxx>
-#include <RWStepGeom_RWPointOnSurface.hxx>
-#include <RWStepGeom_RWPointReplica.hxx>
-#include <RWStepVisual_RWPointStyle.hxx>
-#include <RWStepShape_RWPolyLoop.hxx>
-#include <RWStepGeom_RWPolyline.hxx>
-#include <RWStepVisual_RWPreDefinedColour.hxx>
-#include <RWStepVisual_RWPreDefinedCurveFont.hxx>
-#include <RWStepVisual_RWPreDefinedItem.hxx>
+#include "../RWStepShape/RWStepShape_RWOpenShell.pxx"
+#include "../RWStepBasic/RWStepBasic_RWOrdinalDate.pxx"
+#include "../RWStepBasic/RWStepBasic_RWOrganization.pxx"
+#include "../RWStepBasic/RWStepBasic_RWOrganizationRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWOrganizationalAddress.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedClosedShell.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedEdge.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedFace.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedOpenShell.pxx"
+#include "../RWStepShape/RWStepShape_RWOrientedPath.pxx"
+#include "../RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.pxx"
+#include "../RWStepVisual/RWStepVisual_RWOverRidingStyledItem.pxx"
+#include "../RWStepGeom/RWStepGeom_RWParabola.pxx"
+#include "../RWStepRepr/RWStepRepr_RWParametricRepresentationContext.pxx"
+#include "../RWStepShape/RWStepShape_RWPath.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPcurve.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPerson.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPersonAndOrganization.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPersonalAddress.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPlacement.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPlanarBox.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPlanarExtent.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPlane.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWPlaneAngleUnit.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPoint.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPointOnCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPointOnSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPointReplica.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPointStyle.pxx"
+#include "../RWStepShape/RWStepShape_RWPolyLoop.pxx"
+#include "../RWStepGeom/RWStepGeom_RWPolyline.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPreDefinedColour.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPreDefinedItem.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWPreDefinedSymbol.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWPreDefinedTextFont.hxx>
-#include <RWStepVisual_RWPresentationArea.hxx>
-#include <RWStepVisual_RWPresentationLayerAssignment.hxx>
-#include <RWStepVisual_RWPresentationRepresentation.hxx>
-#include <RWStepVisual_RWPresentationSet.hxx>
-#include <RWStepVisual_RWPresentationSize.hxx>
-#include <RWStepVisual_RWPresentationStyleAssignment.hxx>
-#include <RWStepVisual_RWPresentationStyleByContext.hxx>
-#include <RWStepVisual_RWPresentationView.hxx>
-#include <RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx>
-#include <RWStepVisual_RWRepositionedTessellatedItem.hxx>
-#include <RWStepBasic_RWProduct.hxx>
-#include <RWStepBasic_RWProductCategory.hxx>
-#include <RWStepBasic_RWProductContext.hxx>
+#include "../RWStepVisual/RWStepVisual_RWPresentationArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationSize.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationStyleByContext.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationView.pxx"
+#include "../RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProduct.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductCategory.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductContext.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWProductDataRepresentationView.hxx>
-#include <RWStepBasic_RWProductDefinition.hxx>
-#include <RWStepBasic_RWProductDefinitionContext.hxx>
-#include <RWStepBasic_RWProductDefinitionFormation.hxx>
-#include <RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.hxx>
-#include <RWStepRepr_RWProductDefinitionShape.hxx>
-#include <RWStepBasic_RWProductRelatedProductCategory.hxx>
-#include <RWStepBasic_RWProductType.hxx>
-#include <RWStepRepr_RWPropertyDefinition.hxx>
-#include <RWStepRepr_RWPropertyDefinitionRepresentation.hxx>
-#include <RWStepGeom_RWQuasiUniformCurve.hxx>
-#include <RWStepGeom_RWQuasiUniformSurface.hxx>
-#include <RWStepBasic_RWRatioMeasureWithUnit.hxx>
-#include <RWStepGeom_RWRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWRectangularCompositeSurface.hxx>
-#include <RWStepGeom_RWRectangularTrimmedSurface.hxx>
-#include <RWStepAP214_RWRepItemGroup.hxx>
-#include <RWStepGeom_RWReparametrisedCompositeCurveSegment.hxx>
-#include <RWStepRepr_RWRepresentation.hxx>
-#include <RWStepRepr_RWRepresentationContext.hxx>
-#include <RWStepRepr_RWRepresentationItem.hxx>
-#include <RWStepRepr_RWRepresentationMap.hxx>
-#include <RWStepRepr_RWRepresentationRelationship.hxx>
-#include <RWStepShape_RWRevolvedAreaSolid.hxx>
-#include <RWStepShape_RWRightAngularWedge.hxx>
-#include <RWStepShape_RWRightCircularCone.hxx>
-#include <RWStepShape_RWRightCircularCylinder.hxx>
-#include <RWStepGeom_RWSeamCurve.hxx>
-#include <RWStepBasic_RWSecurityClassification.hxx>
-#include <RWStepBasic_RWSecurityClassificationLevel.hxx>
-#include <RWStepRepr_RWShapeAspect.hxx>
-#include <RWStepRepr_RWShapeAspectRelationship.hxx>
-#include <RWStepRepr_RWFeatureForDatumTargetRelationship.hxx>
-#include <RWStepRepr_RWShapeAspectTransition.hxx>
-#include <RWStepShape_RWShapeDefinitionRepresentation.hxx>
-#include <RWStepShape_RWShapeRepresentation.hxx>
-#include <RWStepShape_RWShellBasedSurfaceModel.hxx>
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSolidAngleMeasureWithUnit.hxx>
-#include <RWStepShape_RWSolidModel.hxx>
-#include <RWStepShape_RWSolidReplica.hxx>
-#include <RWStepShape_RWSphere.hxx>
-#include <RWStepGeom_RWSphericalSurface.hxx>
-#include <RWStepVisual_RWStyledItem.hxx>
-#include <RWStepGeom_RWSurface.hxx>
-#include <RWStepGeom_RWSurfaceCurve.hxx>
-#include <RWStepGeom_RWSurfaceOfLinearExtrusion.hxx>
-#include <RWStepGeom_RWSurfaceOfRevolution.hxx>
-#include <RWStepGeom_RWSurfaceCurveAndBoundedCurve.hxx>
-#include <RWStepGeom_RWSurfacePatch.hxx>
-#include <RWStepGeom_RWSurfaceReplica.hxx>
-#include <RWStepVisual_RWSurfaceSideStyle.hxx>
-#include <RWStepVisual_RWSurfaceStyleBoundary.hxx>
-#include <RWStepVisual_RWSurfaceStyleControlGrid.hxx>
-#include <RWStepVisual_RWSurfaceStyleFillArea.hxx>
-#include <RWStepVisual_RWSurfaceStyleParameterLine.hxx>
-#include <RWStepVisual_RWSurfaceStyleSegmentationCurve.hxx>
-#include <RWStepVisual_RWSurfaceStyleSilhouette.hxx>
-#include <RWStepVisual_RWSurfaceStyleUsage.hxx>
-#include <RWStepShape_RWSweptAreaSolid.hxx>
-#include <RWStepGeom_RWSweptSurface.hxx>
+#include "../RWStepBasic/RWStepBasic_RWProductDefinition.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionFormation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.pxx"
+#include "../RWStepRepr/RWStepRepr_RWProductDefinitionShape.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductType.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPropertyDefinition.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformSurface.pxx"
+#include "../RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.pxx"
+#include "RWStepAP214_RWRepItemGroup.pxx"
+#include "../RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationContext.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationMap.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationRelationship.pxx"
+#include "../RWStepShape/RWStepShape_RWRevolvedAreaSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWRightAngularWedge.pxx"
+#include "../RWStepShape/RWStepShape_RWRightCircularCone.pxx"
+#include "../RWStepShape/RWStepShape_RWRightCircularCylinder.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSeamCurve.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSecurityClassification.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeAspectRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeAspectTransition.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWShellBasedSurfaceModel.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSiUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.pxx"
+#include "../RWStepShape/RWStepShape_RWSolidModel.pxx"
+#include "../RWStepShape/RWStepShape_RWSolidReplica.pxx"
+#include "../RWStepShape/RWStepShape_RWSphere.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSphericalSurface.pxx"
+#include "../RWStepVisual/RWStepVisual_RWStyledItem.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfacePatch.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSurfaceReplica.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceSideStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.pxx"
+#include "../RWStepShape/RWStepShape_RWSweptAreaSolid.pxx"
+#include "../RWStepGeom/RWStepGeom_RWSweptSurface.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWSymbolColour.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWSymbolRepresentation.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWSymbolRepresentationMap.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWSymbolStyle.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWSymbolTarget.hxx>
-#include <RWStepVisual_RWTemplate.hxx>
-#include <RWStepVisual_RWTemplateInstance.hxx>
+#include "../RWStepVisual/RWStepVisual_RWTemplate.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTemplateInstance.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWTerminatorSymbol.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
-#include <RWStepVisual_RWTextLiteral.hxx>
+#include "../RWStepVisual/RWStepVisual_RWTextLiteral.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWTextLiteralWithAssociatedCurves.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWTextLiteralWithBlankingBox.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWTextLiteralWithDelineation.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWTextLiteralWithExtent.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
-#include <RWStepVisual_RWTextStyle.hxx>
-#include <RWStepVisual_RWTextStyleForDefinedFont.hxx>
-#include  <RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx>
+#include "../RWStepVisual/RWStepVisual_RWTextStyle.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.pxx"
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWTextStyleWithMirror.hxx>
-#include <RWStepShape_RWTopologicalRepresentationItem.hxx>
-#include <RWStepGeom_RWToroidalSurface.hxx>
-#include <RWStepShape_RWTorus.hxx>
-#include <RWStepShape_RWTransitionalShapeRepresentation.hxx>
-#include <RWStepGeom_RWTrimmedCurve.hxx>
+#include "../RWStepShape/RWStepShape_RWTopologicalRepresentationItem.pxx"
+#include "../RWStepGeom/RWStepGeom_RWToroidalSurface.pxx"
+#include "../RWStepShape/RWStepShape_RWTorus.pxx"
+#include "../RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.pxx"
+#include "../RWStepGeom/RWStepGeom_RWTrimmedCurve.pxx"
 // Removed from Rev2 to Rev4 : <RWStepAP214_RWTwoDirectionRepeatFactor.hxx>
-#include <RWStepBasic_RWUncertaintyMeasureWithUnit.hxx>
-#include <RWStepGeom_RWUniformCurve.hxx>
-#include <RWStepGeom_RWUniformSurface.hxx>
-#include <RWStepGeom_RWVector.hxx>
-#include <RWStepShape_RWVertex.hxx>
-#include <RWStepShape_RWVertexLoop.hxx>
-#include <RWStepShape_RWVertexPoint.hxx>
-#include <RWStepVisual_RWViewVolume.hxx>
-#include <RWStepBasic_RWWeekOfYearAndDayDate.hxx>
-#include <RWStepGeom_RWUniformCurveAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWBezierCurveAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.hxx>
-#include <RWStepBasic_RWSiUnitAndLengthUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndPlaneAngleUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndLengthUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx>
-#include <RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
-#include <RWStepShape_RWLoopAndPath.hxx>
+#include "../RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWVector.pxx"
+#include "../RWStepShape/RWStepShape_RWVertex.pxx"
+#include "../RWStepShape/RWStepShape_RWVertexLoop.pxx"
+#include "../RWStepShape/RWStepShape_RWVertexPoint.pxx"
+#include "../RWStepVisual/RWStepVisual_RWViewVolume.pxx"
+#include "../RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.pxx"
+#include "../RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.pxx"
+#include "../RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.pxx"
+#include "../RWStepShape/RWStepShape_RWLoopAndPath.pxx"
 
 
 // Added by FMA
-#include <RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
-#include <RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndSolidAngleUnit.hxx>
-#include <RWStepBasic_RWSolidAngleUnit.hxx>
-#include <RWStepShape_RWFacetedBrepAndBrepWithVoids.hxx>
-#include <RWStepBasic_RWMechanicalContext.hxx>
+#include "../RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.pxx"
+#include "../RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSolidAngleUnit.pxx"
+#include "../RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.pxx"
+#include "../RWStepBasic/RWStepBasic_RWMechanicalContext.pxx"
 
 // full Rev4
-#include <RWStepBasic_RWSiUnitAndRatioUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndTimeUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx>
-#include <RWStepBasic_RWApprovalDateTime.hxx>
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWApprovalDateTime.pxx"
 //not yet #include <StepVisual_CameraImage2dWithScale.hxx> derived
 //not yet #include <StepVisual_CameraImage3dWithScale.hxx> derived
 //not yet #include <StepVisual_CartesianTransformationOperator2d.hxx> derived
-#include <RWStepBasic_RWDerivedUnit.hxx>
-#include <RWStepBasic_RWDerivedUnitElement.hxx>
-#include <RWStepRepr_RWItemDefinedTransformation.hxx>
-#include <RWStepVisual_RWPresentedItemRepresentation.hxx>
-#include <RWStepVisual_RWPresentationLayerUsage.hxx>
+#include "../RWStepBasic/RWStepBasic_RWDerivedUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDerivedUnitElement.pxx"
+#include "../RWStepRepr/RWStepRepr_RWItemDefinedTransformation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.pxx"
+#include "../RWStepVisual/RWStepVisual_RWPresentationLayerUsage.pxx"
 
 //  Added by CKY (JUL-1998) for AP214 CC1 -> CC2
 
-#include <RWStepAP214_RWAutoDesignDocumentReference.hxx>
-#include <RWStepBasic_RWDocument.hxx>
-#include <RWStepBasic_RWDocumentRelationship.hxx>
-#include <RWStepBasic_RWDocumentType.hxx>
-#include <RWStepBasic_RWDocumentUsageConstraint.hxx>
-#include <RWStepBasic_RWEffectivity.hxx>
-#include <RWStepBasic_RWProductDefinitionEffectivity.hxx>
-#include <RWStepBasic_RWProductDefinitionRelationship.hxx>
+#include "RWStepAP214_RWAutoDesignDocumentReference.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocument.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentType.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.pxx"
+#include "../RWStepBasic/RWStepBasic_RWEffectivity.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.pxx"
 
-#include <RWStepBasic_RWProductDefinitionWithAssociatedDocuments.hxx>
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.pxx"
 
-#include <RWStepRepr_RWMakeFromUsageOption.hxx>
-#include <RWStepRepr_RWAssemblyComponentUsage.hxx>
-#include <RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx>
-#include <RWStepRepr_RWSpecifiedHigherUsageOccurrence.hxx>
-#include <RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx>
-#include <RWStepRepr_RWRepresentationRelationshipWithTransformation.hxx>
-#include <RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.hxx>
-#include <RWStepRepr_RWMaterialDesignation.hxx>
+#include "../RWStepRepr/RWStepRepr_RWMakeFromUsageOption.pxx"
+#include "../RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.pxx"
+#include "../RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.pxx"
+#include "../RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.pxx"
+#include "../RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMaterialDesignation.pxx"
 
-#include <RWStepShape_RWContextDependentShapeRepresentation.hxx>
+#include "../RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.pxx"
 
 // Added from CD to DIS (S4134)
 #include <StepAP214_AppliedDateAndTimeAssignment.hxx> 
@@ -876,32 +876,32 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepShape_RevolvedFaceSolid.hxx>  
 #include <StepShape_SweptFaceSolid.hxx>  
 
-#include <RWStepAP214_RWAppliedDateAndTimeAssignment.hxx>
-#include <RWStepAP214_RWAppliedDateAssignment.hxx>
-#include <RWStepAP214_RWAppliedApprovalAssignment.hxx>
-#include <RWStepAP214_RWAppliedDocumentReference.hxx>
-#include <RWStepAP214_RWAppliedGroupAssignment.hxx>
-#include <RWStepAP214_RWAppliedOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAppliedPersonAndOrganizationAssignment.hxx>
-#include <RWStepAP214_RWAppliedPresentedItem.hxx>
-#include <RWStepAP214_RWAppliedSecurityClassificationAssignment.hxx>  
-#include <RWStepBasic_RWDocumentFile.hxx>
-#include <RWStepBasic_RWCharacterizedObject.hxx>  
-#include <RWStepShape_RWExtrudedFaceSolid.hxx>
-#include <RWStepShape_RWRevolvedFaceSolid.hxx>  
-#include <RWStepShape_RWSweptFaceSolid.hxx> 
+#include "RWStepAP214_RWAppliedDateAndTimeAssignment.pxx"
+#include "RWStepAP214_RWAppliedDateAssignment.pxx"
+#include "RWStepAP214_RWAppliedApprovalAssignment.pxx"
+#include "RWStepAP214_RWAppliedDocumentReference.pxx"
+#include "RWStepAP214_RWAppliedGroupAssignment.pxx"
+#include "RWStepAP214_RWAppliedOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAppliedPersonAndOrganizationAssignment.pxx"
+#include "RWStepAP214_RWAppliedPresentedItem.pxx"
+#include "RWStepAP214_RWAppliedSecurityClassificationAssignment.pxx"  
+#include "../RWStepBasic/RWStepBasic_RWDocumentFile.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCharacterizedObject.pxx"  
+#include "../RWStepShape/RWStepShape_RWExtrudedFaceSolid.pxx"
+#include "../RWStepShape/RWStepShape_RWRevolvedFaceSolid.pxx"  
+#include "../RWStepShape/RWStepShape_RWSweptFaceSolid.pxx" 
 
 // Added by ABV 08.09.99 for CAX TRJ 2 (validation properties)
 #include <StepRepr_MeasureRepresentationItem.hxx>
-#include <RWStepRepr_RWMeasureRepresentationItem.hxx>
+#include "../RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.pxx"
 #include <StepBasic_SiUnitAndAreaUnit.hxx>
 #include <StepBasic_SiUnitAndVolumeUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndAreaUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndVolumeUnit.hxx> 
-#include <RWStepBasic_RWSiUnitAndAreaUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndVolumeUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx>
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.pxx"
 
 // Added by ABV 10.11.99 for AP203
 #include <StepBasic_Action.hxx>
@@ -932,38 +932,38 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepBasic_VersionedActionRequest.hxx>
 #include <StepBasic_ProductCategoryRelationship.hxx>
 #include <StepBasic_ActionRequestSolution.hxx>
-#include <RWStepBasic_RWAction.hxx>
-#include <RWStepBasic_RWActionAssignment.hxx>
-#include <RWStepBasic_RWActionMethod.hxx>
-#include <RWStepBasic_RWActionRequestAssignment.hxx>
-#include <RWStepAP203_RWCcDesignApproval.hxx>
-#include <RWStepAP203_RWCcDesignCertification.hxx>
-#include <RWStepAP203_RWCcDesignContract.hxx>
-#include <RWStepAP203_RWCcDesignDateAndTimeAssignment.hxx>
-#include <RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.hxx>
-#include <RWStepAP203_RWCcDesignSecurityClassification.hxx>
-#include <RWStepAP203_RWCcDesignSpecificationReference.hxx>
-#include <RWStepBasic_RWCertification.hxx>
-#include <RWStepBasic_RWCertificationAssignment.hxx>
-#include <RWStepBasic_RWCertificationType.hxx>
-#include <RWStepAP203_RWChange.hxx>
-#include <RWStepAP203_RWChangeRequest.hxx>
-#include <RWStepRepr_RWConfigurationDesign.hxx>
-#include <RWStepRepr_RWConfigurationEffectivity.hxx>
-#include <RWStepBasic_RWContract.hxx>
-#include <RWStepBasic_RWContractAssignment.hxx>
-#include <RWStepBasic_RWContractType.hxx>
-#include <RWStepRepr_RWProductConcept.hxx>
-#include <RWStepBasic_RWProductConceptContext.hxx>
-#include <RWStepAP203_RWStartRequest.hxx>
-#include <RWStepAP203_RWStartWork.hxx>
-#include <RWStepBasic_RWVersionedActionRequest.hxx>
-#include <RWStepBasic_RWProductCategoryRelationship.hxx>
-#include <RWStepBasic_RWActionRequestSolution.hxx>
+#include "../RWStepBasic/RWStepBasic_RWAction.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionMethod.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionRequestAssignment.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignApproval.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignCertification.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignContract.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignDateAndTimeAssignment.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignPersonAndOrganizationAssignment.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignSecurityClassification.pxx"
+#include "../RWStepAP203/RWStepAP203_RWCcDesignSpecificationReference.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCertification.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCertificationAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWCertificationType.pxx"
+#include "../RWStepAP203/RWStepAP203_RWChange.pxx"
+#include "../RWStepAP203/RWStepAP203_RWChangeRequest.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConfigurationDesign.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConfigurationEffectivity.pxx"
+#include "../RWStepBasic/RWStepBasic_RWContract.pxx"
+#include "../RWStepBasic/RWStepBasic_RWContractAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWContractType.pxx"
+#include "../RWStepRepr/RWStepRepr_RWProductConcept.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductConceptContext.pxx"
+#include "../RWStepAP203/RWStepAP203_RWStartRequest.pxx"
+#include "../RWStepAP203/RWStepAP203_RWStartWork.pxx"
+#include "../RWStepBasic/RWStepBasic_RWVersionedActionRequest.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductCategoryRelationship.pxx"
+#include "../RWStepBasic/RWStepBasic_RWActionRequestSolution.pxx"
 
 // Added by ABV 13.01.00 for CAX-IF TRJ3
 #include <StepVisual_DraughtingModel.hxx>
-#include <RWStepVisual_RWDraughtingModel.hxx>
+#include "../RWStepVisual/RWStepVisual_RWDraughtingModel.pxx"
 
 // Added by ABV 18.04.00 for CAX-IF TRJ4 (dimensions)
 #include <StepShape_AngularLocation.hxx>
@@ -974,14 +974,14 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepShape_DimensionalSize.hxx>
 #include <StepShape_DimensionalSizeWithPath.hxx>
 #include <StepShape_ShapeDimensionRepresentation.hxx>
-#include <RWStepShape_RWAngularLocation.hxx>
-#include <RWStepShape_RWAngularSize.hxx>
-#include <RWStepShape_RWDimensionalCharacteristicRepresentation.hxx>
-#include <RWStepShape_RWDimensionalLocation.hxx>
-#include <RWStepShape_RWDimensionalLocationWithPath.hxx>
-#include <RWStepShape_RWDimensionalSize.hxx>
-#include <RWStepShape_RWDimensionalSizeWithPath.hxx>
-#include <RWStepShape_RWShapeDimensionRepresentation.hxx>
+#include "../RWStepShape/RWStepShape_RWAngularLocation.pxx"
+#include "../RWStepShape/RWStepShape_RWAngularSize.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalLocation.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalLocationWithPath.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalSize.pxx"
+#include "../RWStepShape/RWStepShape_RWDimensionalSizeWithPath.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeDimensionRepresentation.pxx"
 
 // Added by ABV 10.05.00 for CAX-IF TRJ4 (external references)
 #include <StepBasic_DocumentRepresentationType.hxx>
@@ -997,23 +997,23 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepAP214_ExternallyDefinedClass.hxx>
 #include <StepAP214_ExternallyDefinedGeneralProperty.hxx>
 #include <StepAP214_AppliedExternalIdentificationAssignment.hxx>
-#include <RWStepBasic_RWDocumentRepresentationType.hxx>
-#include <RWStepBasic_RWObjectRole.hxx>
-#include <RWStepBasic_RWRoleAssociation.hxx>
-#include <RWStepBasic_RWIdentificationRole.hxx>
-#include <RWStepBasic_RWIdentificationAssignment.hxx>
-#include <RWStepBasic_RWExternalIdentificationAssignment.hxx>
-#include <RWStepBasic_RWEffectivityAssignment.hxx>
-#include <RWStepBasic_RWNameAssignment.hxx>
-#include <RWStepBasic_RWGeneralProperty.hxx>
-#include <RWStepAP214_RWClass.hxx>
-#include <RWStepAP214_RWExternallyDefinedClass.hxx>
-#include <RWStepAP214_RWExternallyDefinedGeneralProperty.hxx>
-#include <RWStepAP214_RWAppliedExternalIdentificationAssignment.hxx>
+#include "../RWStepBasic/RWStepBasic_RWDocumentRepresentationType.pxx"
+#include "../RWStepBasic/RWStepBasic_RWObjectRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWRoleAssociation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWIdentificationRole.pxx"
+#include "../RWStepBasic/RWStepBasic_RWIdentificationAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWEffectivityAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWNameAssignment.pxx"
+#include "../RWStepBasic/RWStepBasic_RWGeneralProperty.pxx"
+#include "RWStepAP214_RWClass.pxx"
+#include "RWStepAP214_RWExternallyDefinedClass.pxx"
+#include "RWStepAP214_RWExternallyDefinedGeneralProperty.pxx"
+#include "RWStepAP214_RWAppliedExternalIdentificationAssignment.pxx"
 
 // abv 11.07.00: CAX-IF TRJ4: k1_geo-ac.stp
 #include <StepShape_DefinitionalRepresentationAndShapeRepresentation.hxx>
-#include <RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.hxx>
+#include "../RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.pxx"
 
 
 // Added by CKY , 25 APR 2001 for Dimensional Tolerances (CAX-IF TRJ7)
@@ -1032,15 +1032,15 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepRepr_CompoundRepresentationItem.hxx>
 #include <StepRepr_ValueRange.hxx>
 #include <StepRepr_ShapeAspectDerivingRelationship.hxx>
-#include <RWStepShape_RWLimitsAndFits.hxx>
-#include <RWStepShape_RWToleranceValue.hxx>
-#include <RWStepShape_RWMeasureQualification.hxx>
-#include <RWStepShape_RWPlusMinusTolerance.hxx>
-#include <RWStepShape_RWPrecisionQualifier.hxx>
-#include <RWStepShape_RWTypeQualifier.hxx>
-#include <RWStepShape_RWQualifiedRepresentationItem.hxx>
-#include <RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.hxx>
-#include <RWStepRepr_RWCompoundRepresentationItem.hxx>
+#include "../RWStepShape/RWStepShape_RWLimitsAndFits.pxx"
+#include "../RWStepShape/RWStepShape_RWToleranceValue.pxx"
+#include "../RWStepShape/RWStepShape_RWMeasureQualification.pxx"
+#include "../RWStepShape/RWStepShape_RWPlusMinusTolerance.pxx"
+#include "../RWStepShape/RWStepShape_RWPrecisionQualifier.pxx"
+#include "../RWStepShape/RWStepShape_RWTypeQualifier.pxx"
+#include "../RWStepShape/RWStepShape_RWQualifiedRepresentationItem.pxx"
+#include "../RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.pxx"
 
 // abv 28.12.01: CAX-IF TRJ9: edge_based_wireframe
 #include <StepShape_CompoundShapeRepresentation.hxx>
@@ -1050,13 +1050,13 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepShape_EdgeBasedWireframeShapeRepresentation.hxx>
 #include <StepShape_FaceBasedSurfaceModel.hxx>
 #include <StepShape_NonManifoldSurfaceShapeRepresentation.hxx>
-#include <RWStepShape_RWCompoundShapeRepresentation.hxx>
-#include <RWStepShape_RWConnectedEdgeSet.hxx>
-#include <RWStepShape_RWConnectedFaceShapeRepresentation.hxx>
-#include <RWStepShape_RWEdgeBasedWireframeModel.hxx>
-#include <RWStepShape_RWEdgeBasedWireframeShapeRepresentation.hxx>
-#include <RWStepShape_RWFaceBasedSurfaceModel.hxx>
-#include <RWStepShape_RWNonManifoldSurfaceShapeRepresentation.hxx>
+#include "../RWStepShape/RWStepShape_RWCompoundShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedEdgeSet.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.pxx"
+#include "../RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.pxx"
+#include "../RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.pxx"
+#include "../RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.pxx"
 
 //gka 08.01.02 TRJ9
 #include <StepGeom_OrientedSurface.hxx>
@@ -1065,11 +1065,11 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepShape_SeamEdge.hxx>
 #include <StepShape_ConnectedFaceSubSet.hxx>
 
-#include <RWStepGeom_RWOrientedSurface.hxx>
-#include <RWStepShape_RWSubface.hxx>
-#include <RWStepShape_RWSubedge.hxx>
-#include <RWStepShape_RWSeamEdge.hxx>
-#include <RWStepShape_RWConnectedFaceSubSet.hxx>
+#include "../RWStepGeom/RWStepGeom_RWOrientedSurface.pxx"
+#include "../RWStepShape/RWStepShape_RWSubface.pxx"
+#include "../RWStepShape/RWStepShape_RWSubedge.pxx"
+#include "../RWStepShape/RWStepShape_RWSeamEdge.pxx"
+#include "../RWStepShape/RWStepShape_RWConnectedFaceSubSet.pxx"
 
 // Added for AP209
 #include <StepBasic_EulerAngles.hxx>
@@ -1150,102 +1150,102 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepRepr_StructuralResponseProperty.hxx>
 #include <StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx>
 
-#include <RWStepBasic_RWEulerAngles.hxx>
-#include <RWStepBasic_RWMassUnit.hxx>
-#include <RWStepBasic_RWThermodynamicTemperatureUnit.hxx>
-#include <RWStepElement_RWAnalysisItemWithinRepresentation.hxx>
-#include <RWStepElement_RWCurve3dElementDescriptor.hxx>
-#include <RWStepElement_RWCurveElementEndReleasePacket.hxx>
-#include <RWStepElement_RWCurveElementSectionDefinition.hxx>
-#include <RWStepElement_RWCurveElementSectionDerivedDefinitions.hxx>
-#include <RWStepElement_RWElementDescriptor.hxx>
-#include <RWStepElement_RWElementMaterial.hxx>
-#include <RWStepElement_RWSurface3dElementDescriptor.hxx>
-#include <RWStepElement_RWSurfaceElementProperty.hxx>
-#include <RWStepElement_RWSurfaceSection.hxx>
-#include <RWStepElement_RWSurfaceSectionField.hxx>
-#include <RWStepElement_RWSurfaceSectionFieldConstant.hxx>
-#include <RWStepElement_RWSurfaceSectionFieldVarying.hxx>
-#include <RWStepElement_RWUniformSurfaceSection.hxx>
-#include <RWStepElement_RWVolume3dElementDescriptor.hxx>
-#include <RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWCurve3dElementProperty.hxx>
-#include <RWStepFEA_RWCurve3dElementRepresentation.hxx>
-#include <RWStepFEA_RWNode.hxx>
-#include <RWStepFEA_RWCurveElementEndOffset.hxx>
-#include <RWStepFEA_RWCurveElementEndRelease.hxx>
-#include <RWStepFEA_RWCurveElementInterval.hxx>
-#include <RWStepFEA_RWCurveElementIntervalConstant.hxx>
-#include <RWStepFEA_RWDummyNode.hxx>
-#include <RWStepFEA_RWCurveElementLocation.hxx>
-#include <RWStepFEA_RWElementGeometricRelationship.hxx>
-#include <RWStepFEA_RWElementGroup.hxx>
-#include <RWStepFEA_RWElementRepresentation.hxx>
-#include <RWStepFEA_RWFeaAreaDensity.hxx>
-#include <RWStepFEA_RWFeaAxis2Placement3d.hxx>
-#include <RWStepFEA_RWFeaGroup.hxx>
-#include <RWStepFEA_RWFeaLinearElasticity.hxx>
-#include <RWStepFEA_RWFeaMassDensity.hxx>
-#include <RWStepFEA_RWFeaMaterialPropertyRepresentation.hxx>
-#include <RWStepFEA_RWFeaMaterialPropertyRepresentationItem.hxx>
-#include <RWStepFEA_RWFeaModel.hxx>
-#include <RWStepFEA_RWFeaModel3d.hxx>
-#include <RWStepFEA_RWFeaMoistureAbsorption.hxx>
-#include <RWStepFEA_RWFeaParametricPoint.hxx>
-#include <RWStepFEA_RWFeaRepresentationItem.hxx>
-#include <RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.hxx>
-#include <RWStepFEA_RWFeaShellBendingStiffness.hxx>
-#include <RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.hxx>
-#include <RWStepFEA_RWFeaShellMembraneStiffness.hxx>
-#include <RWStepFEA_RWFeaShellShearStiffness.hxx>
-#include <RWStepFEA_RWGeometricNode.hxx>
-#include <RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.hxx>
-#include <RWStepFEA_RWNodeGroup.hxx>
-#include <RWStepFEA_RWNodeRepresentation.hxx>
-#include <RWStepFEA_RWNodeSet.hxx>
-#include <RWStepFEA_RWNodeWithSolutionCoordinateSystem.hxx>
-#include <RWStepFEA_RWNodeWithVector.hxx>
-#include <RWStepFEA_RWParametricCurve3dElementCoordinateDirection.hxx>
-#include <RWStepFEA_RWParametricCurve3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWParametricSurface3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWSurface3dElementRepresentation.hxx>
-#include <RWStepFEA_RWVolume3dElementRepresentation.hxx>
-#include <RWStepRepr_RWDataEnvironment.hxx>
-#include <RWStepRepr_RWMaterialPropertyRepresentation.hxx>
-#include <RWStepRepr_RWPropertyDefinitionRelationship.hxx>
-#include <RWStepShape_RWPointRepresentation.hxx>
-#include <RWStepRepr_RWMaterialProperty.hxx>
-#include <RWStepFEA_RWFeaModelDefinition.hxx>
-#include <RWStepFEA_RWFreedomAndCoefficient.hxx>
-#include <RWStepFEA_RWFreedomsList.hxx>
-#include <RWStepBasic_RWProductDefinitionFormationRelationship.hxx>
-#include <RWStepFEA_RWNodeDefinition.hxx>
-#include <RWStepRepr_RWStructuralResponseProperty.hxx>
-#include <RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.hxx>
+#include "../RWStepBasic/RWStepBasic_RWEulerAngles.pxx"
+#include "../RWStepBasic/RWStepBasic_RWMassUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.pxx"
+#include "../RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.pxx"
+#include "../RWStepElement/RWStepElement_RWCurve3dElementDescriptor.pxx"
+#include "../RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.pxx"
+#include "../RWStepElement/RWStepElement_RWCurveElementSectionDefinition.pxx"
+#include "../RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.pxx"
+#include "../RWStepElement/RWStepElement_RWElementDescriptor.pxx"
+#include "../RWStepElement/RWStepElement_RWElementMaterial.pxx"
+#include "../RWStepElement/RWStepElement_RWSurface3dElementDescriptor.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceElementProperty.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSection.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSectionField.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.pxx"
+#include "../RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.pxx"
+#include "../RWStepElement/RWStepElement_RWUniformSurfaceSection.pxx"
+#include "../RWStepElement/RWStepElement_RWVolume3dElementDescriptor.pxx"
+#include "../RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurve3dElementProperty.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNode.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementEndOffset.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementEndRelease.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementInterval.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.pxx"
+#include "../RWStepFEA/RWStepFEA_RWDummyNode.pxx"
+#include "../RWStepFEA/RWStepFEA_RWCurveElementLocation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWElementGeometricRelationship.pxx"
+#include "../RWStepFEA/RWStepFEA_RWElementGroup.pxx"
+#include "../RWStepFEA/RWStepFEA_RWElementRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaAreaDensity.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaGroup.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaLinearElasticity.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMassDensity.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaModel.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaModel3d.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaParametricPoint.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaRepresentationItem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.pxx"
+#include "../RWStepFEA/RWStepFEA_RWGeometricNode.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeGroup.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeSet.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeWithVector.pxx"
+#include "../RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.pxx"
+#include "../RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.pxx"
+#include "../RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWDataEnvironment.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.pxx"
+#include "../RWStepShape/RWStepShape_RWPointRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWMaterialProperty.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaModelDefinition.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFreedomsList.pxx"
+#include "../RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.pxx"
+#include "../RWStepFEA/RWStepFEA_RWNodeDefinition.pxx"
+#include "../RWStepRepr/RWStepRepr_RWStructuralResponseProperty.pxx"
+#include "../RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.pxx"
 
 #include <StepBasic_SiUnitAndMassUnit.hxx>
 #include <StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndMassUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.hxx>
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.pxx"
+#include "../RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.pxx"
 #include <StepFEA_AlignedSurface3dElementCoordinateSystem.hxx>
 #include <StepFEA_ConstantSurface3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.hxx>
-#include <RWStepFEA_RWConstantSurface3dElementCoordinateSystem.hxx>
+#include "../RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.pxx"
+#include "../RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.pxx"
 
 // 23.01.2003
 #include <StepFEA_CurveElementIntervalLinearlyVarying.hxx>
 #include <StepFEA_FeaCurveSectionGeometricRelationship.hxx>
 #include <StepFEA_FeaSurfaceSectionGeometricRelationship.hxx>
-#include <RWStepFEA_RWCurveElementIntervalLinearlyVarying.hxx>
-#include <RWStepFEA_RWFeaCurveSectionGeometricRelationship.hxx>
-#include <RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.hxx>
+#include "../RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.pxx"
+#include "../RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.pxx"
 
 // PTV 28.01.2003 TRJ11 AP214 external references
 #include <StepBasic_DocumentProductAssociation.hxx>
 #include <StepBasic_DocumentProductEquivalence.hxx>
-#include <RWStepBasic_RWDocumentProductAssociation.hxx>
-#include <RWStepBasic_RWDocumentProductEquivalence.hxx>
+#include "../RWStepBasic/RWStepBasic_RWDocumentProductAssociation.pxx"
+#include "../RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.pxx"
 
 //  TR12J 04.06.2003 G&DT entities GKA 
 #include <StepShape_ShapeRepresentationWithParameters.hxx>
@@ -1277,101 +1277,101 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepRepr_CompositeShapeAspect.hxx>
 #include <StepRepr_DerivedShapeAspect.hxx>
 #include <StepRepr_Extension.hxx>
-#include <RWStepRepr_RWCompositeShapeAspect.hxx>
-#include <RWStepRepr_RWDerivedShapeAspect.hxx>
-#include <RWStepRepr_RWExtension.hxx>
-#include <RWStepShape_RWShapeRepresentationWithParameters.hxx>
-#include <RWStepDimTol_RWAngularityTolerance.hxx>
-#include <RWStepDimTol_RWConcentricityTolerance.hxx>
-#include <RWStepDimTol_RWCircularRunoutTolerance.hxx>
-#include <RWStepDimTol_RWCoaxialityTolerance.hxx>
-#include <RWStepDimTol_RWCylindricityTolerance.hxx>
-#include <RWStepDimTol_RWFlatnessTolerance.hxx>
-#include <RWStepDimTol_RWLineProfileTolerance.hxx>
-#include <RWStepDimTol_RWParallelismTolerance.hxx>
-#include <RWStepDimTol_RWPerpendicularityTolerance.hxx>
-#include <RWStepDimTol_RWPositionTolerance.hxx>
-#include <RWStepDimTol_RWRoundnessTolerance.hxx>
-#include <RWStepDimTol_RWStraightnessTolerance.hxx>
-#include <RWStepDimTol_RWSurfaceProfileTolerance.hxx>
-#include <RWStepDimTol_RWSymmetryTolerance.hxx>
-#include <RWStepDimTol_RWTotalRunoutTolerance.hxx>
-#include <RWStepDimTol_RWGeometricTolerance.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx>
-#include <RWStepDimTol_RWModifiedGeometricTolerance.hxx>
-#include <RWStepDimTol_RWDatum.hxx>
-#include <RWStepDimTol_RWDatumFeature.hxx>
-#include <RWStepDimTol_RWDatumReference.hxx>
-#include <RWStepDimTol_RWCommonDatum.hxx>
-#include <RWStepDimTol_RWDatumTarget.hxx>
-#include <RWStepDimTol_RWPlacedDatumTargetFeature.hxx>
+#include "../RWStepRepr/RWStepRepr_RWCompositeShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWDerivedShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWExtension.pxx"
+#include "../RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWAngularityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWParallelismTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWPositionTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatum.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumFeature.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumReference.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWCommonDatum.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumTarget.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.pxx"
 #include <StepDimTol_GeometricToleranceRelationship.hxx>
-#include <RWStepDimTol_RWGeometricToleranceRelationship.hxx>
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.pxx"
 
 #include <StepRepr_ReprItemAndLengthMeasureWithUnit.hxx>
-#include <RWStepRepr_RWReprItemAndLengthMeasureWithUnit.hxx>
+#include "../RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.pxx"
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.pxx"
 
 // added by skl 10.02.2004 for TRJ13
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndMassUnit.hxx>
+#include "../RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.pxx"
 #include <StepBasic_MassMeasureWithUnit.hxx>
-#include <RWStepBasic_RWMassMeasureWithUnit.hxx>
+#include "../RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.pxx"
 
 // Added by ika for GD&T AP242
-#include <RWStepRepr_RWApex.hxx>
-#include <RWStepRepr_RWCentreOfSymmetry.hxx>
-#include <RWStepRepr_RWGeometricAlignment.hxx>
-#include <RWStepRepr_RWParallelOffset.hxx>
-#include <RWStepRepr_RWPerpendicularTo.hxx>
-#include <RWStepRepr_RWTangent.hxx>
-#include <RWStepAP242_RWGeometricItemSpecificUsage.hxx>
-#include <RWStepAP242_RWIdAttribute.hxx>
-#include <RWStepAP242_RWItemIdentifiedRepresentationUsage.hxx>
-#include <RWStepRepr_RWAllAroundShapeAspect.hxx>
-#include <RWStepRepr_RWBetweenShapeAspect.hxx>
-#include <RWStepRepr_RWCompositeGroupShapeAspect.hxx>
-#include <RWStepRepr_RWContinuosShapeAspect.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithDefinedUnit.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithModifiers.hxx>
-#include <RWStepDimTol_RWUnequallyDisposedGeometricTolerance.hxx>
-#include <RWStepDimTol_RWNonUniformZoneDefinition.hxx>
-#include <RWStepDimTol_RWProjectedZoneDefinition.hxx>
-#include <RWStepDimTol_RWRunoutZoneDefinition.hxx>
-#include <RWStepDimTol_RWRunoutZoneOrientation.hxx>
-#include <RWStepDimTol_RWToleranceZone.hxx>
-#include <RWStepDimTol_RWToleranceZoneDefinition.hxx>
-#include <RWStepDimTol_RWToleranceZoneForm.hxx>
-#include <RWStepShape_RWValueFormatTypeQualifier.hxx>
-#include <RWStepDimTol_RWDatumReferenceCompartment.hxx>
-#include <RWStepDimTol_RWDatumReferenceElement.hxx>
-#include <RWStepDimTol_RWDatumReferenceModifierWithValue.hxx>
-#include <RWStepDimTol_RWDatumSystem.hxx>
-#include <RWStepDimTol_RWGeneralDatumReference.hxx>
-#include <RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.hxx>
-#include <RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.hxx>
-#include <RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
-#include <RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
-#include <RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx>
-#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
-#include <RWStepRepr_RWIntegerRepresentationItem.hxx>
-#include <RWStepRepr_RWRealRepresentationItem.hxx>
-#include <RWStepRepr_RWValueRepresentationItem.hxx>
-#include <RWStepRepr_RWValueRepresentationItem.hxx>
-#include <RWStepAP242_RWDraughtingModelItemAssociation.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationPlane.hxx>
-#include <RWStepVisual_RWDraughtingCallout.hxx>
+#include "../RWStepRepr/RWStepRepr_RWApex.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCentreOfSymmetry.pxx"
+#include "../RWStepRepr/RWStepRepr_RWGeometricAlignment.pxx"
+#include "../RWStepRepr/RWStepRepr_RWParallelOffset.pxx"
+#include "../RWStepRepr/RWStepRepr_RWPerpendicularTo.pxx"
+#include "../RWStepRepr/RWStepRepr_RWTangent.pxx"
+#include "../RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.pxx"
+#include "../RWStepAP242/RWStepAP242_RWIdAttribute.pxx"
+#include "../RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.pxx"
+#include "../RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWBetweenShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.pxx"
+#include "../RWStepRepr/RWStepRepr_RWContinuosShapeAspect.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWToleranceZone.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.pxx"
+#include "../RWStepShape/RWStepShape_RWValueFormatTypeQualifier.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWDatumSystem.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.pxx"
+#include "../RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.pxx"
+#include "../RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.pxx"
+#include "../RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.pxx"
+#include "../RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRealRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWValueRepresentationItem.pxx"
+#include "../RWStepRepr/RWStepRepr_RWValueRepresentationItem.pxx"
+#include "../RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.pxx"
+#include "../RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationOccurrence.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationPlane.pxx"
+#include "../RWStepVisual/RWStepVisual_RWDraughtingCallout.pxx"
 
 #include <StepRepr_Apex.hxx>
 #include <StepRepr_CentreOfSymmetry.hxx>
@@ -1434,112 +1434,112 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepRepr_ConstructiveGeometryRepresentationRelationship.hxx>
 #include <StepRepr_MechanicalDesignAndDraughtingRelationship.hxx>
 
-#include <RWStepVisual_RWTessellatedAnnotationOccurrence.hxx>
-#include <RWStepVisual_RWTessellatedItem.hxx>
-#include <RWStepVisual_RWTessellatedGeometricSet.hxx>
-#include <RWStepVisual_RWTessellatedCurveSet.hxx>
-#include <RWStepVisual_RWCoordinatesList.hxx>
-#include <RWStepRepr_RWCharacterizedRepresentation.hxx>
-#include <RWStepRepr_RWConstructiveGeometryRepresentation.hxx>
-#include <RWStepRepr_RWConstructiveGeometryRepresentationRelationship.hxx>
+#include "../RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedItem.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWTessellatedCurveSet.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCoordinatesList.pxx"
+#include "../RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.pxx"
+#include "../RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.pxx"
 #include <StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx>
-#include <RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx>
+#include "../RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.pxx"
 #include <StepVisual_AnnotationFillArea.hxx>
 #include <StepVisual_AnnotationFillAreaOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationFillArea.hxx>
-#include <RWStepVisual_RWAnnotationFillAreaOccurrence.hxx>
+#include "../RWStepVisual/RWStepVisual_RWAnnotationFillArea.pxx"
+#include "../RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.pxx"
 #include <StepVisual_CameraModelD3MultiClipping.hxx>
 #include <StepVisual_CameraModelD3MultiClippingIntersection.hxx>
 #include <StepVisual_CameraModelD3MultiClippingUnion.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClipping.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx>
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.pxx"
+#include "../RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.pxx"
 #include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx>
+#include "../RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.pxx"
 
-#include <RWStepVisual_RWSurfaceStyleTransparent.hxx>
-#include <RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx>
-#include <RWStepVisual_RWSurfaceStyleRendering.hxx>
-#include <RWStepVisual_RWSurfaceStyleRenderingWithProperties.hxx>
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.pxx"
+#include "../RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.pxx"
 
 // Added for kinematics implementation
-#include <RWStepGeom_RWSuParameters.hxx>
-#include <RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx>
-#include <RWStepKinematics_RWActuatedKinematicPair.hxx>
-#include <RWStepKinematics_RWContextDependentKinematicLinkRepresentation.hxx>
-#include <RWStepKinematics_RWCylindricalPair.hxx>
-#include <RWStepKinematics_RWCylindricalPairValue.hxx>
-#include <RWStepKinematics_RWCylindricalPairWithRange.hxx>
-#include <RWStepKinematics_RWFullyConstrainedPair.hxx>
-#include <RWStepKinematics_RWGearPair.hxx>
-#include <RWStepKinematics_RWGearPairValue.hxx>
-#include <RWStepKinematics_RWGearPairWithRange.hxx>
-#include <RWStepKinematics_RWHomokineticPair.hxx>
-#include <RWStepKinematics_RWKinematicJoint.hxx>
-#include <RWStepKinematics_RWKinematicLink.hxx>
-#include <RWStepKinematics_RWKinematicLinkRepresentationAssociation.hxx>
-#include <RWStepKinematics_RWKinematicPropertyMechanismRepresentation.hxx>
-#include <RWStepKinematics_RWKinematicTopologyDirectedStructure.hxx>
-#include <RWStepKinematics_RWKinematicTopologyNetworkStructure.hxx>
-#include <RWStepKinematics_RWKinematicTopologyStructure.hxx>
-#include <RWStepKinematics_RWLinearFlexibleAndPinionPair.hxx>
-#include <RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.hxx>
-#include <RWStepKinematics_RWLinearFlexibleLinkRepresentation.hxx>
-#include <RWStepKinematics_RWLowOrderKinematicPair.hxx>
-#include <RWStepKinematics_RWLowOrderKinematicPairValue.hxx>
-#include <RWStepKinematics_RWLowOrderKinematicPairWithRange.hxx>
-#include <RWStepKinematics_RWMechanismRepresentation.hxx>
-#include <RWStepKinematics_RWMechanismStateRepresentation.hxx>
-#include <RWStepKinematics_RWOrientedJoint.hxx>
-#include <RWStepKinematics_RWPairRepresentationRelationship.hxx>
-#include <RWStepKinematics_RWPlanarCurvePair.hxx>
-#include <RWStepKinematics_RWPlanarCurvePairRange.hxx>
-#include <RWStepKinematics_RWPlanarPair.hxx>
-#include <RWStepKinematics_RWPlanarPairValue.hxx>
-#include <RWStepKinematics_RWPlanarPairWithRange.hxx>
-#include <RWStepKinematics_RWPointOnPlanarCurvePair.hxx>
-#include <RWStepKinematics_RWPointOnPlanarCurvePairValue.hxx>
-#include <RWStepKinematics_RWPointOnPlanarCurvePairWithRange.hxx>
-#include <RWStepKinematics_RWPointOnSurfacePair.hxx>
-#include <RWStepKinematics_RWPointOnSurfacePairValue.hxx>
-#include <RWStepKinematics_RWPointOnSurfacePairWithRange.hxx>
-#include <RWStepKinematics_RWPrismaticPair.hxx>
-#include <RWStepKinematics_RWPrismaticPairValue.hxx>
-#include <RWStepKinematics_RWPrismaticPairWithRange.hxx>
-#include <RWStepKinematics_RWProductDefinitionKinematics.hxx>
-#include <RWStepKinematics_RWProductDefinitionRelationshipKinematics.hxx>
-#include <RWStepKinematics_RWRackAndPinionPair.hxx>
-#include <RWStepKinematics_RWRackAndPinionPairValue.hxx>
-#include <RWStepKinematics_RWRackAndPinionPairWithRange.hxx>
-#include <RWStepKinematics_RWRevolutePair.hxx>
-#include <RWStepKinematics_RWRevolutePairValue.hxx>
-#include <RWStepKinematics_RWRevolutePairWithRange.hxx>
-#include <RWStepKinematics_RWRigidLinkRepresentation.hxx>
-#include <RWStepKinematics_RWRollingCurvePair.hxx>
-#include <RWStepKinematics_RWRollingCurvePairValue.hxx>
-#include <RWStepKinematics_RWRollingSurfacePair.hxx>
-#include <RWStepKinematics_RWRollingSurfacePairValue.hxx>
-#include <RWStepKinematics_RWRotationAboutDirection.hxx>
-#include <RWStepKinematics_RWScrewPair.hxx>
-#include <RWStepKinematics_RWScrewPairValue.hxx>
-#include <RWStepKinematics_RWScrewPairWithRange.hxx>
-#include <RWStepKinematics_RWSlidingCurvePair.hxx>
-#include <RWStepKinematics_RWSlidingCurvePairValue.hxx>
-#include <RWStepKinematics_RWSlidingSurfacePair.hxx>
-#include <RWStepKinematics_RWSlidingSurfacePairValue.hxx>
-#include <RWStepKinematics_RWSphericalPair.hxx>
-#include <RWStepKinematics_RWSphericalPairValue.hxx>
-#include <RWStepKinematics_RWSphericalPairWithPin.hxx>
-#include <RWStepKinematics_RWSphericalPairWithPinAndRange.hxx>
-#include <RWStepKinematics_RWSphericalPairWithRange.hxx>
-#include <RWStepKinematics_RWSurfacePairWithRange.hxx>
-#include <RWStepKinematics_RWUnconstrainedPair.hxx>
-#include <RWStepKinematics_RWUnconstrainedPairValue.hxx>
-#include <RWStepKinematics_RWUniversalPair.hxx>
-#include <RWStepKinematics_RWUniversalPairValue.hxx>
-#include <RWStepKinematics_RWUniversalPairWithRange.hxx>
-#include <RWStepRepr_RWRepresentationContextReference.hxx>
-#include <RWStepRepr_RWRepresentationReference.hxx>
+#include "../RWStepGeom/RWStepGeom_RWSuParameters.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWCylindricalPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWGearPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWGearPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWGearPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWHomokineticPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicJoint.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicLink.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWOrientedJoint.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPrismaticPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRevolutePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRevolutePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWScrewPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWScrewPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUniversalPair.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUniversalPairValue.pxx"
+#include "../RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationContextReference.pxx"
+#include "../RWStepRepr/RWStepRepr_RWRepresentationReference.pxx"
 
 #include <StepGeom_SuParameters.hxx>
 #include <StepKinematics_ActuatedKinPairAndOrderKinPair.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.pxx
similarity index 83%
rename from src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx
rename to src/RWStepAP214/RWStepAP214_ReadWriteModule.pxx
index 7c3399a5b2..1375083e54 100644
--- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx
+++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.pxx
@@ -39,28 +39,28 @@ class RWStepAP214_ReadWriteModule : public StepData_ReadWriteModule
 public:
 
   
-  Standard_EXPORT RWStepAP214_ReadWriteModule();
+  Standard_HIDDEN RWStepAP214_ReadWriteModule();
   
   //! associates a positive Case Number to each type of StepAP214 entity,
   //! given as a String defined in the EXPRESS form
-  Standard_EXPORT Standard_Integer CaseStep (const TCollection_AsciiString& atype) const Standard_OVERRIDE;
+  Standard_HIDDEN Standard_Integer CaseStep (const TCollection_AsciiString& atype) const Standard_OVERRIDE;
   
   //! associates a positive Case Number to each type of StepAP214 Complex entity,
   //! given as a String defined in the EXPRESS form
-  Standard_EXPORT virtual Standard_Integer CaseStep (const TColStd_SequenceOfAsciiString& types) const Standard_OVERRIDE;
+  Standard_HIDDEN virtual Standard_Integer CaseStep (const TColStd_SequenceOfAsciiString& types) const Standard_OVERRIDE;
   
   //! returns True if the Case Number corresponds to a Complex Type
-  Standard_EXPORT virtual Standard_Boolean IsComplex (const Standard_Integer CN) const Standard_OVERRIDE;
+  Standard_HIDDEN virtual Standard_Boolean IsComplex (const Standard_Integer CN) const Standard_OVERRIDE;
   
   //! returns a StepType (defined in EXPRESS form which belongs to a
   //! Type of Entity, identified by its CaseNumber determined by Protocol
-  Standard_EXPORT const TCollection_AsciiString& StepType (const Standard_Integer CN) const Standard_OVERRIDE;
+  Standard_HIDDEN const TCollection_AsciiString& StepType (const Standard_Integer CN) const Standard_OVERRIDE;
   
-  Standard_EXPORT virtual Standard_Boolean ComplexType (const Standard_Integer CN, TColStd_SequenceOfAsciiString& types) const Standard_OVERRIDE;
+  Standard_HIDDEN virtual Standard_Boolean ComplexType (const Standard_Integer CN, TColStd_SequenceOfAsciiString& types) const Standard_OVERRIDE;
   
-  Standard_EXPORT void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE;
+  Standard_HIDDEN void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE;
   
-  Standard_EXPORT void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE;
+  Standard_HIDDEN void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE;
 
 
 
diff --git a/src/RWStepAP242/FILES b/src/RWStepAP242/FILES
index f1d2344738..61e3ade68b 100644
--- a/src/RWStepAP242/FILES
+++ b/src/RWStepAP242/FILES
@@ -1,8 +1,8 @@
 RWStepAP242_RWDraughtingModelItemAssociation.cxx
-RWStepAP242_RWDraughtingModelItemAssociation.hxx
+RWStepAP242_RWDraughtingModelItemAssociation.pxx
 RWStepAP242_RWGeometricItemSpecificUsage.cxx
-RWStepAP242_RWGeometricItemSpecificUsage.hxx
+RWStepAP242_RWGeometricItemSpecificUsage.pxx
 RWStepAP242_RWIdAttribute.cxx
-RWStepAP242_RWIdAttribute.hxx
+RWStepAP242_RWIdAttribute.pxx
 RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx
-RWStepAP242_RWItemIdentifiedRepresentationUsage.hxx
+RWStepAP242_RWItemIdentifiedRepresentationUsage.pxx
diff --git a/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.cxx b/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.cxx
index a1600f3a58..630d8c52c5 100644
--- a/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.cxx
+++ b/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepAP242_RWDraughtingModelItemAssociation.hxx>
+#include "RWStepAP242_RWDraughtingModelItemAssociation.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.hxx b/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.pxx
similarity index 86%
rename from src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.hxx
rename to src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.pxx
index ecf710ae63..2395eae10a 100644
--- a/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.hxx
+++ b/src/RWStepAP242/RWStepAP242_RWDraughtingModelItemAssociation.pxx
@@ -35,12 +35,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepAP242_RWDraughtingModelItemAssociation();
+  Standard_HIDDEN RWStepAP242_RWDraughtingModelItemAssociation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_DraughtingModelItemAssociation)& ent)  const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_DraughtingModelItemAssociation)& ent)  const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_DraughtingModelItemAssociation)& ent)  const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_DraughtingModelItemAssociation)& ent)  const;
   
-  Standard_EXPORT void Share (const Handle(StepAP242_DraughtingModelItemAssociation)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN void Share (const Handle(StepAP242_DraughtingModelItemAssociation)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepAP242_RWDraughtingModelItemAssociation_HeaderFile
diff --git a/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx b/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx
index be4e8819ab..fc9b220027 100644
--- a/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx
+++ b/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepAP242_RWGeometricItemSpecificUsage.hxx>
+#include "RWStepAP242_RWGeometricItemSpecificUsage.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.hxx b/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.pxx
similarity index 86%
rename from src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.hxx
rename to src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.pxx
index 20f2958d57..f66e9f5403 100644
--- a/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.hxx
+++ b/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.pxx
@@ -37,12 +37,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP242_RWGeometricItemSpecificUsage();
+  Standard_HIDDEN RWStepAP242_RWGeometricItemSpecificUsage();
   
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_GeometricItemSpecificUsage)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_GeometricItemSpecificUsage)& ent)  const;
   
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_GeometricItemSpecificUsage)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_GeometricItemSpecificUsage)& ent)  const;
   
-  Standard_EXPORT   void Share (const Handle(StepAP242_GeometricItemSpecificUsage)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepAP242_GeometricItemSpecificUsage)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepAP242_RWGeometricItemSpecificUsage_HeaderFile
diff --git a/src/RWStepAP242/RWStepAP242_RWIdAttribute.cxx b/src/RWStepAP242/RWStepAP242_RWIdAttribute.cxx
index d18eba4456..0c4b3c4baf 100644
--- a/src/RWStepAP242/RWStepAP242_RWIdAttribute.cxx
+++ b/src/RWStepAP242/RWStepAP242_RWIdAttribute.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepAP242_RWIdAttribute.hxx>
+#include "RWStepAP242_RWIdAttribute.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepAP242/RWStepAP242_RWIdAttribute.hxx b/src/RWStepAP242/RWStepAP242_RWIdAttribute.pxx
similarity index 85%
rename from src/RWStepAP242/RWStepAP242_RWIdAttribute.hxx
rename to src/RWStepAP242/RWStepAP242_RWIdAttribute.pxx
index e709451f4c..2c261d898e 100644
--- a/src/RWStepAP242/RWStepAP242_RWIdAttribute.hxx
+++ b/src/RWStepAP242/RWStepAP242_RWIdAttribute.pxx
@@ -37,12 +37,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP242_RWIdAttribute();
+  Standard_HIDDEN RWStepAP242_RWIdAttribute();
   
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_IdAttribute)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_IdAttribute)& ent)  const;
   
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_IdAttribute)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_IdAttribute)& ent)  const;
   
-  Standard_EXPORT   void Share (const Handle(StepAP242_IdAttribute)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepAP242_IdAttribute)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepAP242_RWIdAttribute_HeaderFile
diff --git a/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx b/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx
index a4065e0f1f..aacb838053 100644
--- a/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx
+++ b/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepAP242_RWItemIdentifiedRepresentationUsage.hxx>
+#include "RWStepAP242_RWItemIdentifiedRepresentationUsage.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.hxx b/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.pxx
similarity index 86%
rename from src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.hxx
rename to src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.pxx
index 202b869bea..1b0d4726a4 100644
--- a/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.hxx
+++ b/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.pxx
@@ -37,12 +37,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepAP242_RWItemIdentifiedRepresentationUsage();
+  Standard_HIDDEN RWStepAP242_RWItemIdentifiedRepresentationUsage();
   
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_ItemIdentifiedRepresentationUsage)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepAP242_ItemIdentifiedRepresentationUsage)& ent)  const;
   
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_ItemIdentifiedRepresentationUsage)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepAP242_ItemIdentifiedRepresentationUsage)& ent)  const;
   
-  Standard_EXPORT   void Share (const Handle(StepAP242_ItemIdentifiedRepresentationUsage)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepAP242_ItemIdentifiedRepresentationUsage)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepAP242_RWItemIdentifiedRepresentationUsage_HeaderFile
diff --git a/src/RWStepBasic/FILES b/src/RWStepBasic/FILES
index d7f99e138e..2fba769ffb 100644
--- a/src/RWStepBasic/FILES
+++ b/src/RWStepBasic/FILES
@@ -1,238 +1,238 @@
 RWStepBasic_RWAction.cxx
-RWStepBasic_RWAction.hxx
+RWStepBasic_RWAction.pxx
 RWStepBasic_RWActionAssignment.cxx
-RWStepBasic_RWActionAssignment.hxx
+RWStepBasic_RWActionAssignment.pxx
 RWStepBasic_RWActionMethod.cxx
-RWStepBasic_RWActionMethod.hxx
+RWStepBasic_RWActionMethod.pxx
 RWStepBasic_RWActionRequestAssignment.cxx
-RWStepBasic_RWActionRequestAssignment.hxx
+RWStepBasic_RWActionRequestAssignment.pxx
 RWStepBasic_RWActionRequestSolution.cxx
-RWStepBasic_RWActionRequestSolution.hxx
+RWStepBasic_RWActionRequestSolution.pxx
 RWStepBasic_RWAddress.cxx
-RWStepBasic_RWAddress.hxx
+RWStepBasic_RWAddress.pxx
 RWStepBasic_RWApplicationContext.cxx
-RWStepBasic_RWApplicationContext.hxx
+RWStepBasic_RWApplicationContext.pxx
 RWStepBasic_RWApplicationContextElement.cxx
-RWStepBasic_RWApplicationContextElement.hxx
+RWStepBasic_RWApplicationContextElement.pxx
 RWStepBasic_RWApplicationProtocolDefinition.cxx
-RWStepBasic_RWApplicationProtocolDefinition.hxx
+RWStepBasic_RWApplicationProtocolDefinition.pxx
 RWStepBasic_RWApproval.cxx
-RWStepBasic_RWApproval.hxx
+RWStepBasic_RWApproval.pxx
 RWStepBasic_RWApprovalDateTime.cxx
-RWStepBasic_RWApprovalDateTime.hxx
+RWStepBasic_RWApprovalDateTime.pxx
 RWStepBasic_RWApprovalPersonOrganization.cxx
-RWStepBasic_RWApprovalPersonOrganization.hxx
+RWStepBasic_RWApprovalPersonOrganization.pxx
 RWStepBasic_RWApprovalRelationship.cxx
-RWStepBasic_RWApprovalRelationship.hxx
+RWStepBasic_RWApprovalRelationship.pxx
 RWStepBasic_RWApprovalRole.cxx
-RWStepBasic_RWApprovalRole.hxx
+RWStepBasic_RWApprovalRole.pxx
 RWStepBasic_RWApprovalStatus.cxx
-RWStepBasic_RWApprovalStatus.hxx
+RWStepBasic_RWApprovalStatus.pxx
 RWStepBasic_RWCalendarDate.cxx
-RWStepBasic_RWCalendarDate.hxx
+RWStepBasic_RWCalendarDate.pxx
 RWStepBasic_RWCertification.cxx
-RWStepBasic_RWCertification.hxx
+RWStepBasic_RWCertification.pxx
 RWStepBasic_RWCertificationAssignment.cxx
-RWStepBasic_RWCertificationAssignment.hxx
+RWStepBasic_RWCertificationAssignment.pxx
 RWStepBasic_RWCertificationType.cxx
-RWStepBasic_RWCertificationType.hxx
+RWStepBasic_RWCertificationType.pxx
 RWStepBasic_RWCharacterizedObject.cxx
-RWStepBasic_RWCharacterizedObject.hxx
+RWStepBasic_RWCharacterizedObject.pxx
 RWStepBasic_RWContract.cxx
-RWStepBasic_RWContract.hxx
+RWStepBasic_RWContract.pxx
 RWStepBasic_RWContractAssignment.cxx
-RWStepBasic_RWContractAssignment.hxx
+RWStepBasic_RWContractAssignment.pxx
 RWStepBasic_RWContractType.cxx
-RWStepBasic_RWContractType.hxx
+RWStepBasic_RWContractType.pxx
 RWStepBasic_RWConversionBasedUnit.cxx
-RWStepBasic_RWConversionBasedUnit.hxx
+RWStepBasic_RWConversionBasedUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndAreaUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndLengthUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndLengthUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndMassUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndMassUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndRatioUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndTimeUnit.pxx
 RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx
-RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx
+RWStepBasic_RWConversionBasedUnitAndVolumeUnit.pxx
 RWStepBasic_RWCoordinatedUniversalTimeOffset.cxx
-RWStepBasic_RWCoordinatedUniversalTimeOffset.hxx
+RWStepBasic_RWCoordinatedUniversalTimeOffset.pxx
 RWStepBasic_RWDate.cxx
-RWStepBasic_RWDate.hxx
+RWStepBasic_RWDate.pxx
 RWStepBasic_RWDateAndTime.cxx
-RWStepBasic_RWDateAndTime.hxx
+RWStepBasic_RWDateAndTime.pxx
 RWStepBasic_RWDateRole.cxx
-RWStepBasic_RWDateRole.hxx
+RWStepBasic_RWDateRole.pxx
 RWStepBasic_RWDateTimeRole.cxx
-RWStepBasic_RWDateTimeRole.hxx
+RWStepBasic_RWDateTimeRole.pxx
 RWStepBasic_RWDerivedUnit.cxx
-RWStepBasic_RWDerivedUnit.hxx
+RWStepBasic_RWDerivedUnit.pxx
 RWStepBasic_RWDerivedUnitElement.cxx
-RWStepBasic_RWDerivedUnitElement.hxx
+RWStepBasic_RWDerivedUnitElement.pxx
 RWStepBasic_RWDimensionalExponents.cxx
-RWStepBasic_RWDimensionalExponents.hxx
+RWStepBasic_RWDimensionalExponents.pxx
 RWStepBasic_RWDocument.cxx
-RWStepBasic_RWDocument.hxx
+RWStepBasic_RWDocument.pxx
 RWStepBasic_RWDocumentFile.cxx
-RWStepBasic_RWDocumentFile.hxx
+RWStepBasic_RWDocumentFile.pxx
 RWStepBasic_RWDocumentProductAssociation.cxx
-RWStepBasic_RWDocumentProductAssociation.hxx
+RWStepBasic_RWDocumentProductAssociation.pxx
 RWStepBasic_RWDocumentProductEquivalence.cxx
-RWStepBasic_RWDocumentProductEquivalence.hxx
+RWStepBasic_RWDocumentProductEquivalence.pxx
 RWStepBasic_RWDocumentRelationship.cxx
-RWStepBasic_RWDocumentRelationship.hxx
+RWStepBasic_RWDocumentRelationship.pxx
 RWStepBasic_RWDocumentRepresentationType.cxx
-RWStepBasic_RWDocumentRepresentationType.hxx
+RWStepBasic_RWDocumentRepresentationType.pxx
 RWStepBasic_RWDocumentType.cxx
-RWStepBasic_RWDocumentType.hxx
+RWStepBasic_RWDocumentType.pxx
 RWStepBasic_RWDocumentUsageConstraint.cxx
-RWStepBasic_RWDocumentUsageConstraint.hxx
+RWStepBasic_RWDocumentUsageConstraint.pxx
 RWStepBasic_RWEffectivity.cxx
-RWStepBasic_RWEffectivity.hxx
+RWStepBasic_RWEffectivity.pxx
 RWStepBasic_RWEffectivityAssignment.cxx
-RWStepBasic_RWEffectivityAssignment.hxx
+RWStepBasic_RWEffectivityAssignment.pxx
 RWStepBasic_RWEulerAngles.cxx
-RWStepBasic_RWEulerAngles.hxx
+RWStepBasic_RWEulerAngles.pxx
 RWStepBasic_RWExternalIdentificationAssignment.cxx
-RWStepBasic_RWExternalIdentificationAssignment.hxx
+RWStepBasic_RWExternalIdentificationAssignment.pxx
 RWStepBasic_RWExternallyDefinedItem.cxx
-RWStepBasic_RWExternallyDefinedItem.hxx
+RWStepBasic_RWExternallyDefinedItem.pxx
 RWStepBasic_RWExternalSource.cxx
-RWStepBasic_RWExternalSource.hxx
+RWStepBasic_RWExternalSource.pxx
 RWStepBasic_RWGeneralProperty.cxx
-RWStepBasic_RWGeneralProperty.hxx
+RWStepBasic_RWGeneralProperty.pxx
 RWStepBasic_RWGeneralPropertyAssociation.cxx
-RWStepBasic_RWGeneralPropertyAssociation.hxx
+RWStepBasic_RWGeneralPropertyAssociation.pxx
 RWStepBasic_RWGeneralPropertyRelationship.cxx
-RWStepBasic_RWGeneralPropertyRelationship.hxx
+RWStepBasic_RWGeneralPropertyRelationship.pxx
 RWStepBasic_RWGroup.cxx
-RWStepBasic_RWGroup.hxx
+RWStepBasic_RWGroup.pxx
 RWStepBasic_RWGroupAssignment.cxx
-RWStepBasic_RWGroupAssignment.hxx
+RWStepBasic_RWGroupAssignment.pxx
 RWStepBasic_RWGroupRelationship.cxx
-RWStepBasic_RWGroupRelationship.hxx
+RWStepBasic_RWGroupRelationship.pxx
 RWStepBasic_RWIdentificationAssignment.cxx
-RWStepBasic_RWIdentificationAssignment.hxx
+RWStepBasic_RWIdentificationAssignment.pxx
 RWStepBasic_RWIdentificationRole.cxx
-RWStepBasic_RWIdentificationRole.hxx
+RWStepBasic_RWIdentificationRole.pxx
 RWStepBasic_RWLengthMeasureWithUnit.cxx
-RWStepBasic_RWLengthMeasureWithUnit.hxx
+RWStepBasic_RWLengthMeasureWithUnit.pxx
 RWStepBasic_RWLengthUnit.cxx
-RWStepBasic_RWLengthUnit.hxx
+RWStepBasic_RWLengthUnit.pxx
 RWStepBasic_RWLocalTime.cxx
-RWStepBasic_RWLocalTime.hxx
+RWStepBasic_RWLocalTime.pxx
 RWStepBasic_RWMassMeasureWithUnit.cxx
-RWStepBasic_RWMassMeasureWithUnit.hxx
+RWStepBasic_RWMassMeasureWithUnit.pxx
 RWStepBasic_RWMassUnit.cxx
-RWStepBasic_RWMassUnit.hxx
+RWStepBasic_RWMassUnit.pxx
 RWStepBasic_RWMeasureWithUnit.cxx
-RWStepBasic_RWMeasureWithUnit.hxx
+RWStepBasic_RWMeasureWithUnit.pxx
 RWStepBasic_RWMechanicalContext.cxx
-RWStepBasic_RWMechanicalContext.hxx
+RWStepBasic_RWMechanicalContext.pxx
 RWStepBasic_RWNameAssignment.cxx
-RWStepBasic_RWNameAssignment.hxx
+RWStepBasic_RWNameAssignment.pxx
 RWStepBasic_RWNamedUnit.cxx
-RWStepBasic_RWNamedUnit.hxx
+RWStepBasic_RWNamedUnit.pxx
 RWStepBasic_RWObjectRole.cxx
-RWStepBasic_RWObjectRole.hxx
+RWStepBasic_RWObjectRole.pxx
 RWStepBasic_RWOrdinalDate.cxx
-RWStepBasic_RWOrdinalDate.hxx
+RWStepBasic_RWOrdinalDate.pxx
 RWStepBasic_RWOrganization.cxx
-RWStepBasic_RWOrganization.hxx
+RWStepBasic_RWOrganization.pxx
 RWStepBasic_RWOrganizationalAddress.cxx
-RWStepBasic_RWOrganizationalAddress.hxx
+RWStepBasic_RWOrganizationalAddress.pxx
 RWStepBasic_RWOrganizationRole.cxx
-RWStepBasic_RWOrganizationRole.hxx
+RWStepBasic_RWOrganizationRole.pxx
 RWStepBasic_RWPerson.cxx
-RWStepBasic_RWPerson.hxx
+RWStepBasic_RWPerson.pxx
 RWStepBasic_RWPersonalAddress.cxx
-RWStepBasic_RWPersonalAddress.hxx
+RWStepBasic_RWPersonalAddress.pxx
 RWStepBasic_RWPersonAndOrganization.cxx
-RWStepBasic_RWPersonAndOrganization.hxx
+RWStepBasic_RWPersonAndOrganization.pxx
 RWStepBasic_RWPersonAndOrganizationRole.cxx
-RWStepBasic_RWPersonAndOrganizationRole.hxx
+RWStepBasic_RWPersonAndOrganizationRole.pxx
 RWStepBasic_RWPlaneAngleMeasureWithUnit.cxx
-RWStepBasic_RWPlaneAngleMeasureWithUnit.hxx
+RWStepBasic_RWPlaneAngleMeasureWithUnit.pxx
 RWStepBasic_RWPlaneAngleUnit.cxx
-RWStepBasic_RWPlaneAngleUnit.hxx
+RWStepBasic_RWPlaneAngleUnit.pxx
 RWStepBasic_RWProduct.cxx
-RWStepBasic_RWProduct.hxx
+RWStepBasic_RWProduct.pxx
 RWStepBasic_RWProductCategory.cxx
-RWStepBasic_RWProductCategory.hxx
+RWStepBasic_RWProductCategory.pxx
 RWStepBasic_RWProductCategoryRelationship.cxx
-RWStepBasic_RWProductCategoryRelationship.hxx
+RWStepBasic_RWProductCategoryRelationship.pxx
 RWStepBasic_RWProductConceptContext.cxx
-RWStepBasic_RWProductConceptContext.hxx
+RWStepBasic_RWProductConceptContext.pxx
 RWStepBasic_RWProductContext.cxx
-RWStepBasic_RWProductContext.hxx
+RWStepBasic_RWProductContext.pxx
 RWStepBasic_RWProductDefinition.cxx
-RWStepBasic_RWProductDefinition.hxx
+RWStepBasic_RWProductDefinition.pxx
 RWStepBasic_RWProductDefinitionContext.cxx
-RWStepBasic_RWProductDefinitionContext.hxx
+RWStepBasic_RWProductDefinitionContext.pxx
 RWStepBasic_RWProductDefinitionEffectivity.cxx
-RWStepBasic_RWProductDefinitionEffectivity.hxx
+RWStepBasic_RWProductDefinitionEffectivity.pxx
 RWStepBasic_RWProductDefinitionFormation.cxx
-RWStepBasic_RWProductDefinitionFormation.hxx
+RWStepBasic_RWProductDefinitionFormation.pxx
 RWStepBasic_RWProductDefinitionFormationRelationship.cxx
-RWStepBasic_RWProductDefinitionFormationRelationship.hxx
+RWStepBasic_RWProductDefinitionFormationRelationship.pxx
 RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cxx
-RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.hxx
+RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.pxx
 RWStepBasic_RWProductDefinitionReference.cxx
-RWStepBasic_RWProductDefinitionReference.hxx
+RWStepBasic_RWProductDefinitionReference.pxx
 RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.cxx
-RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.hxx
+RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.pxx
 RWStepBasic_RWProductDefinitionRelationship.cxx
-RWStepBasic_RWProductDefinitionRelationship.hxx
+RWStepBasic_RWProductDefinitionRelationship.pxx
 RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cxx
-RWStepBasic_RWProductDefinitionWithAssociatedDocuments.hxx
+RWStepBasic_RWProductDefinitionWithAssociatedDocuments.pxx
 RWStepBasic_RWProductRelatedProductCategory.cxx
-RWStepBasic_RWProductRelatedProductCategory.hxx
+RWStepBasic_RWProductRelatedProductCategory.pxx
 RWStepBasic_RWProductType.cxx
-RWStepBasic_RWProductType.hxx
+RWStepBasic_RWProductType.pxx
 RWStepBasic_RWRatioMeasureWithUnit.cxx
-RWStepBasic_RWRatioMeasureWithUnit.hxx
+RWStepBasic_RWRatioMeasureWithUnit.pxx
 RWStepBasic_RWRoleAssociation.cxx
-RWStepBasic_RWRoleAssociation.hxx
+RWStepBasic_RWRoleAssociation.pxx
 RWStepBasic_RWSecurityClassification.cxx
-RWStepBasic_RWSecurityClassification.hxx
+RWStepBasic_RWSecurityClassification.pxx
 RWStepBasic_RWSecurityClassificationLevel.cxx
-RWStepBasic_RWSecurityClassificationLevel.hxx
+RWStepBasic_RWSecurityClassificationLevel.pxx
 RWStepBasic_RWSiUnit.cxx
-RWStepBasic_RWSiUnit.hxx
+RWStepBasic_RWSiUnit.pxx
 RWStepBasic_RWSiUnitAndAreaUnit.cxx
-RWStepBasic_RWSiUnitAndAreaUnit.hxx
+RWStepBasic_RWSiUnitAndAreaUnit.pxx
 RWStepBasic_RWSiUnitAndLengthUnit.cxx
-RWStepBasic_RWSiUnitAndLengthUnit.hxx
+RWStepBasic_RWSiUnitAndLengthUnit.pxx
 RWStepBasic_RWSiUnitAndMassUnit.cxx
-RWStepBasic_RWSiUnitAndMassUnit.hxx
+RWStepBasic_RWSiUnitAndMassUnit.pxx
 RWStepBasic_RWSiUnitAndPlaneAngleUnit.cxx
-RWStepBasic_RWSiUnitAndPlaneAngleUnit.hxx
+RWStepBasic_RWSiUnitAndPlaneAngleUnit.pxx
 RWStepBasic_RWSiUnitAndRatioUnit.cxx
-RWStepBasic_RWSiUnitAndRatioUnit.hxx
+RWStepBasic_RWSiUnitAndRatioUnit.pxx
 RWStepBasic_RWSiUnitAndSolidAngleUnit.cxx
-RWStepBasic_RWSiUnitAndSolidAngleUnit.hxx
+RWStepBasic_RWSiUnitAndSolidAngleUnit.pxx
 RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cxx
-RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.hxx
+RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.pxx
 RWStepBasic_RWSiUnitAndTimeUnit.cxx
-RWStepBasic_RWSiUnitAndTimeUnit.hxx
+RWStepBasic_RWSiUnitAndTimeUnit.pxx
 RWStepBasic_RWSiUnitAndVolumeUnit.cxx
-RWStepBasic_RWSiUnitAndVolumeUnit.hxx
+RWStepBasic_RWSiUnitAndVolumeUnit.pxx
 RWStepBasic_RWSolidAngleMeasureWithUnit.cxx
-RWStepBasic_RWSolidAngleMeasureWithUnit.hxx
+RWStepBasic_RWSolidAngleMeasureWithUnit.pxx
 RWStepBasic_RWSolidAngleUnit.cxx
-RWStepBasic_RWSolidAngleUnit.hxx
+RWStepBasic_RWSolidAngleUnit.pxx
 RWStepBasic_RWThermodynamicTemperatureUnit.cxx
-RWStepBasic_RWThermodynamicTemperatureUnit.hxx
+RWStepBasic_RWThermodynamicTemperatureUnit.pxx
 RWStepBasic_RWUncertaintyMeasureWithUnit.cxx
-RWStepBasic_RWUncertaintyMeasureWithUnit.hxx
+RWStepBasic_RWUncertaintyMeasureWithUnit.pxx
 RWStepBasic_RWVersionedActionRequest.cxx
-RWStepBasic_RWVersionedActionRequest.hxx
+RWStepBasic_RWVersionedActionRequest.pxx
 RWStepBasic_RWWeekOfYearAndDayDate.cxx
-RWStepBasic_RWWeekOfYearAndDayDate.hxx
+RWStepBasic_RWWeekOfYearAndDayDate.pxx
diff --git a/src/RWStepBasic/RWStepBasic_RWAction.cxx b/src/RWStepBasic/RWStepBasic_RWAction.cxx
index 8ea37f7c8a..7eba6bd425 100644
--- a/src/RWStepBasic/RWStepBasic_RWAction.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWAction.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWAction.hxx>
+#include "RWStepBasic_RWAction.pxx"
 #include <StepBasic_Action.hxx>
 #include <StepBasic_ActionMethod.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWAction.hxx b/src/RWStepBasic/RWStepBasic_RWAction.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWAction.hxx
rename to src/RWStepBasic/RWStepBasic_RWAction.pxx
index ab4cd3987a..36abe1c006 100644
--- a/src/RWStepBasic/RWStepBasic_RWAction.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWAction.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWAction();
+  Standard_HIDDEN RWStepBasic_RWAction();
   
   //! Reads Action
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Action)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Action)& ent) const;
   
   //! Writes Action
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Action)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Action)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_Action)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Action)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWActionAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWActionAssignment.cxx
index 2fa0f282a0..4301f381aa 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionAssignment.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWActionAssignment.hxx>
+#include "RWStepBasic_RWActionAssignment.pxx"
 #include <StepBasic_Action.hxx>
 #include <StepBasic_ActionAssignment.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWActionAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWActionAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWActionAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWActionAssignment.pxx
index 263887b36a..dd19418a58 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionAssignment.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWActionAssignment();
+  Standard_HIDDEN RWStepBasic_RWActionAssignment();
   
   //! Reads ActionAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionAssignment)& ent) const;
   
   //! Writes ActionAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ActionAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ActionAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWActionMethod.cxx b/src/RWStepBasic/RWStepBasic_RWActionMethod.cxx
index 4b294cfd63..feb02c3a2e 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionMethod.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionMethod.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWActionMethod.hxx>
+#include "RWStepBasic_RWActionMethod.pxx"
 #include <StepBasic_ActionMethod.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWActionMethod.hxx b/src/RWStepBasic/RWStepBasic_RWActionMethod.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWActionMethod.hxx
rename to src/RWStepBasic/RWStepBasic_RWActionMethod.pxx
index 8602604f2d..968ee635ba 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionMethod.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionMethod.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWActionMethod();
+  Standard_HIDDEN RWStepBasic_RWActionMethod();
   
   //! Reads ActionMethod
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionMethod)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionMethod)& ent) const;
   
   //! Writes ActionMethod
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionMethod)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionMethod)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ActionMethod)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ActionMethod)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.cxx
index e6f6af6d92..aaf7d2da66 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWActionRequestAssignment.hxx>
+#include "RWStepBasic_RWActionRequestAssignment.pxx"
 #include <StepBasic_ActionRequestAssignment.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.pxx
index 81b7641d9e..654a4890dc 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionRequestAssignment.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWActionRequestAssignment();
+  Standard_HIDDEN RWStepBasic_RWActionRequestAssignment();
   
   //! Reads ActionRequestAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionRequestAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionRequestAssignment)& ent) const;
   
   //! Writes ActionRequestAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionRequestAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionRequestAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ActionRequestAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ActionRequestAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.cxx b/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.cxx
index da252df7b1..8addbd651e 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWActionRequestSolution.hxx>
+#include "RWStepBasic_RWActionRequestSolution.pxx"
 #include <StepBasic_ActionMethod.hxx>
 #include <StepBasic_ActionRequestSolution.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.hxx b/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWActionRequestSolution.hxx
rename to src/RWStepBasic/RWStepBasic_RWActionRequestSolution.pxx
index 9585b03dc3..4272bcc207 100644
--- a/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWActionRequestSolution.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWActionRequestSolution();
+  Standard_HIDDEN RWStepBasic_RWActionRequestSolution();
   
   //! Reads ActionRequestSolution
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionRequestSolution)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ActionRequestSolution)& ent) const;
   
   //! Writes ActionRequestSolution
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionRequestSolution)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ActionRequestSolution)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ActionRequestSolution)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ActionRequestSolution)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWAddress.cxx b/src/RWStepBasic/RWStepBasic_RWAddress.cxx
index e3e0a0981f..20afd64533 100644
--- a/src/RWStepBasic/RWStepBasic_RWAddress.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWAddress.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWAddress.hxx>
+#include "RWStepBasic_RWAddress.pxx"
 #include <StepBasic_Address.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWAddress.hxx b/src/RWStepBasic/RWStepBasic_RWAddress.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWAddress.hxx
rename to src/RWStepBasic/RWStepBasic_RWAddress.pxx
index f4e1881420..6faf470360 100644
--- a/src/RWStepBasic/RWStepBasic_RWAddress.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWAddress.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWAddress();
+  Standard_HIDDEN RWStepBasic_RWAddress();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Address)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Address)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Address)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Address)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContext.cxx b/src/RWStepBasic/RWStepBasic_RWApplicationContext.cxx
index 0a4432e586..7ecd7cf832 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationContext.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationContext.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWApplicationContext.hxx>
+#include "RWStepBasic_RWApplicationContext.pxx"
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContext.hxx b/src/RWStepBasic/RWStepBasic_RWApplicationContext.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWApplicationContext.hxx
rename to src/RWStepBasic/RWStepBasic_RWApplicationContext.pxx
index 1794de9b9f..0b944f638d 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationContext.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationContext.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApplicationContext();
+  Standard_HIDDEN RWStepBasic_RWApplicationContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApplicationContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApplicationContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApplicationContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApplicationContext)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx
index fb0cfe455b..883f25f23e 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWApplicationContextElement.hxx>
+#include "RWStepBasic_RWApplicationContextElement.pxx"
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ApplicationContextElement.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.hxx b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWApplicationContextElement.hxx
rename to src/RWStepBasic/RWStepBasic_RWApplicationContextElement.pxx
index 418faf7cb7..8a5166436d 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApplicationContextElement();
+  Standard_HIDDEN RWStepBasic_RWApplicationContextElement();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApplicationContextElement)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApplicationContextElement)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApplicationContextElement)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApplicationContextElement)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ApplicationContextElement)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ApplicationContextElement)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cxx b/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cxx
index 839d09b920..46b234e781 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWApplicationProtocolDefinition.hxx>
+#include "RWStepBasic_RWApplicationProtocolDefinition.pxx"
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ApplicationProtocolDefinition.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.hxx b/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.hxx
rename to src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.pxx
index a84c171a2e..f4fc1619c1 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApplicationProtocolDefinition();
+  Standard_HIDDEN RWStepBasic_RWApplicationProtocolDefinition();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApplicationProtocolDefinition)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApplicationProtocolDefinition)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApplicationProtocolDefinition)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApplicationProtocolDefinition)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ApplicationProtocolDefinition)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ApplicationProtocolDefinition)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApproval.cxx b/src/RWStepBasic/RWStepBasic_RWApproval.cxx
index 4e9552a289..8a7e23619e 100644
--- a/src/RWStepBasic/RWStepBasic_RWApproval.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApproval.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWApproval.hxx>
+#include "RWStepBasic_RWApproval.pxx"
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalStatus.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApproval.hxx b/src/RWStepBasic/RWStepBasic_RWApproval.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWApproval.hxx
rename to src/RWStepBasic/RWStepBasic_RWApproval.pxx
index 756606adbc..0a4bdbb451 100644
--- a/src/RWStepBasic/RWStepBasic_RWApproval.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApproval.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApproval();
+  Standard_HIDDEN RWStepBasic_RWApproval();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Approval)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Approval)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Approval)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Approval)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_Approval)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Approval)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cxx b/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cxx
index ed104eb670..feb169b816 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWApprovalDateTime.hxx>
+#include "RWStepBasic_RWApprovalDateTime.pxx"
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalDateTime.hxx>
 #include <StepBasic_DateTimeSelect.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.hxx b/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWApprovalDateTime.hxx
rename to src/RWStepBasic/RWStepBasic_RWApprovalDateTime.pxx
index 48b7bad950..2440364fac 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApprovalDateTime();
+  Standard_HIDDEN RWStepBasic_RWApprovalDateTime();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalDateTime)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalDateTime)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalDateTime)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalDateTime)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ApprovalDateTime)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ApprovalDateTime)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cxx b/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cxx
index a45510eec9..ea25eaf89c 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWApprovalPersonOrganization.hxx>
+#include "RWStepBasic_RWApprovalPersonOrganization.pxx"
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalPersonOrganization.hxx>
 #include <StepBasic_ApprovalRole.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.hxx b/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.hxx
rename to src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.pxx
index 9ac86e56cd..3ef81e94d9 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApprovalPersonOrganization();
+  Standard_HIDDEN RWStepBasic_RWApprovalPersonOrganization();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalPersonOrganization)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalPersonOrganization)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalPersonOrganization)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalPersonOrganization)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ApprovalPersonOrganization)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ApprovalPersonOrganization)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cxx b/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cxx
index dfaa233473..c7d6fd0eb9 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWApprovalRelationship.hxx>
+#include "RWStepBasic_RWApprovalRelationship.pxx"
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.hxx b/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWApprovalRelationship.hxx
rename to src/RWStepBasic/RWStepBasic_RWApprovalRelationship.pxx
index 6e211e351e..94c71ce549 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApprovalRelationship();
+  Standard_HIDDEN RWStepBasic_RWApprovalRelationship();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalRelationship)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalRelationship)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ApprovalRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ApprovalRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalRole.cxx b/src/RWStepBasic/RWStepBasic_RWApprovalRole.cxx
index 718dc73138..22f9262b0a 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalRole.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalRole.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWApprovalRole.hxx>
+#include "RWStepBasic_RWApprovalRole.pxx"
 #include <StepBasic_ApprovalRole.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalRole.hxx b/src/RWStepBasic/RWStepBasic_RWApprovalRole.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWApprovalRole.hxx
rename to src/RWStepBasic/RWStepBasic_RWApprovalRole.pxx
index 60a586fa35..db2bdc025c 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalRole.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalRole.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApprovalRole();
+  Standard_HIDDEN RWStepBasic_RWApprovalRole();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalRole)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalRole)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalRole)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalRole)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cxx b/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cxx
index 60199b3cd7..6b923c7594 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWApprovalStatus.hxx>
+#include "RWStepBasic_RWApprovalStatus.pxx"
 #include <StepBasic_ApprovalStatus.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalStatus.hxx b/src/RWStepBasic/RWStepBasic_RWApprovalStatus.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWApprovalStatus.hxx
rename to src/RWStepBasic/RWStepBasic_RWApprovalStatus.pxx
index 0a230f2ac4..8be8919b76 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalStatus.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalStatus.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWApprovalStatus();
+  Standard_HIDDEN RWStepBasic_RWApprovalStatus();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalStatus)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ApprovalStatus)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalStatus)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ApprovalStatus)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCalendarDate.cxx b/src/RWStepBasic/RWStepBasic_RWCalendarDate.cxx
index 4434bba189..b5b37fefe7 100644
--- a/src/RWStepBasic/RWStepBasic_RWCalendarDate.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWCalendarDate.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWCalendarDate.hxx>
+#include "RWStepBasic_RWCalendarDate.pxx"
 #include <StepBasic_CalendarDate.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWCalendarDate.hxx b/src/RWStepBasic/RWStepBasic_RWCalendarDate.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWCalendarDate.hxx
rename to src/RWStepBasic/RWStepBasic_RWCalendarDate.pxx
index c0ab15677d..f92193f0d2 100644
--- a/src/RWStepBasic/RWStepBasic_RWCalendarDate.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWCalendarDate.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWCalendarDate();
+  Standard_HIDDEN RWStepBasic_RWCalendarDate();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CalendarDate)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CalendarDate)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CalendarDate)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CalendarDate)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCertification.cxx b/src/RWStepBasic/RWStepBasic_RWCertification.cxx
index 9246478092..961cacc102 100644
--- a/src/RWStepBasic/RWStepBasic_RWCertification.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWCertification.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWCertification.hxx>
+#include "RWStepBasic_RWCertification.pxx"
 #include <StepBasic_Certification.hxx>
 #include <StepBasic_CertificationType.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWCertification.hxx b/src/RWStepBasic/RWStepBasic_RWCertification.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWCertification.hxx
rename to src/RWStepBasic/RWStepBasic_RWCertification.pxx
index acd1d75734..a5126f6d27 100644
--- a/src/RWStepBasic/RWStepBasic_RWCertification.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWCertification.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWCertification();
+  Standard_HIDDEN RWStepBasic_RWCertification();
   
   //! Reads Certification
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Certification)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Certification)& ent) const;
   
   //! Writes Certification
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Certification)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Certification)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_Certification)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Certification)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.cxx
index 69754e6242..23c2e2ff2c 100644
--- a/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWCertificationAssignment.hxx>
+#include "RWStepBasic_RWCertificationAssignment.pxx"
 #include <StepBasic_Certification.hxx>
 #include <StepBasic_CertificationAssignment.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWCertificationAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWCertificationAssignment.pxx
index 57919bfde4..5fc6bdaaf5 100644
--- a/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWCertificationAssignment.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWCertificationAssignment();
+  Standard_HIDDEN RWStepBasic_RWCertificationAssignment();
   
   //! Reads CertificationAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CertificationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CertificationAssignment)& ent) const;
   
   //! Writes CertificationAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CertificationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CertificationAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_CertificationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_CertificationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCertificationType.cxx b/src/RWStepBasic/RWStepBasic_RWCertificationType.cxx
index af144dafcb..47360d23ff 100644
--- a/src/RWStepBasic/RWStepBasic_RWCertificationType.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWCertificationType.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWCertificationType.hxx>
+#include "RWStepBasic_RWCertificationType.pxx"
 #include <StepBasic_CertificationType.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWCertificationType.hxx b/src/RWStepBasic/RWStepBasic_RWCertificationType.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWCertificationType.hxx
rename to src/RWStepBasic/RWStepBasic_RWCertificationType.pxx
index 251421101b..e4b5ff6996 100644
--- a/src/RWStepBasic/RWStepBasic_RWCertificationType.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWCertificationType.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWCertificationType();
+  Standard_HIDDEN RWStepBasic_RWCertificationType();
   
   //! Reads CertificationType
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CertificationType)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CertificationType)& ent) const;
   
   //! Writes CertificationType
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CertificationType)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CertificationType)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_CertificationType)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_CertificationType)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.cxx b/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.cxx
index 009788b6da..216fa36dd0 100644
--- a/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWCharacterizedObject.hxx>
+#include "RWStepBasic_RWCharacterizedObject.pxx"
 #include <StepBasic_CharacterizedObject.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.hxx b/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWCharacterizedObject.hxx
rename to src/RWStepBasic/RWStepBasic_RWCharacterizedObject.pxx
index 6488b5f6e3..2c64afa8be 100644
--- a/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWCharacterizedObject.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWCharacterizedObject();
+  Standard_HIDDEN RWStepBasic_RWCharacterizedObject();
   
   //! Reads CharacterizedObject
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CharacterizedObject)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CharacterizedObject)& ent) const;
   
   //! Writes CharacterizedObject
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CharacterizedObject)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CharacterizedObject)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_CharacterizedObject)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_CharacterizedObject)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWContract.cxx b/src/RWStepBasic/RWStepBasic_RWContract.cxx
index 94a39b3291..6d27de3df5 100644
--- a/src/RWStepBasic/RWStepBasic_RWContract.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWContract.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWContract.hxx>
+#include "RWStepBasic_RWContract.pxx"
 #include <StepBasic_Contract.hxx>
 #include <StepBasic_ContractType.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWContract.hxx b/src/RWStepBasic/RWStepBasic_RWContract.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWContract.hxx
rename to src/RWStepBasic/RWStepBasic_RWContract.pxx
index 6a43f4b856..74ac4f39d0 100644
--- a/src/RWStepBasic/RWStepBasic_RWContract.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWContract.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWContract();
+  Standard_HIDDEN RWStepBasic_RWContract();
   
   //! Reads Contract
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Contract)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Contract)& ent) const;
   
   //! Writes Contract
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Contract)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Contract)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_Contract)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Contract)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWContractAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWContractAssignment.cxx
index fecdba450b..6bde336247 100644
--- a/src/RWStepBasic/RWStepBasic_RWContractAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWContractAssignment.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWContractAssignment.hxx>
+#include "RWStepBasic_RWContractAssignment.pxx"
 #include <StepBasic_Contract.hxx>
 #include <StepBasic_ContractAssignment.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWContractAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWContractAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWContractAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWContractAssignment.pxx
index c0a2de9a24..c2b65f052a 100644
--- a/src/RWStepBasic/RWStepBasic_RWContractAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWContractAssignment.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWContractAssignment();
+  Standard_HIDDEN RWStepBasic_RWContractAssignment();
   
   //! Reads ContractAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ContractAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ContractAssignment)& ent) const;
   
   //! Writes ContractAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ContractAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ContractAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ContractAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ContractAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWContractType.cxx b/src/RWStepBasic/RWStepBasic_RWContractType.cxx
index 117e902f37..f4a611d191 100644
--- a/src/RWStepBasic/RWStepBasic_RWContractType.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWContractType.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWContractType.hxx>
+#include "RWStepBasic_RWContractType.pxx"
 #include <StepBasic_ContractType.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWContractType.hxx b/src/RWStepBasic/RWStepBasic_RWContractType.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWContractType.hxx
rename to src/RWStepBasic/RWStepBasic_RWContractType.pxx
index 71f1b15b4f..acc7452f87 100644
--- a/src/RWStepBasic/RWStepBasic_RWContractType.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWContractType.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWContractType();
+  Standard_HIDDEN RWStepBasic_RWContractType();
   
   //! Reads ContractType
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ContractType)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ContractType)& ent) const;
   
   //! Writes ContractType
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ContractType)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ContractType)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ContractType)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ContractType)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx
index 55ab2941af..427e363a4e 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnit.pxx"
 #include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.pxx
index fb14fad694..76dbb8208f 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx
index 0d93b06ff1..106f88298d 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx
@@ -16,7 +16,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndAreaUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndAreaUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.pxx
index d279b0928f..36908c4a70 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndAreaUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndAreaUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx
index fea585aa19..b71507f1ae 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndLengthUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndLengthUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_LengthUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.pxx
index fc35375535..c8aa7a1441 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndLengthUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndLengthUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx
index 592dec847c..77f1dbf8b3 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndMassUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndMassUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MassUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.pxx
index 93c28def92..9b4b43836c 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.pxx
@@ -36,13 +36,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndMassUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndMassUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx
index 49b58b6d3b..5095b2c13a 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx
@@ -14,7 +14,7 @@
 // sln 09.10.2001. BUC61003. Correction of looking for items of complex entity in case of them  do not saticfy to alphabetical order
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.pxx
index f9019ec4be..d5b9ee8dbe 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx
index 21e5db1665..38156ba3a1 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndRatioUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndRatioUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.pxx
index 8cc0f260b1..c73bc30b3d 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndRatioUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndRatioUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx
index 6abbb7ecd1..71103494c1 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.pxx
index f28ce96d2f..0f4df9bf1d 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx
index c29afbdec5..f1d0ab0b99 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndTimeUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.pxx
index 122a656ca1..5fa1d8dde9 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndTimeUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndTimeUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx
index e28db30e1b..ca80d7088b 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx
@@ -16,7 +16,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx>
+#include "RWStepBasic_RWConversionBasedUnitAndVolumeUnit.pxx"
 #include <StepBasic_ConversionBasedUnitAndVolumeUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.pxx
index 28d6a2fd1c..592c111e9c 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWConversionBasedUnitAndVolumeUnit();
+  Standard_HIDDEN RWStepBasic_RWConversionBasedUnitAndVolumeUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cxx b/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cxx
index 8c375e2158..9fdfbc9ac2 100644
--- a/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWCoordinatedUniversalTimeOffset.hxx>
+#include "RWStepBasic_RWCoordinatedUniversalTimeOffset.pxx"
 #include <StepBasic_CoordinatedUniversalTimeOffset.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.hxx b/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.hxx
rename to src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.pxx
index 8d608aa0f9..aa47d08a1c 100644
--- a/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWCoordinatedUniversalTimeOffset();
+  Standard_HIDDEN RWStepBasic_RWCoordinatedUniversalTimeOffset();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CoordinatedUniversalTimeOffset)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_CoordinatedUniversalTimeOffset)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CoordinatedUniversalTimeOffset)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_CoordinatedUniversalTimeOffset)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDate.cxx b/src/RWStepBasic/RWStepBasic_RWDate.cxx
index 2d97d75776..5e16ea73ef 100644
--- a/src/RWStepBasic/RWStepBasic_RWDate.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDate.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWDate.hxx>
+#include "RWStepBasic_RWDate.pxx"
 #include <StepBasic_Date.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDate.hxx b/src/RWStepBasic/RWStepBasic_RWDate.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWDate.hxx
rename to src/RWStepBasic/RWStepBasic_RWDate.pxx
index f90dee6c16..3a05472f3d 100644
--- a/src/RWStepBasic/RWStepBasic_RWDate.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDate.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDate();
+  Standard_HIDDEN RWStepBasic_RWDate();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Date)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Date)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Date)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Date)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDateAndTime.cxx b/src/RWStepBasic/RWStepBasic_RWDateAndTime.cxx
index f59b799bc3..a2fb9c641c 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateAndTime.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDateAndTime.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDateAndTime.hxx>
+#include "RWStepBasic_RWDateAndTime.pxx"
 #include <StepBasic_Date.hxx>
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_LocalTime.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDateAndTime.hxx b/src/RWStepBasic/RWStepBasic_RWDateAndTime.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWDateAndTime.hxx
rename to src/RWStepBasic/RWStepBasic_RWDateAndTime.pxx
index 17ee058bcf..116f9194dc 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateAndTime.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDateAndTime.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDateAndTime();
+  Standard_HIDDEN RWStepBasic_RWDateAndTime();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DateAndTime)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DateAndTime)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DateAndTime)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DateAndTime)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_DateAndTime)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DateAndTime)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDateRole.cxx b/src/RWStepBasic/RWStepBasic_RWDateRole.cxx
index 04321f1c3a..874cdda087 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateRole.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDateRole.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWDateRole.hxx>
+#include "RWStepBasic_RWDateRole.pxx"
 #include <StepBasic_DateRole.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDateRole.hxx b/src/RWStepBasic/RWStepBasic_RWDateRole.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWDateRole.hxx
rename to src/RWStepBasic/RWStepBasic_RWDateRole.pxx
index 4ab632ba13..12d0ef2555 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateRole.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDateRole.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDateRole();
+  Standard_HIDDEN RWStepBasic_RWDateRole();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DateRole)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DateRole)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DateRole)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DateRole)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cxx b/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cxx
index 9a0c9f4f0a..73caf6f1f8 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWDateTimeRole.hxx>
+#include "RWStepBasic_RWDateTimeRole.pxx"
 #include <StepBasic_DateTimeRole.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDateTimeRole.hxx b/src/RWStepBasic/RWStepBasic_RWDateTimeRole.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWDateTimeRole.hxx
rename to src/RWStepBasic/RWStepBasic_RWDateTimeRole.pxx
index ad1bc3e42a..b857cd94a3 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateTimeRole.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDateTimeRole.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDateTimeRole();
+  Standard_HIDDEN RWStepBasic_RWDateTimeRole();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DateTimeRole)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DateTimeRole)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DateTimeRole)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DateTimeRole)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cxx b/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cxx
index 5d864a2ed5..841fc01630 100644
--- a/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDerivedUnit.hxx>
+#include "RWStepBasic_RWDerivedUnit.pxx"
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_HArray1OfDerivedUnitElement.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDerivedUnit.hxx b/src/RWStepBasic/RWStepBasic_RWDerivedUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWDerivedUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWDerivedUnit.pxx
index 09899b4059..17d65e38c5 100644
--- a/src/RWStepBasic/RWStepBasic_RWDerivedUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDerivedUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDerivedUnit();
+  Standard_HIDDEN RWStepBasic_RWDerivedUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DerivedUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DerivedUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DerivedUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DerivedUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_DerivedUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DerivedUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cxx b/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cxx
index 8ab38093d2..aa064debd3 100644
--- a/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDerivedUnitElement.hxx>
+#include "RWStepBasic_RWDerivedUnitElement.pxx"
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_NamedUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.hxx b/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.hxx
rename to src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.pxx
index 3958a3a2d4..a4ceb8585b 100644
--- a/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDerivedUnitElement();
+  Standard_HIDDEN RWStepBasic_RWDerivedUnitElement();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DerivedUnitElement)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DerivedUnitElement)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DerivedUnitElement)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DerivedUnitElement)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_DerivedUnitElement)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DerivedUnitElement)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cxx b/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cxx
index b80ed63574..88a592788d 100644
--- a/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWDimensionalExponents.hxx>
+#include "RWStepBasic_RWDimensionalExponents.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.hxx b/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWDimensionalExponents.hxx
rename to src/RWStepBasic/RWStepBasic_RWDimensionalExponents.pxx
index 6ec0455ef2..679a453bdb 100644
--- a/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDimensionalExponents();
+  Standard_HIDDEN RWStepBasic_RWDimensionalExponents();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DimensionalExponents)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DimensionalExponents)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DimensionalExponents)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DimensionalExponents)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocument.cxx b/src/RWStepBasic/RWStepBasic_RWDocument.cxx
index 30cca76d26..d468eff442 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocument.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocument.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocument.hxx>
+#include "RWStepBasic_RWDocument.pxx"
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentType.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocument.hxx b/src/RWStepBasic/RWStepBasic_RWDocument.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWDocument.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocument.pxx
index a7880b2c17..dfc934114a 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocument.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocument.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWDocument();
+  Standard_HIDDEN RWStepBasic_RWDocument();
   
   //! Reads Document
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Document)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Document)& ent) const;
   
   //! Writes Document
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Document)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Document)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_Document)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Document)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentFile.cxx b/src/RWStepBasic/RWStepBasic_RWDocumentFile.cxx
index aefd8f4f4d..40f0065775 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentFile.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentFile.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocumentFile.hxx>
+#include "RWStepBasic_RWDocumentFile.pxx"
 #include <StepBasic_CharacterizedObject.hxx>
 #include <StepBasic_DocumentFile.hxx>
 #include <StepBasic_DocumentType.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentFile.hxx b/src/RWStepBasic/RWStepBasic_RWDocumentFile.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWDocumentFile.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocumentFile.pxx
index a12ed4c53b..ecd9e8eac5 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentFile.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentFile.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWDocumentFile();
+  Standard_HIDDEN RWStepBasic_RWDocumentFile();
   
   //! Reads DocumentFile
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentFile)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentFile)& ent) const;
   
   //! Writes DocumentFile
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentFile)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentFile)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_DocumentFile)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DocumentFile)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.cxx b/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.cxx
index 4a76330c5a..e1d92c3e81 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocumentProductAssociation.hxx>
+#include "RWStepBasic_RWDocumentProductAssociation.pxx"
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentProductAssociation.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.hxx b/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.pxx
index e7016a096a..828ec70a40 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentProductAssociation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWDocumentProductAssociation();
+  Standard_HIDDEN RWStepBasic_RWDocumentProductAssociation();
   
   //! Reads DocumentProductAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentProductAssociation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentProductAssociation)& ent) const;
   
   //! Writes DocumentProductAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentProductAssociation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentProductAssociation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_DocumentProductAssociation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DocumentProductAssociation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.cxx b/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.cxx
index 35bc687c17..ef9456ce47 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocumentProductEquivalence.hxx>
+#include "RWStepBasic_RWDocumentProductEquivalence.pxx"
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentProductEquivalence.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.hxx b/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.pxx
index 47bcad6030..f8068d7835 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentProductEquivalence.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWDocumentProductEquivalence();
+  Standard_HIDDEN RWStepBasic_RWDocumentProductEquivalence();
   
   //! Reads DocumentProductEquivalence
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentProductEquivalence)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentProductEquivalence)& ent) const;
   
   //! Writes DocumentProductEquivalence
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentProductEquivalence)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentProductEquivalence)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_DocumentProductEquivalence)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DocumentProductEquivalence)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cxx b/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cxx
index 5a16f16601..8234f93aaf 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocumentRelationship.hxx>
+#include "RWStepBasic_RWDocumentRelationship.pxx"
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.hxx b/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWDocumentRelationship.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocumentRelationship.pxx
index 28d99616fd..123cca53f0 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDocumentRelationship();
+  Standard_HIDDEN RWStepBasic_RWDocumentRelationship();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentRelationship)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentRelationship)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_DocumentRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DocumentRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.cxx b/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.cxx
index 11d8ffca5e..bd4826c730 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocumentRepresentationType.hxx>
+#include "RWStepBasic_RWDocumentRepresentationType.pxx"
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentRepresentationType.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.hxx b/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.pxx
index 6444fb5ad6..be30cdf051 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentRepresentationType.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWDocumentRepresentationType();
+  Standard_HIDDEN RWStepBasic_RWDocumentRepresentationType();
   
   //! Reads DocumentRepresentationType
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentRepresentationType)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentRepresentationType)& ent) const;
   
   //! Writes DocumentRepresentationType
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentRepresentationType)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentRepresentationType)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_DocumentRepresentationType)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DocumentRepresentationType)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentType.cxx b/src/RWStepBasic/RWStepBasic_RWDocumentType.cxx
index e06d89f3b5..04e4304837 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentType.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentType.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocumentType.hxx>
+#include "RWStepBasic_RWDocumentType.pxx"
 #include <StepBasic_DocumentType.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentType.hxx b/src/RWStepBasic/RWStepBasic_RWDocumentType.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWDocumentType.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocumentType.pxx
index 34a61cb724..2b463c8770 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentType.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentType.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDocumentType();
+  Standard_HIDDEN RWStepBasic_RWDocumentType();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentType)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentType)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentType)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentType)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_DocumentType)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DocumentType)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cxx b/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cxx
index 091794ece7..f8d40704a3 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWDocumentUsageConstraint.hxx>
+#include "RWStepBasic_RWDocumentUsageConstraint.pxx"
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentUsageConstraint.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.hxx b/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.hxx
rename to src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.pxx
index dde4e41aaa..e5ae554a28 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWDocumentUsageConstraint();
+  Standard_HIDDEN RWStepBasic_RWDocumentUsageConstraint();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentUsageConstraint)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_DocumentUsageConstraint)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentUsageConstraint)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_DocumentUsageConstraint)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_DocumentUsageConstraint)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_DocumentUsageConstraint)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWEffectivity.cxx b/src/RWStepBasic/RWStepBasic_RWEffectivity.cxx
index 09561abb93..59eb53e33d 100644
--- a/src/RWStepBasic/RWStepBasic_RWEffectivity.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWEffectivity.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWEffectivity.hxx>
+#include "RWStepBasic_RWEffectivity.pxx"
 #include <StepBasic_Effectivity.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWEffectivity.hxx b/src/RWStepBasic/RWStepBasic_RWEffectivity.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWEffectivity.hxx
rename to src/RWStepBasic/RWStepBasic_RWEffectivity.pxx
index 8267d1ecb6..1e4d22094d 100644
--- a/src/RWStepBasic/RWStepBasic_RWEffectivity.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWEffectivity.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWEffectivity();
+  Standard_HIDDEN RWStepBasic_RWEffectivity();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Effectivity)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Effectivity)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Effectivity)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Effectivity)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_Effectivity)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Effectivity)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.cxx
index 02b382e8e2..ae793832f7 100644
--- a/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWEffectivityAssignment.hxx>
+#include "RWStepBasic_RWEffectivityAssignment.pxx"
 #include <StepBasic_Effectivity.hxx>
 #include <StepBasic_EffectivityAssignment.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.pxx
index 262a938147..5bc80ed8e0 100644
--- a/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWEffectivityAssignment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWEffectivityAssignment();
+  Standard_HIDDEN RWStepBasic_RWEffectivityAssignment();
   
   //! Reads EffectivityAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_EffectivityAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_EffectivityAssignment)& ent) const;
   
   //! Writes EffectivityAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_EffectivityAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_EffectivityAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_EffectivityAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_EffectivityAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWEulerAngles.cxx b/src/RWStepBasic/RWStepBasic_RWEulerAngles.cxx
index ffe2935e89..7da8f9bed9 100644
--- a/src/RWStepBasic/RWStepBasic_RWEulerAngles.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWEulerAngles.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWEulerAngles.hxx>
+#include "RWStepBasic_RWEulerAngles.pxx"
 #include <Standard_Real.hxx>
 #include <StepBasic_EulerAngles.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWEulerAngles.hxx b/src/RWStepBasic/RWStepBasic_RWEulerAngles.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWEulerAngles.hxx
rename to src/RWStepBasic/RWStepBasic_RWEulerAngles.pxx
index 1c2c192a86..40fdf5787b 100644
--- a/src/RWStepBasic/RWStepBasic_RWEulerAngles.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWEulerAngles.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWEulerAngles();
+  Standard_HIDDEN RWStepBasic_RWEulerAngles();
   
   //! Reads EulerAngles
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_EulerAngles)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_EulerAngles)& ent) const;
   
   //! Writes EulerAngles
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_EulerAngles)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_EulerAngles)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_EulerAngles)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_EulerAngles)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.cxx
index 9cf524d21e..8b1ab1e524 100644
--- a/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWExternalIdentificationAssignment.hxx>
+#include "RWStepBasic_RWExternalIdentificationAssignment.pxx"
 #include <StepBasic_ExternalIdentificationAssignment.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_IdentificationRole.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.pxx
index 73a13e7a10..7ff37e63d5 100644
--- a/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWExternalIdentificationAssignment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWExternalIdentificationAssignment();
+  Standard_HIDDEN RWStepBasic_RWExternalIdentificationAssignment();
   
   //! Reads ExternalIdentificationAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ExternalIdentificationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ExternalIdentificationAssignment)& ent) const;
   
   //! Writes ExternalIdentificationAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ExternalIdentificationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ExternalIdentificationAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ExternalIdentificationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ExternalIdentificationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWExternalSource.cxx b/src/RWStepBasic/RWStepBasic_RWExternalSource.cxx
index f6f1f338e4..d2df3b24a0 100644
--- a/src/RWStepBasic/RWStepBasic_RWExternalSource.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWExternalSource.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWExternalSource.hxx>
+#include "RWStepBasic_RWExternalSource.pxx"
 #include <StepBasic_ExternalSource.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWExternalSource.hxx b/src/RWStepBasic/RWStepBasic_RWExternalSource.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWExternalSource.hxx
rename to src/RWStepBasic/RWStepBasic_RWExternalSource.pxx
index d8c79aab32..badf686ab5 100644
--- a/src/RWStepBasic/RWStepBasic_RWExternalSource.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWExternalSource.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWExternalSource();
+  Standard_HIDDEN RWStepBasic_RWExternalSource();
   
   //! Reads ExternalSource
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ExternalSource)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ExternalSource)& ent) const;
   
   //! Writes ExternalSource
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ExternalSource)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ExternalSource)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ExternalSource)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ExternalSource)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.cxx b/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.cxx
index ca054b2f03..8fd1395426 100644
--- a/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWExternallyDefinedItem.hxx>
+#include "RWStepBasic_RWExternallyDefinedItem.pxx"
 #include <StepBasic_ExternallyDefinedItem.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.hxx b/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.hxx
rename to src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.pxx
index f2db5fa6a1..c23742b11c 100644
--- a/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWExternallyDefinedItem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWExternallyDefinedItem();
+  Standard_HIDDEN RWStepBasic_RWExternallyDefinedItem();
   
   //! Reads ExternallyDefinedItem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ExternallyDefinedItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ExternallyDefinedItem)& ent) const;
   
   //! Writes ExternallyDefinedItem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ExternallyDefinedItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ExternallyDefinedItem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ExternallyDefinedItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ExternallyDefinedItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWGeneralProperty.cxx b/src/RWStepBasic/RWStepBasic_RWGeneralProperty.cxx
index 56ba38410a..c70f9f843f 100644
--- a/src/RWStepBasic/RWStepBasic_RWGeneralProperty.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWGeneralProperty.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGeneralProperty.hxx>
+#include "RWStepBasic_RWGeneralProperty.pxx"
 #include <StepBasic_GeneralProperty.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWGeneralProperty.hxx b/src/RWStepBasic/RWStepBasic_RWGeneralProperty.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWGeneralProperty.hxx
rename to src/RWStepBasic/RWStepBasic_RWGeneralProperty.pxx
index 6fa7e143ce..c4ec7404b9 100644
--- a/src/RWStepBasic/RWStepBasic_RWGeneralProperty.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWGeneralProperty.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGeneralProperty();
+  Standard_HIDDEN RWStepBasic_RWGeneralProperty();
   
   //! Reads GeneralProperty
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_GeneralProperty)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_GeneralProperty)& ent) const;
   
   //! Writes GeneralProperty
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_GeneralProperty)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_GeneralProperty)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GeneralProperty)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_GeneralProperty)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx
index 1085273c20..cca7a9eacb 100644
--- a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
+#include "RWStepBasic_RWGeneralPropertyAssociation.pxx"
 #include <StepBasic_GeneralProperty.hxx>
 #include <StepBasic_GeneralPropertyAssociation.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.hxx b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.pxx
similarity index 88%
rename from src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.hxx
rename to src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.pxx
index 4d80c0431c..ceb170e9fc 100644
--- a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.pxx
@@ -35,20 +35,20 @@ public:
   DEFINE_STANDARD_ALLOC
 
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGeneralPropertyAssociation();
+  Standard_HIDDEN RWStepBasic_RWGeneralPropertyAssociation();
   
   //! Reads GeneralPropertyAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData,
                                  const Standard_Integer theNum,
                                  Handle(Interface_Check)& theAch,
                                  const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
   
   //! Writes GeneralPropertyAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW,
                                   const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
+  Standard_HIDDEN void Share (const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
                               Interface_EntityIterator& theIter) const;
 
 protected:
diff --git a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.cxx b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.cxx
index 2e491c1b3e..78dc76fa06 100644
--- a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
+#include "RWStepBasic_RWGeneralPropertyRelationship.pxx"
 #include <StepBasic_GeneralProperty.hxx>
 #include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.hxx b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.pxx
similarity index 88%
rename from src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.hxx
rename to src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.pxx
index c5818adefd..c1fe756f81 100644
--- a/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.pxx
@@ -35,20 +35,20 @@ public:
   DEFINE_STANDARD_ALLOC
 
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGeneralPropertyRelationship();
+  Standard_HIDDEN RWStepBasic_RWGeneralPropertyRelationship();
 
   //! Reads GeneralPropertyAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData,
                                  const Standard_Integer theNum,
                                  Handle(Interface_Check)& theAch,
                                  const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
 
   //! Writes GeneralPropertyAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW,
                                   const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
 
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
+  Standard_HIDDEN void Share (const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
                               Interface_EntityIterator& theIter) const;
 
 protected:
diff --git a/src/RWStepBasic/RWStepBasic_RWGroup.cxx b/src/RWStepBasic/RWStepBasic_RWGroup.cxx
index 5206ea421c..2afe10e9fa 100644
--- a/src/RWStepBasic/RWStepBasic_RWGroup.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWGroup.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGroup.hxx>
+#include "RWStepBasic_RWGroup.pxx"
 #include <StepBasic_Group.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWGroup.hxx b/src/RWStepBasic/RWStepBasic_RWGroup.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWGroup.hxx
rename to src/RWStepBasic/RWStepBasic_RWGroup.pxx
index 9669a7fcbe..f59dee50af 100644
--- a/src/RWStepBasic/RWStepBasic_RWGroup.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWGroup.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGroup();
+  Standard_HIDDEN RWStepBasic_RWGroup();
   
   //! Reads Group
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Group)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Group)& ent) const;
   
   //! Writes Group
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Group)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Group)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_Group)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Group)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWGroupAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWGroupAssignment.cxx
index 4ca7319910..5ab3f21cc9 100644
--- a/src/RWStepBasic/RWStepBasic_RWGroupAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWGroupAssignment.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGroupAssignment.hxx>
+#include "RWStepBasic_RWGroupAssignment.pxx"
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupAssignment.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWGroupAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWGroupAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWGroupAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWGroupAssignment.pxx
index beb275e181..165ebf8894 100644
--- a/src/RWStepBasic/RWStepBasic_RWGroupAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWGroupAssignment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGroupAssignment();
+  Standard_HIDDEN RWStepBasic_RWGroupAssignment();
   
   //! Reads GroupAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_GroupAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_GroupAssignment)& ent) const;
   
   //! Writes GroupAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_GroupAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_GroupAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GroupAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_GroupAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWGroupRelationship.cxx b/src/RWStepBasic/RWStepBasic_RWGroupRelationship.cxx
index 14c285ef2a..1ba53cf534 100644
--- a/src/RWStepBasic/RWStepBasic_RWGroupRelationship.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWGroupRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGroupRelationship.hxx>
+#include "RWStepBasic_RWGroupRelationship.pxx"
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWGroupRelationship.hxx b/src/RWStepBasic/RWStepBasic_RWGroupRelationship.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWGroupRelationship.hxx
rename to src/RWStepBasic/RWStepBasic_RWGroupRelationship.pxx
index ea76a9cf94..24553a852b 100644
--- a/src/RWStepBasic/RWStepBasic_RWGroupRelationship.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWGroupRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGroupRelationship();
+  Standard_HIDDEN RWStepBasic_RWGroupRelationship();
   
   //! Reads GroupRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_GroupRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_GroupRelationship)& ent) const;
   
   //! Writes GroupRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_GroupRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_GroupRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GroupRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_GroupRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.cxx
index 8108b947dd..32092c04e6 100644
--- a/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWIdentificationAssignment.hxx>
+#include "RWStepBasic_RWIdentificationAssignment.pxx"
 #include <StepBasic_IdentificationAssignment.hxx>
 #include <StepBasic_IdentificationRole.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.pxx
index 29379a3fba..3812a31cc9 100644
--- a/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWIdentificationAssignment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWIdentificationAssignment();
+  Standard_HIDDEN RWStepBasic_RWIdentificationAssignment();
   
   //! Reads IdentificationAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_IdentificationAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_IdentificationAssignment)& ent) const;
   
   //! Writes IdentificationAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_IdentificationAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_IdentificationAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_IdentificationAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_IdentificationAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWIdentificationRole.cxx b/src/RWStepBasic/RWStepBasic_RWIdentificationRole.cxx
index f76d7eaa7a..f33a39c85b 100644
--- a/src/RWStepBasic/RWStepBasic_RWIdentificationRole.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWIdentificationRole.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWIdentificationRole.hxx>
+#include "RWStepBasic_RWIdentificationRole.pxx"
 #include <StepBasic_IdentificationRole.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWIdentificationRole.hxx b/src/RWStepBasic/RWStepBasic_RWIdentificationRole.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWIdentificationRole.hxx
rename to src/RWStepBasic/RWStepBasic_RWIdentificationRole.pxx
index fb7759e8bc..680f65e1b8 100644
--- a/src/RWStepBasic/RWStepBasic_RWIdentificationRole.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWIdentificationRole.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWIdentificationRole();
+  Standard_HIDDEN RWStepBasic_RWIdentificationRole();
   
   //! Reads IdentificationRole
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_IdentificationRole)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_IdentificationRole)& ent) const;
   
   //! Writes IdentificationRole
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_IdentificationRole)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_IdentificationRole)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_IdentificationRole)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_IdentificationRole)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cxx b/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cxx
index 828b42489b..9417c7b0c9 100644
--- a/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWLengthMeasureWithUnit.hxx>
+#include "RWStepBasic_RWLengthMeasureWithUnit.pxx"
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.hxx b/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.pxx
index a773de25e0..415ed7e34c 100644
--- a/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWLengthMeasureWithUnit();
+  Standard_HIDDEN RWStepBasic_RWLengthMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_LengthMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_LengthMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_LengthMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_LengthMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_LengthMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_LengthMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWLengthUnit.cxx b/src/RWStepBasic/RWStepBasic_RWLengthUnit.cxx
index 73ec2f6767..8c6c588b75 100644
--- a/src/RWStepBasic/RWStepBasic_RWLengthUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWLengthUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWLengthUnit.hxx>
+#include "RWStepBasic_RWLengthUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_LengthUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWLengthUnit.hxx b/src/RWStepBasic/RWStepBasic_RWLengthUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWLengthUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWLengthUnit.pxx
index 5ce8103025..b943c2d802 100644
--- a/src/RWStepBasic/RWStepBasic_RWLengthUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWLengthUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWLengthUnit();
+  Standard_HIDDEN RWStepBasic_RWLengthUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_LengthUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_LengthUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_LengthUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_LengthUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_LengthUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_LengthUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWLocalTime.cxx b/src/RWStepBasic/RWStepBasic_RWLocalTime.cxx
index 3ac134951b..4da11fc670 100644
--- a/src/RWStepBasic/RWStepBasic_RWLocalTime.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWLocalTime.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWLocalTime.hxx>
+#include "RWStepBasic_RWLocalTime.pxx"
 #include <StepBasic_CoordinatedUniversalTimeOffset.hxx>
 #include <StepBasic_LocalTime.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWLocalTime.hxx b/src/RWStepBasic/RWStepBasic_RWLocalTime.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWLocalTime.hxx
rename to src/RWStepBasic/RWStepBasic_RWLocalTime.pxx
index d71c1cf8bb..7e44dd06a3 100644
--- a/src/RWStepBasic/RWStepBasic_RWLocalTime.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWLocalTime.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWLocalTime();
+  Standard_HIDDEN RWStepBasic_RWLocalTime();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_LocalTime)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_LocalTime)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_LocalTime)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_LocalTime)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_LocalTime)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_LocalTime)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cxx b/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cxx
index 3bf2c26c89..02858c3d2e 100644
--- a/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWMassMeasureWithUnit.hxx>
+#include "RWStepBasic_RWMassMeasureWithUnit.pxx"
 #include <StepBasic_MassMeasureWithUnit.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.hxx b/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.pxx
index 78ef03c2cd..b984755838 100644
--- a/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.pxx
@@ -36,13 +36,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWMassMeasureWithUnit();
+  Standard_HIDDEN RWStepBasic_RWMassMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MassMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MassMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MassMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MassMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_MassMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_MassMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWMassUnit.cxx b/src/RWStepBasic/RWStepBasic_RWMassUnit.cxx
index b5acc306b7..d75d26fa9f 100644
--- a/src/RWStepBasic/RWStepBasic_RWMassUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWMassUnit.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWMassUnit.hxx>
+#include "RWStepBasic_RWMassUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MassUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWMassUnit.hxx b/src/RWStepBasic/RWStepBasic_RWMassUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWMassUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWMassUnit.pxx
index ec4c09c83e..1297030fe5 100644
--- a/src/RWStepBasic/RWStepBasic_RWMassUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWMassUnit.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWMassUnit();
+  Standard_HIDDEN RWStepBasic_RWMassUnit();
   
   //! Reads MassUnit
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MassUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MassUnit)& ent) const;
   
   //! Writes MassUnit
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MassUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MassUnit)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_MassUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_MassUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cxx b/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cxx
index 59fc83c44e..15184cc960 100644
--- a/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWMeasureWithUnit.hxx>
+#include "RWStepBasic_RWMeasureWithUnit.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.hxx b/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.pxx
index fd35b4ecee..c8d5403287 100644
--- a/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWMeasureWithUnit();
+  Standard_HIDDEN RWStepBasic_RWMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_MeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_MeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cxx b/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cxx
index 8ae95c2d8b..7f0f04df52 100644
--- a/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cxx
@@ -16,7 +16,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWMechanicalContext.hxx>
+#include "RWStepBasic_RWMechanicalContext.pxx"
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_MechanicalContext.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWMechanicalContext.hxx b/src/RWStepBasic/RWStepBasic_RWMechanicalContext.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWMechanicalContext.hxx
rename to src/RWStepBasic/RWStepBasic_RWMechanicalContext.pxx
index c59e2b10f3..7ef7d3a3c0 100644
--- a/src/RWStepBasic/RWStepBasic_RWMechanicalContext.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWMechanicalContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWMechanicalContext();
+  Standard_HIDDEN RWStepBasic_RWMechanicalContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MechanicalContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_MechanicalContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MechanicalContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_MechanicalContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_MechanicalContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_MechanicalContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWNameAssignment.cxx b/src/RWStepBasic/RWStepBasic_RWNameAssignment.cxx
index 5cd6952424..12179e8441 100644
--- a/src/RWStepBasic/RWStepBasic_RWNameAssignment.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWNameAssignment.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWNameAssignment.hxx>
+#include "RWStepBasic_RWNameAssignment.pxx"
 #include <StepBasic_NameAssignment.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWNameAssignment.hxx b/src/RWStepBasic/RWStepBasic_RWNameAssignment.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWNameAssignment.hxx
rename to src/RWStepBasic/RWStepBasic_RWNameAssignment.pxx
index 54bc6731bb..801db6ee7f 100644
--- a/src/RWStepBasic/RWStepBasic_RWNameAssignment.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWNameAssignment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWNameAssignment();
+  Standard_HIDDEN RWStepBasic_RWNameAssignment();
   
   //! Reads NameAssignment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_NameAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_NameAssignment)& ent) const;
   
   //! Writes NameAssignment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_NameAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_NameAssignment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_NameAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_NameAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWNamedUnit.cxx b/src/RWStepBasic/RWStepBasic_RWNamedUnit.cxx
index bc0dae8d97..6f7bed273f 100644
--- a/src/RWStepBasic/RWStepBasic_RWNamedUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWNamedUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWNamedUnit.hxx>
+#include "RWStepBasic_RWNamedUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_NamedUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWNamedUnit.hxx b/src/RWStepBasic/RWStepBasic_RWNamedUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWNamedUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWNamedUnit.pxx
index 3ed1b80bbe..f2963a6135 100644
--- a/src/RWStepBasic/RWStepBasic_RWNamedUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWNamedUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWNamedUnit();
+  Standard_HIDDEN RWStepBasic_RWNamedUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_NamedUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_NamedUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_NamedUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_NamedUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_NamedUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_NamedUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWObjectRole.cxx b/src/RWStepBasic/RWStepBasic_RWObjectRole.cxx
index e73ede4c2a..d6f5471bf6 100644
--- a/src/RWStepBasic/RWStepBasic_RWObjectRole.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWObjectRole.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWObjectRole.hxx>
+#include "RWStepBasic_RWObjectRole.pxx"
 #include <StepBasic_ObjectRole.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWObjectRole.hxx b/src/RWStepBasic/RWStepBasic_RWObjectRole.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWObjectRole.hxx
rename to src/RWStepBasic/RWStepBasic_RWObjectRole.pxx
index 472cd0b6aa..4564d452da 100644
--- a/src/RWStepBasic/RWStepBasic_RWObjectRole.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWObjectRole.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWObjectRole();
+  Standard_HIDDEN RWStepBasic_RWObjectRole();
   
   //! Reads ObjectRole
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ObjectRole)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ObjectRole)& ent) const;
   
   //! Writes ObjectRole
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ObjectRole)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ObjectRole)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ObjectRole)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ObjectRole)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cxx b/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cxx
index 5a6d703685..bf7e00476c 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWOrdinalDate.hxx>
+#include "RWStepBasic_RWOrdinalDate.pxx"
 #include <StepBasic_OrdinalDate.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWOrdinalDate.hxx b/src/RWStepBasic/RWStepBasic_RWOrdinalDate.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWOrdinalDate.hxx
rename to src/RWStepBasic/RWStepBasic_RWOrdinalDate.pxx
index 7aef972c5d..82e3b2961b 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrdinalDate.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrdinalDate.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWOrdinalDate();
+  Standard_HIDDEN RWStepBasic_RWOrdinalDate();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_OrdinalDate)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_OrdinalDate)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_OrdinalDate)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_OrdinalDate)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganization.cxx b/src/RWStepBasic/RWStepBasic_RWOrganization.cxx
index 86eb7924a5..36f35cb657 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganization.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrganization.cxx
@@ -13,7 +13,7 @@
 
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
-#include <RWStepBasic_RWOrganization.hxx>
+#include "RWStepBasic_RWOrganization.pxx"
 #include <StepBasic_Organization.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganization.hxx b/src/RWStepBasic/RWStepBasic_RWOrganization.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWOrganization.hxx
rename to src/RWStepBasic/RWStepBasic_RWOrganization.pxx
index 719c45cd3e..3995f5c122 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganization.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrganization.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWOrganization();
+  Standard_HIDDEN RWStepBasic_RWOrganization();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Organization)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Organization)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Organization)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Organization)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cxx b/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cxx
index aac4a43ed7..34b5495941 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWOrganizationRole.hxx>
+#include "RWStepBasic_RWOrganizationRole.pxx"
 #include <StepBasic_OrganizationRole.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganizationRole.hxx b/src/RWStepBasic/RWStepBasic_RWOrganizationRole.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWOrganizationRole.hxx
rename to src/RWStepBasic/RWStepBasic_RWOrganizationRole.pxx
index 252aae82c9..49ba9f5587 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganizationRole.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrganizationRole.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWOrganizationRole();
+  Standard_HIDDEN RWStepBasic_RWOrganizationRole();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_OrganizationRole)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_OrganizationRole)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_OrganizationRole)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_OrganizationRole)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cxx b/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cxx
index 181f23882e..1d52f83986 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWOrganizationalAddress.hxx>
+#include "RWStepBasic_RWOrganizationalAddress.pxx"
 #include <StepBasic_Organization.hxx>
 #include <StepBasic_OrganizationalAddress.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.hxx b/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.hxx
rename to src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.pxx
index 09e1c75927..09d35c0be9 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWOrganizationalAddress();
+  Standard_HIDDEN RWStepBasic_RWOrganizationalAddress();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_OrganizationalAddress)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_OrganizationalAddress)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_OrganizationalAddress)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_OrganizationalAddress)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_OrganizationalAddress)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_OrganizationalAddress)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPerson.cxx b/src/RWStepBasic/RWStepBasic_RWPerson.cxx
index 345dd2a8c9..e143192c8b 100644
--- a/src/RWStepBasic/RWStepBasic_RWPerson.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWPerson.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_Check.hxx>
-#include <RWStepBasic_RWPerson.hxx>
+#include "RWStepBasic_RWPerson.pxx"
 #include <StepBasic_Person.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWPerson.hxx b/src/RWStepBasic/RWStepBasic_RWPerson.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWPerson.hxx
rename to src/RWStepBasic/RWStepBasic_RWPerson.pxx
index 7c18319ecc..2e9fdb61e0 100644
--- a/src/RWStepBasic/RWStepBasic_RWPerson.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWPerson.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWPerson();
+  Standard_HIDDEN RWStepBasic_RWPerson();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Person)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Person)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Person)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Person)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cxx b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cxx
index c4bfd77ff7..43bbef76b3 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWPersonAndOrganization.hxx>
+#include "RWStepBasic_RWPersonAndOrganization.pxx"
 #include <StepBasic_Organization.hxx>
 #include <StepBasic_Person.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.hxx b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.hxx
rename to src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.pxx
index 10aee9cd4a..37874e5241 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWPersonAndOrganization();
+  Standard_HIDDEN RWStepBasic_RWPersonAndOrganization();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PersonAndOrganization)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PersonAndOrganization)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PersonAndOrganization)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PersonAndOrganization)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_PersonAndOrganization)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_PersonAndOrganization)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cxx b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cxx
index 982b1cb2aa..0ee93da84e 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWPersonAndOrganizationRole.hxx>
+#include "RWStepBasic_RWPersonAndOrganizationRole.pxx"
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.hxx b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.hxx
rename to src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.pxx
index 023da9b318..19e8391b3f 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWPersonAndOrganizationRole();
+  Standard_HIDDEN RWStepBasic_RWPersonAndOrganizationRole();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PersonAndOrganizationRole)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PersonAndOrganizationRole)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PersonAndOrganizationRole)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PersonAndOrganizationRole)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cxx b/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cxx
index 560669934e..ccfd515862 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWPersonalAddress.hxx>
+#include "RWStepBasic_RWPersonalAddress.pxx"
 #include <StepBasic_Person.hxx>
 #include <StepBasic_PersonalAddress.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonalAddress.hxx b/src/RWStepBasic/RWStepBasic_RWPersonalAddress.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWPersonalAddress.hxx
rename to src/RWStepBasic/RWStepBasic_RWPersonalAddress.pxx
index a9e775d347..960ef3ec02 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonalAddress.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWPersonalAddress.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWPersonalAddress();
+  Standard_HIDDEN RWStepBasic_RWPersonalAddress();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PersonalAddress)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PersonalAddress)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PersonalAddress)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PersonalAddress)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_PersonalAddress)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_PersonalAddress)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cxx b/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cxx
index 0859f36264..03941e5345 100644
--- a/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWPlaneAngleMeasureWithUnit.hxx>
+#include "RWStepBasic_RWPlaneAngleMeasureWithUnit.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.hxx b/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.pxx
index c6ca657ef0..5cc05e9518 100644
--- a/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWPlaneAngleMeasureWithUnit();
+  Standard_HIDDEN RWStepBasic_RWPlaneAngleMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PlaneAngleMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PlaneAngleMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PlaneAngleMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PlaneAngleMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_PlaneAngleMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_PlaneAngleMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cxx
index aaf18d0013..6225a67a29 100644
--- a/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWPlaneAngleUnit.hxx>
+#include "RWStepBasic_RWPlaneAngleUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_PlaneAngleUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.hxx b/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.pxx
index 48cad0352d..3fc64ded74 100644
--- a/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWPlaneAngleUnit();
+  Standard_HIDDEN RWStepBasic_RWPlaneAngleUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PlaneAngleUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_PlaneAngleUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PlaneAngleUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_PlaneAngleUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_PlaneAngleUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_PlaneAngleUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProduct.cxx b/src/RWStepBasic/RWStepBasic_RWProduct.cxx
index 38efe20277..ca87dc5201 100644
--- a/src/RWStepBasic/RWStepBasic_RWProduct.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProduct.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProduct.hxx>
+#include "RWStepBasic_RWProduct.pxx"
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductContext.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProduct.hxx b/src/RWStepBasic/RWStepBasic_RWProduct.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProduct.hxx
rename to src/RWStepBasic/RWStepBasic_RWProduct.pxx
index 09a782ecf8..11a3d0ded2 100644
--- a/src/RWStepBasic/RWStepBasic_RWProduct.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProduct.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProduct();
+  Standard_HIDDEN RWStepBasic_RWProduct();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Product)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_Product)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Product)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_Product)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_Product)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_Product)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductCategory.cxx b/src/RWStepBasic/RWStepBasic_RWProductCategory.cxx
index 00548f0ddb..f0a0aa418f 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductCategory.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductCategory.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWProductCategory.hxx>
+#include "RWStepBasic_RWProductCategory.pxx"
 #include <StepBasic_ProductCategory.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductCategory.hxx b/src/RWStepBasic/RWStepBasic_RWProductCategory.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWProductCategory.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductCategory.pxx
index 767e3291bd..c98e54037d 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductCategory.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductCategory.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductCategory();
+  Standard_HIDDEN RWStepBasic_RWProductCategory();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductCategory)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductCategory)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductCategory)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductCategory)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.cxx b/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.cxx
index 980c22157d..1082bb9ae2 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductCategoryRelationship.hxx>
+#include "RWStepBasic_RWProductCategoryRelationship.pxx"
 #include <StepBasic_ProductCategory.hxx>
 #include <StepBasic_ProductCategoryRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.hxx b/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.pxx
index 5594a8e979..65539cdbb3 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductCategoryRelationship.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWProductCategoryRelationship();
+  Standard_HIDDEN RWStepBasic_RWProductCategoryRelationship();
   
   //! Reads ProductCategoryRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductCategoryRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductCategoryRelationship)& ent) const;
   
   //! Writes ProductCategoryRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductCategoryRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductCategoryRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductCategoryRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductCategoryRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductConceptContext.cxx b/src/RWStepBasic/RWStepBasic_RWProductConceptContext.cxx
index 74a86d4b32..cf9ef9e548 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductConceptContext.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductConceptContext.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductConceptContext.hxx>
+#include "RWStepBasic_RWProductConceptContext.pxx"
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ProductConceptContext.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductConceptContext.hxx b/src/RWStepBasic/RWStepBasic_RWProductConceptContext.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWProductConceptContext.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductConceptContext.pxx
index acbc56f217..dd9e5afbab 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductConceptContext.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductConceptContext.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWProductConceptContext();
+  Standard_HIDDEN RWStepBasic_RWProductConceptContext();
   
   //! Reads ProductConceptContext
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductConceptContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductConceptContext)& ent) const;
   
   //! Writes ProductConceptContext
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductConceptContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductConceptContext)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductConceptContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductConceptContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductContext.cxx b/src/RWStepBasic/RWStepBasic_RWProductContext.cxx
index 51f3f2a4c4..71b209896f 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductContext.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductContext.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductContext.hxx>
+#include "RWStepBasic_RWProductContext.pxx"
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ProductContext.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductContext.hxx b/src/RWStepBasic/RWStepBasic_RWProductContext.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductContext.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductContext.pxx
index 0d89d07e04..9d79bf13e1 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductContext.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductContext();
+  Standard_HIDDEN RWStepBasic_RWProductContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx
index 3a64a42529..15905df68c 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinition.hxx>
+#include "RWStepBasic_RWProductDefinition.pxx"
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinition.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinition.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinition.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinition.pxx
index 38cc0f0e26..79bc32cbbe 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinition.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinition.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinition();
+  Standard_HIDDEN RWStepBasic_RWProductDefinition();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinition)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinition)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinition)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinition)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinition)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinition)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cxx
index 5a021e1295..e966b06716 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionContext.hxx>
+#include "RWStepBasic_RWProductDefinitionContext.pxx"
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.pxx
index 8f20c9978b..23b84a0f5c 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinitionContext();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cxx
index 713fbfb6ec..6c4f42d33d 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionEffectivity.hxx>
+#include "RWStepBasic_RWProductDefinitionEffectivity.pxx"
 #include <StepBasic_ProductDefinitionEffectivity.hxx>
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.pxx
index 48b90e8960..4658630cb3 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinitionEffectivity();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionEffectivity();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionEffectivity)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionEffectivity)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionEffectivity)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionEffectivity)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionEffectivity)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionEffectivity)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx
index cbc08a6d56..5e4d343d62 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionFormation.hxx>
+#include "RWStepBasic_RWProductDefinitionFormation.pxx"
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.pxx
index 00fc0c7917..0d9f0553cb 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinitionFormation();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionFormation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionFormation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionFormation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionFormation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionFormation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionFormation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionFormation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.cxx
index fdbf1e1258..1f6f7767b6 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionFormationRelationship.hxx>
+#include "RWStepBasic_RWProductDefinitionFormationRelationship.pxx"
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionFormationRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.pxx
similarity index 88%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.pxx
index 8b50a01835..d816de0f17 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWProductDefinitionFormationRelationship();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionFormationRelationship();
   
   //! Reads ProductDefinitionFormationRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionFormationRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionFormationRelationship)& ent) const;
   
   //! Writes ProductDefinitionFormationRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionFormationRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionFormationRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionFormationRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionFormationRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cxx
index b145e98844..dd064a8e32 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.hxx>
+#include "RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.pxx"
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx>
 #include <StepBasic_Source.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.pxx
index 73474cc373..876c022109 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionFormationWithSpecifiedSource)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionFormationWithSpecifiedSource)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionFormationWithSpecifiedSource)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionFormationWithSpecifiedSource)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionFormationWithSpecifiedSource)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionFormationWithSpecifiedSource)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.cxx
index 7eb301869d..9f6e3f86f7 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.cxx
@@ -16,7 +16,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionReference.hxx>
+#include "RWStepBasic_RWProductDefinitionReference.pxx"
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_ProductDefinitionReference.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.pxx
index 5eaf14cd23..0bca9d906c 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReference.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinitionReference();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionReference();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionReference)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionReference)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionReference)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionReference)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionReference)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionReference)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepBasic_RWProductDefinitionReference_HeaderFile
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.cxx
index 74b4a15de9..f3eb8dbde2 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.hxx>
+#include "RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.pxx"
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_ProductDefinitionReferenceWithLocalRepresentation.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.pxx
index efaafe5da4..66c585b221 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionReferenceWithLocalRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionReferenceWithLocalRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionReferenceWithLocalRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionReferenceWithLocalRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionReferenceWithLocalRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionReferenceWithLocalRepresentation)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepBasic_RWProductDefinitionReferenceWithLocalRepresentation_HeaderFile
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.cxx
index ef366532a2..47411a75a8 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionRelationship.hxx>
+#include "RWStepBasic_RWProductDefinitionRelationship.pxx"
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.pxx
index 8eae59c9c6..9071986e82 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWProductDefinitionRelationship();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionRelationship();
   
   //! Reads ProductDefinitionRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionRelationship)& ent) const;
   
   //! Writes ProductDefinitionRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cxx
index d93b3944e6..f3e98a351f 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductDefinitionWithAssociatedDocuments.hxx>
+#include "RWStepBasic_RWProductDefinitionWithAssociatedDocuments.pxx"
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.hxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.pxx
index f38c4f0044..426ffae131 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductDefinitionWithAssociatedDocuments();
+  Standard_HIDDEN RWStepBasic_RWProductDefinitionWithAssociatedDocuments();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionWithAssociatedDocuments)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductDefinitionWithAssociatedDocuments)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionWithAssociatedDocuments)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductDefinitionWithAssociatedDocuments)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductDefinitionWithAssociatedDocuments)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductDefinitionWithAssociatedDocuments)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cxx b/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cxx
index 2f8e1907ba..2ee9b8f267 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductRelatedProductCategory.hxx>
+#include "RWStepBasic_RWProductRelatedProductCategory.pxx"
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductRelatedProductCategory.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.hxx b/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.pxx
index 1457157e29..ec033486fc 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductRelatedProductCategory();
+  Standard_HIDDEN RWStepBasic_RWProductRelatedProductCategory();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductRelatedProductCategory)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductRelatedProductCategory)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductRelatedProductCategory)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductRelatedProductCategory)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductRelatedProductCategory)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductRelatedProductCategory)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductType.cxx b/src/RWStepBasic/RWStepBasic_RWProductType.cxx
index b073a4a56c..fd645feb25 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductType.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductType.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWProductType.hxx>
+#include "RWStepBasic_RWProductType.pxx"
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductType.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWProductType.hxx b/src/RWStepBasic/RWStepBasic_RWProductType.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWProductType.hxx
rename to src/RWStepBasic/RWStepBasic_RWProductType.pxx
index 95377d2eee..230e3ef758 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductType.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductType.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWProductType();
+  Standard_HIDDEN RWStepBasic_RWProductType();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductType)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ProductType)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductType)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ProductType)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_ProductType)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ProductType)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cxx b/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cxx
index b343f31cfb..6532b8f3bd 100644
--- a/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWRatioMeasureWithUnit.hxx>
+#include "RWStepBasic_RWRatioMeasureWithUnit.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_RatioMeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.hxx b/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.pxx
index 4bac9404fa..fc8bfe6a94 100644
--- a/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWRatioMeasureWithUnit();
+  Standard_HIDDEN RWStepBasic_RWRatioMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_RatioMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_RatioMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_RatioMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_RatioMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_RatioMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_RatioMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWRoleAssociation.cxx b/src/RWStepBasic/RWStepBasic_RWRoleAssociation.cxx
index a28a18cf79..79e0aedce7 100644
--- a/src/RWStepBasic/RWStepBasic_RWRoleAssociation.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWRoleAssociation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWRoleAssociation.hxx>
+#include "RWStepBasic_RWRoleAssociation.pxx"
 #include <StepBasic_ObjectRole.hxx>
 #include <StepBasic_RoleAssociation.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWRoleAssociation.hxx b/src/RWStepBasic/RWStepBasic_RWRoleAssociation.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWRoleAssociation.hxx
rename to src/RWStepBasic/RWStepBasic_RWRoleAssociation.pxx
index d412d27bb2..3a4f6a3f81 100644
--- a/src/RWStepBasic/RWStepBasic_RWRoleAssociation.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWRoleAssociation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWRoleAssociation();
+  Standard_HIDDEN RWStepBasic_RWRoleAssociation();
   
   //! Reads RoleAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_RoleAssociation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_RoleAssociation)& ent) const;
   
   //! Writes RoleAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_RoleAssociation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_RoleAssociation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_RoleAssociation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_RoleAssociation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cxx b/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cxx
index fe9d2c4e0d..5047733368 100644
--- a/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWSecurityClassification.hxx>
+#include "RWStepBasic_RWSecurityClassification.pxx"
 #include <StepBasic_SecurityClassification.hxx>
 #include <StepBasic_SecurityClassificationLevel.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSecurityClassification.hxx b/src/RWStepBasic/RWStepBasic_RWSecurityClassification.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWSecurityClassification.hxx
rename to src/RWStepBasic/RWStepBasic_RWSecurityClassification.pxx
index 7129b15cc8..027f62b210 100644
--- a/src/RWStepBasic/RWStepBasic_RWSecurityClassification.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSecurityClassification.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSecurityClassification();
+  Standard_HIDDEN RWStepBasic_RWSecurityClassification();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SecurityClassification)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SecurityClassification)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SecurityClassification)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SecurityClassification)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_SecurityClassification)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_SecurityClassification)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cxx b/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cxx
index 0c49c8a5ef..54c6fd496e 100644
--- a/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSecurityClassificationLevel.hxx>
+#include "RWStepBasic_RWSecurityClassificationLevel.pxx"
 #include <StepBasic_SecurityClassificationLevel.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.hxx b/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.hxx
rename to src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.pxx
index c80a363223..224d8b3ba2 100644
--- a/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSecurityClassificationLevel();
+  Standard_HIDDEN RWStepBasic_RWSecurityClassificationLevel();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SecurityClassificationLevel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SecurityClassificationLevel)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SecurityClassificationLevel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SecurityClassificationLevel)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnit.cxx
index 92eda4e01f..45cf13121a 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnit.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnit.pxx
similarity index 80%
rename from src/RWStepBasic/RWStepBasic_RWSiUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnit.pxx
index 24a963a868..5dc0967e90 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnit.pxx
@@ -40,19 +40,19 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnit)& ent) const;
   
-  Standard_EXPORT Standard_Boolean DecodePrefix (StepBasic_SiPrefix& aPrefix, const Standard_CString text) const;
+  Standard_HIDDEN Standard_Boolean DecodePrefix (StepBasic_SiPrefix& aPrefix, const Standard_CString text) const;
   
-  Standard_EXPORT Standard_Boolean DecodeName (StepBasic_SiUnitName& aName, const Standard_CString text) const;
+  Standard_HIDDEN Standard_Boolean DecodeName (StepBasic_SiUnitName& aName, const Standard_CString text) const;
   
-  Standard_EXPORT TCollection_AsciiString EncodePrefix (const StepBasic_SiPrefix aPrefix) const;
+  Standard_HIDDEN TCollection_AsciiString EncodePrefix (const StepBasic_SiPrefix aPrefix) const;
   
-  Standard_EXPORT TCollection_AsciiString EncodeName (const StepBasic_SiUnitName aName) const;
+  Standard_HIDDEN TCollection_AsciiString EncodeName (const StepBasic_SiUnitName aName) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cxx
index 8a06ed56b9..cecd9cb1ed 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cxx
@@ -15,8 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndAreaUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndAreaUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiUnitAndAreaUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.pxx
index 9fb178601a..3dc3658334 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndAreaUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndAreaUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndAreaUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndAreaUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndAreaUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndAreaUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cxx
index b5d20f8205..c3c120be7a 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cxx
@@ -13,8 +13,8 @@
 
 // pdn 24.12.98 t3d_opt.stp: treatment of unsorted uncertanties
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndLengthUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndLengthUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.pxx
index c9503de093..060fe1b51a 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndLengthUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndLengthUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndLengthUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndLengthUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndLengthUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndLengthUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cxx
index 404276ece4..019cd0aed0 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cxx
@@ -12,8 +12,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndMassUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndMassUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitAndMassUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.pxx
similarity index 88%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.pxx
index dcfe017dca..589ee2383c 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.pxx
@@ -35,11 +35,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndMassUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndMassUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndMassUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndMassUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndMassUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndMassUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cxx
index c48b1f56d0..f5fbf1a14d 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cxx
@@ -12,8 +12,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndPlaneAngleUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndPlaneAngleUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitAndPlaneAngleUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.pxx
index 65a35d57ef..035b986d0b 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndPlaneAngleUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndPlaneAngleUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndPlaneAngleUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndPlaneAngleUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndPlaneAngleUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndPlaneAngleUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cxx
index 0d28dba9a0..e32aea1508 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cxx
@@ -12,8 +12,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndRatioUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndRatioUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitAndRatioUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.pxx
index 125b75b01d..85716f016b 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndRatioUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndRatioUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndRatioUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndRatioUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndRatioUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndRatioUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cxx
index add23560e5..906e520156 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cxx
@@ -12,8 +12,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndSolidAngleUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndSolidAngleUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitAndSolidAngleUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.pxx
index 8fc117a6f5..35983e732a 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndSolidAngleUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndSolidAngleUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndSolidAngleUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndSolidAngleUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndSolidAngleUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndSolidAngleUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cxx
index 3e45db5b28..cb78a83a6d 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cxx
@@ -12,8 +12,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.pxx
index 8a9b834bfe..859d436238 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.pxx
@@ -35,11 +35,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndThermodynamicTemperatureUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndThermodynamicTemperatureUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndThermodynamicTemperatureUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndThermodynamicTemperatureUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cxx
index 6701250c7f..1d39b584f0 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cxx
@@ -12,8 +12,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndTimeUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndTimeUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitAndTimeUnit.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.pxx
index 6bac7062f2..d488f55738 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndTimeUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndTimeUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndTimeUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndTimeUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndTimeUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndTimeUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cxx
index 5014bb0017..7f6b0bc996 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cxx
@@ -15,8 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWSiUnit.hxx>
-#include <RWStepBasic_RWSiUnitAndVolumeUnit.hxx>
+#include "RWStepBasic_RWSiUnit.pxx"
+#include "RWStepBasic_RWSiUnitAndVolumeUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiUnitAndVolumeUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.pxx
index 298fa70ac8..3511cdde9d 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSiUnitAndVolumeUnit();
+  Standard_HIDDEN RWStepBasic_RWSiUnitAndVolumeUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndVolumeUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SiUnitAndVolumeUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndVolumeUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SiUnitAndVolumeUnit)& ent) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cxx
index c58d1eaf08..1332b024ba 100644
--- a/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWSolidAngleMeasureWithUnit.hxx>
+#include "RWStepBasic_RWSolidAngleMeasureWithUnit.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_SolidAngleMeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.pxx
index 98e4feed7a..c37228ea12 100644
--- a/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSolidAngleMeasureWithUnit();
+  Standard_HIDDEN RWStepBasic_RWSolidAngleMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SolidAngleMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SolidAngleMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SolidAngleMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SolidAngleMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_SolidAngleMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_SolidAngleMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cxx b/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cxx
index b3549c7929..e8f126d381 100644
--- a/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWSolidAngleUnit.hxx>
+#include "RWStepBasic_RWSolidAngleUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SolidAngleUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.hxx b/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.pxx
index bde928a85e..f6fc5ccc1a 100644
--- a/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWSolidAngleUnit();
+  Standard_HIDDEN RWStepBasic_RWSolidAngleUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SolidAngleUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_SolidAngleUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SolidAngleUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_SolidAngleUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_SolidAngleUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_SolidAngleUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.cxx b/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.cxx
index ebebcfb8ad..cf2926ec6f 100644
--- a/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWThermodynamicTemperatureUnit.hxx>
+#include "RWStepBasic_RWThermodynamicTemperatureUnit.pxx"
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_ThermodynamicTemperatureUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.hxx b/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.pxx
index 9e833ba8b4..8176d9d385 100644
--- a/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWThermodynamicTemperatureUnit.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWThermodynamicTemperatureUnit();
+  Standard_HIDDEN RWStepBasic_RWThermodynamicTemperatureUnit();
   
   //! Reads ThermodynamicTemperatureUnit
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ThermodynamicTemperatureUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_ThermodynamicTemperatureUnit)& ent) const;
   
   //! Writes ThermodynamicTemperatureUnit
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ThermodynamicTemperatureUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_ThermodynamicTemperatureUnit)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_ThermodynamicTemperatureUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_ThermodynamicTemperatureUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cxx b/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cxx
index 3b8c3059d7..80915c736e 100644
--- a/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cxx
@@ -16,7 +16,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_MSG.hxx>
-#include <RWStepBasic_RWUncertaintyMeasureWithUnit.hxx>
+#include "RWStepBasic_RWUncertaintyMeasureWithUnit.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.hxx b/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.pxx
similarity index 86%
rename from src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.hxx
rename to src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.pxx
index 2571eadd54..3e534837b2 100644
--- a/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWUncertaintyMeasureWithUnit();
+  Standard_HIDDEN RWStepBasic_RWUncertaintyMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_UncertaintyMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_UncertaintyMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_UncertaintyMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_UncertaintyMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepBasic_UncertaintyMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_UncertaintyMeasureWithUnit)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.cxx b/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.cxx
index 7f79e0c117..4379ccd02a 100644
--- a/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWVersionedActionRequest.hxx>
+#include "RWStepBasic_RWVersionedActionRequest.pxx"
 #include <StepBasic_VersionedActionRequest.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.hxx b/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.pxx
similarity index 87%
rename from src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.hxx
rename to src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.pxx
index 2b23894e2a..a0e9720cc6 100644
--- a/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWVersionedActionRequest.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWVersionedActionRequest();
+  Standard_HIDDEN RWStepBasic_RWVersionedActionRequest();
   
   //! Reads VersionedActionRequest
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_VersionedActionRequest)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_VersionedActionRequest)& ent) const;
   
   //! Writes VersionedActionRequest
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_VersionedActionRequest)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_VersionedActionRequest)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_VersionedActionRequest)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepBasic_VersionedActionRequest)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cxx b/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cxx
index 46194f26ed..5063bf76bb 100644
--- a/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepBasic_RWWeekOfYearAndDayDate.hxx>
+#include "RWStepBasic_RWWeekOfYearAndDayDate.pxx"
 #include <StepBasic_WeekOfYearAndDayDate.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.hxx b/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.pxx
similarity index 89%
rename from src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.hxx
rename to src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.pxx
index 0675683523..bbe85f2b59 100644
--- a/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.hxx
+++ b/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepBasic_RWWeekOfYearAndDayDate();
+  Standard_HIDDEN RWStepBasic_RWWeekOfYearAndDayDate();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_WeekOfYearAndDayDate)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepBasic_WeekOfYearAndDayDate)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_WeekOfYearAndDayDate)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepBasic_WeekOfYearAndDayDate)& ent) const;
 
 
 
diff --git a/src/RWStepDimTol/FILES b/src/RWStepDimTol/FILES
index dee89bc5b9..2a0cc5a5d0 100644
--- a/src/RWStepDimTol/FILES
+++ b/src/RWStepDimTol/FILES
@@ -1,98 +1,98 @@
 RWStepDimTol_RWAngularityTolerance.cxx
-RWStepDimTol_RWAngularityTolerance.hxx
+RWStepDimTol_RWAngularityTolerance.pxx
 RWStepDimTol_RWCircularRunoutTolerance.cxx
-RWStepDimTol_RWCircularRunoutTolerance.hxx
+RWStepDimTol_RWCircularRunoutTolerance.pxx
 RWStepDimTol_RWCoaxialityTolerance.cxx
-RWStepDimTol_RWCoaxialityTolerance.hxx
+RWStepDimTol_RWCoaxialityTolerance.pxx
 RWStepDimTol_RWCommonDatum.cxx
-RWStepDimTol_RWCommonDatum.hxx
+RWStepDimTol_RWCommonDatum.pxx
 RWStepDimTol_RWConcentricityTolerance.cxx
-RWStepDimTol_RWConcentricityTolerance.hxx
+RWStepDimTol_RWConcentricityTolerance.pxx
 RWStepDimTol_RWCylindricityTolerance.cxx
-RWStepDimTol_RWCylindricityTolerance.hxx
+RWStepDimTol_RWCylindricityTolerance.pxx
 RWStepDimTol_RWDatum.cxx
-RWStepDimTol_RWDatum.hxx
+RWStepDimTol_RWDatum.pxx
 RWStepDimTol_RWDatumFeature.cxx
-RWStepDimTol_RWDatumFeature.hxx
+RWStepDimTol_RWDatumFeature.pxx
 RWStepDimTol_RWDatumReference.cxx
-RWStepDimTol_RWDatumReference.hxx
+RWStepDimTol_RWDatumReference.pxx
 RWStepDimTol_RWDatumReferenceCompartment.cxx
-RWStepDimTol_RWDatumReferenceCompartment.hxx
+RWStepDimTol_RWDatumReferenceCompartment.pxx
 RWStepDimTol_RWDatumReferenceElement.cxx
-RWStepDimTol_RWDatumReferenceElement.hxx
+RWStepDimTol_RWDatumReferenceElement.pxx
 RWStepDimTol_RWDatumReferenceModifierWithValue.cxx
-RWStepDimTol_RWDatumReferenceModifierWithValue.hxx
+RWStepDimTol_RWDatumReferenceModifierWithValue.pxx
 RWStepDimTol_RWDatumSystem.cxx
-RWStepDimTol_RWDatumSystem.hxx
+RWStepDimTol_RWDatumSystem.pxx
 RWStepDimTol_RWDatumTarget.cxx
-RWStepDimTol_RWDatumTarget.hxx
+RWStepDimTol_RWDatumTarget.pxx
 RWStepDimTol_RWFlatnessTolerance.cxx
-RWStepDimTol_RWFlatnessTolerance.hxx
+RWStepDimTol_RWFlatnessTolerance.pxx
 RWStepDimTol_RWGeneralDatumReference.cxx
-RWStepDimTol_RWGeneralDatumReference.hxx
+RWStepDimTol_RWGeneralDatumReference.pxx
 RWStepDimTol_RWGeometricTolerance.cxx
-RWStepDimTol_RWGeometricTolerance.hxx
+RWStepDimTol_RWGeometricTolerance.pxx
 RWStepDimTol_RWGeometricToleranceRelationship.cxx
-RWStepDimTol_RWGeometricToleranceRelationship.hxx
+RWStepDimTol_RWGeometricToleranceRelationship.pxx
 RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx
-RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx
+RWStepDimTol_RWGeometricToleranceWithDatumReference.pxx
 RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
-RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.hxx
+RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.pxx
 RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx
-RWStepDimTol_RWGeometricToleranceWithDefinedUnit.hxx
+RWStepDimTol_RWGeometricToleranceWithDefinedUnit.pxx
 RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
-RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.hxx
+RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.pxx
 RWStepDimTol_RWGeometricToleranceWithModifiers.cxx
-RWStepDimTol_RWGeometricToleranceWithModifiers.hxx
+RWStepDimTol_RWGeometricToleranceWithModifiers.pxx
 RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
-RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx
+RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.pxx
 RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
-RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
+RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.pxx
 RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
-RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
+RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.pxx
 RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
-RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
+RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.pxx
 RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
-RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
+RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.pxx
 RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx
-RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx
+RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.pxx
 RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx
-RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx
+RWStepDimTol_RWGeoTolAndGeoTolWthMod.pxx
 RWStepDimTol_RWLineProfileTolerance.cxx
-RWStepDimTol_RWLineProfileTolerance.hxx
+RWStepDimTol_RWLineProfileTolerance.pxx
 RWStepDimTol_RWModifiedGeometricTolerance.cxx
-RWStepDimTol_RWModifiedGeometricTolerance.hxx
+RWStepDimTol_RWModifiedGeometricTolerance.pxx
 RWStepDimTol_RWNonUniformZoneDefinition.cxx
-RWStepDimTol_RWNonUniformZoneDefinition.hxx
+RWStepDimTol_RWNonUniformZoneDefinition.pxx
 RWStepDimTol_RWParallelismTolerance.cxx
-RWStepDimTol_RWParallelismTolerance.hxx
+RWStepDimTol_RWParallelismTolerance.pxx
 RWStepDimTol_RWPerpendicularityTolerance.cxx
-RWStepDimTol_RWPerpendicularityTolerance.hxx
+RWStepDimTol_RWPerpendicularityTolerance.pxx
 RWStepDimTol_RWPlacedDatumTargetFeature.cxx
-RWStepDimTol_RWPlacedDatumTargetFeature.hxx
+RWStepDimTol_RWPlacedDatumTargetFeature.pxx
 RWStepDimTol_RWPositionTolerance.cxx
-RWStepDimTol_RWPositionTolerance.hxx
+RWStepDimTol_RWPositionTolerance.pxx
 RWStepDimTol_RWProjectedZoneDefinition.cxx
-RWStepDimTol_RWProjectedZoneDefinition.hxx
+RWStepDimTol_RWProjectedZoneDefinition.pxx
 RWStepDimTol_RWRoundnessTolerance.cxx
-RWStepDimTol_RWRoundnessTolerance.hxx
+RWStepDimTol_RWRoundnessTolerance.pxx
 RWStepDimTol_RWRunoutZoneDefinition.cxx
-RWStepDimTol_RWRunoutZoneDefinition.hxx
+RWStepDimTol_RWRunoutZoneDefinition.pxx
 RWStepDimTol_RWRunoutZoneOrientation.cxx
-RWStepDimTol_RWRunoutZoneOrientation.hxx
+RWStepDimTol_RWRunoutZoneOrientation.pxx
 RWStepDimTol_RWStraightnessTolerance.cxx
-RWStepDimTol_RWStraightnessTolerance.hxx
+RWStepDimTol_RWStraightnessTolerance.pxx
 RWStepDimTol_RWSurfaceProfileTolerance.cxx
-RWStepDimTol_RWSurfaceProfileTolerance.hxx
+RWStepDimTol_RWSurfaceProfileTolerance.pxx
 RWStepDimTol_RWSymmetryTolerance.cxx
-RWStepDimTol_RWSymmetryTolerance.hxx
+RWStepDimTol_RWSymmetryTolerance.pxx
 RWStepDimTol_RWToleranceZone.cxx
-RWStepDimTol_RWToleranceZone.hxx
+RWStepDimTol_RWToleranceZone.pxx
 RWStepDimTol_RWToleranceZoneDefinition.cxx
-RWStepDimTol_RWToleranceZoneDefinition.hxx
+RWStepDimTol_RWToleranceZoneDefinition.pxx
 RWStepDimTol_RWToleranceZoneForm.cxx
-RWStepDimTol_RWToleranceZoneForm.hxx
+RWStepDimTol_RWToleranceZoneForm.pxx
 RWStepDimTol_RWTotalRunoutTolerance.cxx
-RWStepDimTol_RWTotalRunoutTolerance.hxx
+RWStepDimTol_RWTotalRunoutTolerance.pxx
 RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
-RWStepDimTol_RWUnequallyDisposedGeometricTolerance.hxx
+RWStepDimTol_RWUnequallyDisposedGeometricTolerance.pxx
diff --git a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
index ba27327952..13d6419a83 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWAngularityTolerance.hxx>
+#include "RWStepDimTol_RWAngularityTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.pxx
index 93433872ba..9a14e349d0 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWAngularityTolerance();
+  Standard_HIDDEN RWStepDimTol_RWAngularityTolerance();
   
   //! Reads AngularityTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_AngularityTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_AngularityTolerance)& ent) const;
   
   //! Writes AngularityTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_AngularityTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_AngularityTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_AngularityTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_AngularityTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
index 3fec1c958e..0cc58bf7ee 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWCircularRunoutTolerance.hxx>
+#include "RWStepDimTol_RWCircularRunoutTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.pxx
index 6e5979b6d3..8566368ec1 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWCircularRunoutTolerance();
+  Standard_HIDDEN RWStepDimTol_RWCircularRunoutTolerance();
   
   //! Reads CircularRunoutTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CircularRunoutTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CircularRunoutTolerance)& ent) const;
   
   //! Writes CircularRunoutTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CircularRunoutTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CircularRunoutTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_CircularRunoutTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_CircularRunoutTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
index 454f74096a..3c4bc63e60 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWCoaxialityTolerance.hxx>
+#include "RWStepDimTol_RWCoaxialityTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.pxx
index 13c2015327..2292fd8da5 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWCoaxialityTolerance();
+  Standard_HIDDEN RWStepDimTol_RWCoaxialityTolerance();
   
   //! Reads CoaxialityTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CoaxialityTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CoaxialityTolerance)& ent) const;
   
   //! Writes CoaxialityTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CoaxialityTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CoaxialityTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_CoaxialityTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_CoaxialityTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.cxx b/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.cxx
index 2a92d0abd0..4caccb4732 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWCommonDatum.hxx>
+#include "RWStepDimTol_RWCommonDatum.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_CommonDatum.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.hxx b/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWCommonDatum.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWCommonDatum.pxx
index 4316132351..a067afd37b 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCommonDatum.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWCommonDatum();
+  Standard_HIDDEN RWStepDimTol_RWCommonDatum();
   
   //! Reads CommonDatum
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CommonDatum)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CommonDatum)& ent) const;
   
   //! Writes CommonDatum
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CommonDatum)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CommonDatum)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_CommonDatum)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_CommonDatum)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
index ece94b06bb..58c751306d 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWConcentricityTolerance.hxx>
+#include "RWStepDimTol_RWConcentricityTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.pxx
index 81ae7174df..539390a7cf 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWConcentricityTolerance();
+  Standard_HIDDEN RWStepDimTol_RWConcentricityTolerance();
   
   //! Reads ConcentricityTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ConcentricityTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ConcentricityTolerance)& ent) const;
   
   //! Writes ConcentricityTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ConcentricityTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ConcentricityTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_ConcentricityTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_ConcentricityTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
index 253acdf8a2..669f013b5a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWCylindricityTolerance.hxx>
+#include "RWStepDimTol_RWCylindricityTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.pxx
index 632e848756..cd4adc9a99 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWCylindricityTolerance();
+  Standard_HIDDEN RWStepDimTol_RWCylindricityTolerance();
   
   //! Reads CylindricityTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CylindricityTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_CylindricityTolerance)& ent) const;
   
   //! Writes CylindricityTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CylindricityTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_CylindricityTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_CylindricityTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_CylindricityTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatum.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatum.cxx
index 56bf9e8955..218c239d15 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatum.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatum.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWDatum.hxx>
+#include "RWStepDimTol_RWDatum.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_Datum.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatum.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatum.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWDatum.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatum.pxx
index 4ac225591b..09d833bf11 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatum.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatum.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatum();
+  Standard_HIDDEN RWStepDimTol_RWDatum();
   
   //! Reads Datum
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_Datum)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_Datum)& ent) const;
   
   //! Writes Datum
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_Datum)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_Datum)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_Datum)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_Datum)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.cxx
index b3557da51f..47857ef1b4 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWDatumFeature.hxx>
+#include "RWStepDimTol_RWDatumFeature.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_DatumFeature.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWDatumFeature.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatumFeature.pxx
index ce1afcb326..e5096c9b85 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumFeature.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatumFeature();
+  Standard_HIDDEN RWStepDimTol_RWDatumFeature();
   
   //! Reads DatumFeature
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumFeature)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumFeature)& ent) const;
   
   //! Writes DatumFeature
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumFeature)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumFeature)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_DatumFeature)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_DatumFeature)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReference.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReference.cxx
index 3cc2bbe946..bff05969f5 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReference.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReference.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWDatumReference.hxx>
+#include "RWStepDimTol_RWDatumReference.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_Datum.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReference.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReference.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWDatumReference.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatumReference.pxx
index 8b9291ac36..4dd051df5b 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReference.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReference.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatumReference();
+  Standard_HIDDEN RWStepDimTol_RWDatumReference();
   
   //! Reads DatumReference
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReference)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReference)& ent) const;
   
   //! Writes DatumReference
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReference)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReference)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_DatumReference)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_DatumReference)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx
index 591e284c81..3dea27eee9 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWDatumReferenceCompartment.hxx>
+#include "RWStepDimTol_RWDatumReferenceCompartment.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.pxx
index d493accee5..f805fda122 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatumReferenceCompartment();
+  Standard_HIDDEN RWStepDimTol_RWDatumReferenceCompartment();
   
   //! Reads DatumReferenceElement
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReferenceCompartment)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReferenceCompartment)& ent)  const;
   
   //! Writes DatumReferenceElement
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReferenceCompartment)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReferenceCompartment)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_DatumReferenceCompartment)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_DatumReferenceCompartment)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWDatumReferenceCompartment_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx
index 29a5d043e7..b8a0915dec 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWDatumReferenceElement.hxx>
+#include "RWStepDimTol_RWDatumReferenceElement.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.pxx
index 0f9fc720b7..37fdc0561c 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatumReferenceElement();
+  Standard_HIDDEN RWStepDimTol_RWDatumReferenceElement();
   
   //! Reads DatumReferenceElement
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReferenceElement)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReferenceElement)& ent)  const;
   
   //! Writes DatumReferenceElement
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReferenceElement)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReferenceElement)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_DatumReferenceElement)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_DatumReferenceElement)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWDatumReferenceElement_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.cxx
index 7cc08859dd..2b4a98bbcb 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWDatumReferenceModifierWithValue.hxx>
+#include "RWStepDimTol_RWDatumReferenceModifierWithValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.pxx
similarity index 89%
rename from src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.pxx
index 1a15910e49..c201fd6c83 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceModifierWithValue.pxx
@@ -37,12 +37,12 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatumReferenceModifierWithValue();
+  Standard_HIDDEN RWStepDimTol_RWDatumReferenceModifierWithValue();
   
   //! Reads DatumReferenceModifierWithValue
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReferenceModifierWithValue)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumReferenceModifierWithValue)& ent)  const;
   
   //! Writes DatumReferenceModifierWithValue
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReferenceModifierWithValue)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumReferenceModifierWithValue)& ent)  const;
 };
 #endif // _RWStepDimTol_RWDatumReferenceModifierWithValue_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.cxx
index 0399d21162..33db0e17ff 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWDatumSystem.hxx>
+#include "RWStepDimTol_RWDatumSystem.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWDatumSystem.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatumSystem.pxx
index bc77cc3988..70f132df87 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumSystem.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatumSystem();
+  Standard_HIDDEN RWStepDimTol_RWDatumSystem();
   
   //! Reads DatumSystem
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumSystem)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumSystem)& ent)  const;
   
   //! Writes DatumSystem
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumSystem)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumSystem)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_DatumSystem)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_DatumSystem)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWDatumSystem_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.cxx
index 73e6c719ac..36eccd8e5d 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWDatumTarget.hxx>
+#include "RWStepDimTol_RWDatumTarget.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_DatumTarget.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.hxx b/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWDatumTarget.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWDatumTarget.pxx
index 64692961e1..0b44d8032c 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumTarget.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWDatumTarget();
+  Standard_HIDDEN RWStepDimTol_RWDatumTarget();
   
   //! Reads DatumTarget
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumTarget)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_DatumTarget)& ent) const;
   
   //! Writes DatumTarget
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumTarget)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_DatumTarget)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_DatumTarget)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_DatumTarget)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
index dcd9f0eb36..4f5fb339d5 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWFlatnessTolerance.hxx>
+#include "RWStepDimTol_RWFlatnessTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.pxx
index 7c9a76d737..fa183e653b 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWFlatnessTolerance();
+  Standard_HIDDEN RWStepDimTol_RWFlatnessTolerance();
   
   //! Reads FlatnessTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_FlatnessTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_FlatnessTolerance)& ent) const;
   
   //! Writes FlatnessTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_FlatnessTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_FlatnessTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_FlatnessTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_FlatnessTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx
index e493785914..cf4e4f786a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWGeneralDatumReference.hxx>
+#include "RWStepDimTol_RWGeneralDatumReference.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.pxx
index 20240b4e9b..efd6e42437 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeneralDatumReference();
+  Standard_HIDDEN RWStepDimTol_RWGeneralDatumReference();
   
   //! Reads GeneralDatumReference
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeneralDatumReference)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeneralDatumReference)& ent)  const;
   
   //! Writes GeneralDatumReference
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeneralDatumReference)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeneralDatumReference)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_GeneralDatumReference)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_GeneralDatumReference)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWGeneralDatumReference_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
index 5dacbeedba..640cf066ae 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx>
+#include "RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.pxx
index 435a7b4e6d..ead8cf4cd2 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepDimTol_RWGeoTolAndGeoTolWthDatRef();
+  Standard_HIDDEN RWStepDimTol_RWGeoTolAndGeoTolWthDatRef();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRef)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRef)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRef)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRef)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRef)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRef)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepDimTol_RWGeoTolAndGeoTolWthDatRef_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
index 059a5e9b39..bea8353ea9 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
+#include "RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.pxx"
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.pxx
index 228879a4cd..3e1be934b5 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol();
+  Standard_HIDDEN RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
index 9060524b3a..5b22293033 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
+#include "RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.pxx
index 30e1848018..eefd8d2da8 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod();
+  Standard_HIDDEN RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
index 930e3f2ee8..1130e5f390 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
+#include "RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.pxx
index 4f89d73fdc..594926e4f7 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.pxx
@@ -36,13 +36,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol();
+  Standard_HIDDEN RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
index da42f6c5a2..a90282ee8a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
+#include "RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.pxx
index 57156b561e..f2ff19313f 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol();
+  Standard_HIDDEN RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx
index d2dcc8ae9a..fccb3a93b7 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx>
+#include "RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.pxx"
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.pxx
index 9826f9e16f..704fbf59bb 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol();
+  Standard_HIDDEN RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx
index 48fcd508b7..9c590bfe26 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx>
+#include "RWStepDimTol_RWGeoTolAndGeoTolWthMod.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.pxx
similarity index 85%
rename from src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.pxx
index ff2fda224d..f9424fee6c 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepDimTol_RWGeoTolAndGeoTolWthMod();
+  Standard_HIDDEN RWStepDimTol_RWGeoTolAndGeoTolWthMod();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthMod)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeoTolAndGeoTolWthMod)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthMod)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeoTolAndGeoTolWthMod)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthMod)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeoTolAndGeoTolWthMod)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepDimTol_RWGeoTolAndGeoTolWthMod_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx
index 975bbe984d..4ca74586bd 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeometricTolerance.hxx>
+#include "RWStepDimTol_RWGeometricTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.pxx
index 49afcca5ea..33122c58ca 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeometricTolerance();
+  Standard_HIDDEN RWStepDimTol_RWGeometricTolerance();
   
   //! Reads GeometricTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricTolerance)& ent) const;
   
   //! Writes GeometricTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeometricTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeometricTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.cxx
index d7dc1e0add..48ed2db8a8 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeometricToleranceRelationship.hxx>
+#include "RWStepDimTol_RWGeometricToleranceRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.pxx
index 58308ba327..1eda0a7441 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeometricToleranceRelationship();
+  Standard_HIDDEN RWStepDimTol_RWGeometricToleranceRelationship();
   
   //! Reads GeometricToleranceRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceRelationship)& ent) const;
   
   //! Writes GeometricToleranceRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeometricToleranceRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeometricToleranceRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx
index 433668d86c..01b200cd00 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx>
+#include "RWStepDimTol_RWGeometricToleranceWithDatumReference.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.pxx
similarity index 88%
rename from src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.pxx
index 1a45f15446..b2f76c891e 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeometricToleranceWithDatumReference();
+  Standard_HIDDEN RWStepDimTol_RWGeometricToleranceWithDatumReference();
   
   //! Reads GeometricToleranceWithDatumReference
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& ent) const;
   
   //! Writes GeometricToleranceWithDatumReference
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
index 0f0172d5a1..8a950bc003 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.hxx>
+#include "RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.pxx
index 64d8e57f4b..407c4ed20c 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit();
+  Standard_HIDDEN RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit();
   
   //! Reads GeometricToleranceWithDefinedAreaUnit
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithDefinedAreaUnit)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithDefinedAreaUnit)& ent)  const;
   
   //! Writes GeometricToleranceWithDefinedAreaUnit
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithDefinedAreaUnit)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithDefinedAreaUnit)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_GeometricToleranceWithDefinedAreaUnit)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_GeometricToleranceWithDefinedAreaUnit)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx
index fb1513d4bd..6d080b704f 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWGeometricToleranceWithDefinedUnit.hxx>
+#include "RWStepDimTol_RWGeometricToleranceWithDefinedUnit.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.pxx
index de957cce37..9f38500cf4 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeometricToleranceWithDefinedUnit();
+  Standard_HIDDEN RWStepDimTol_RWGeometricToleranceWithDefinedUnit();
   
   //! Reads GeometricToleranceWithDefinedUnit
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithDefinedUnit)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithDefinedUnit)& ent)  const;
   
   //! Writes GeometricToleranceWithDefinedUnit
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithDefinedUnit)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithDefinedUnit)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_GeometricToleranceWithDefinedUnit)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_GeometricToleranceWithDefinedUnit)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWGeometricToleranceWithDefinedUnit_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
index 3c2d9b7ee7..a5a581ab4e 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.hxx>
+#include "RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.pxx"
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.pxx
index f44e5c8cf1..84ec34c93c 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeometricToleranceWithMaximumTolerance();
+  Standard_HIDDEN RWStepDimTol_RWGeometricToleranceWithMaximumTolerance();
   
   //! Reads GeometricToleranceWithMaximumTolerance
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithMaximumTolerance)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithMaximumTolerance)& ent)  const;
   
   //! Writes GeometricToleranceWithMaximumTolerance
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithMaximumTolerance)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithMaximumTolerance)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_GeometricToleranceWithMaximumTolerance)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_GeometricToleranceWithMaximumTolerance)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWGeometricToleranceWithMaximumTolerance_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx
index 83273b5f82..9e8e54709b 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWGeometricToleranceWithModifiers.hxx>
+#include "RWStepDimTol_RWGeometricToleranceWithModifiers.pxx"
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.hxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.pxx
index 074a6fe7f3..49fabe68de 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWGeometricToleranceWithModifiers();
+  Standard_HIDDEN RWStepDimTol_RWGeometricToleranceWithModifiers();
   
   //! Reads GeometricToleranceWithModifiers
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithModifiers)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_GeometricToleranceWithModifiers)& ent)  const;
   
   //! Writes GeometricToleranceWithModifiers
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithModifiers)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_GeometricToleranceWithModifiers)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_GeometricToleranceWithModifiers)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_GeometricToleranceWithModifiers)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWGeometricToleranceWithModifiers_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx
index e847c65d7d..9156d0b7f0 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWLineProfileTolerance.hxx>
+#include "RWStepDimTol_RWLineProfileTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.pxx
index 48cd9c2a4d..3581303322 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWLineProfileTolerance();
+  Standard_HIDDEN RWStepDimTol_RWLineProfileTolerance();
   
   //! Reads LineProfileTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_LineProfileTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_LineProfileTolerance)& ent) const;
   
   //! Writes LineProfileTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_LineProfileTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_LineProfileTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_LineProfileTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_LineProfileTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
index e5a1a9abc4..009b4324cb 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWModifiedGeometricTolerance.hxx>
+#include "RWStepDimTol_RWModifiedGeometricTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.pxx
index 50d71541c7..47caba6405 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWModifiedGeometricTolerance();
+  Standard_HIDDEN RWStepDimTol_RWModifiedGeometricTolerance();
   
   //! Reads ModifiedGeometricTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ModifiedGeometricTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ModifiedGeometricTolerance)& ent) const;
   
   //! Writes ModifiedGeometricTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ModifiedGeometricTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ModifiedGeometricTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_ModifiedGeometricTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_ModifiedGeometricTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx
index f38ce30f58..8629bca46f 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWNonUniformZoneDefinition.hxx>
+#include "RWStepDimTol_RWNonUniformZoneDefinition.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.hxx b/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.pxx
index 170d2fca56..75a5fc7bce 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWNonUniformZoneDefinition();
+  Standard_HIDDEN RWStepDimTol_RWNonUniformZoneDefinition();
   
   //! Reads NonUniformZoneDefinition
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_NonUniformZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_NonUniformZoneDefinition)& ent)  const;
   
   //! Writes NonUniformZoneDefinition
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_NonUniformZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_NonUniformZoneDefinition)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_NonUniformZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_NonUniformZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWNonUniformZoneDefinition_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
index dd1905082e..40d150381a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWParallelismTolerance.hxx>
+#include "RWStepDimTol_RWParallelismTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.pxx
index 684390259a..1132083e1e 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWParallelismTolerance();
+  Standard_HIDDEN RWStepDimTol_RWParallelismTolerance();
   
   //! Reads ParallelismTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ParallelismTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ParallelismTolerance)& ent) const;
   
   //! Writes ParallelismTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ParallelismTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ParallelismTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_ParallelismTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_ParallelismTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
index 4c8e604162..8ef6d77608 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWPerpendicularityTolerance.hxx>
+#include "RWStepDimTol_RWPerpendicularityTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.pxx
index 1524250395..aa75948f2b 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWPerpendicularityTolerance();
+  Standard_HIDDEN RWStepDimTol_RWPerpendicularityTolerance();
   
   //! Reads PerpendicularityTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_PerpendicularityTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_PerpendicularityTolerance)& ent) const;
   
   //! Writes PerpendicularityTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_PerpendicularityTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_PerpendicularityTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_PerpendicularityTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_PerpendicularityTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.cxx b/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.cxx
index eb230b1674..6ee61a556e 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWPlacedDatumTargetFeature.hxx>
+#include "RWStepDimTol_RWPlacedDatumTargetFeature.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_PlacedDatumTargetFeature.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.hxx b/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.pxx
index cc305f2dd8..b8c0237baf 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPlacedDatumTargetFeature.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWPlacedDatumTargetFeature();
+  Standard_HIDDEN RWStepDimTol_RWPlacedDatumTargetFeature();
   
   //! Reads PlacedDatumTargetFeature
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_PlacedDatumTargetFeature)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_PlacedDatumTargetFeature)& ent) const;
   
   //! Writes PlacedDatumTargetFeature
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_PlacedDatumTargetFeature)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_PlacedDatumTargetFeature)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_PlacedDatumTargetFeature)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_PlacedDatumTargetFeature)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
index f5baa2148e..d6e6a8f0e3 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWPositionTolerance.hxx>
+#include "RWStepDimTol_RWPositionTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.pxx
index eeb68087d4..0533181476 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWPositionTolerance();
+  Standard_HIDDEN RWStepDimTol_RWPositionTolerance();
   
   //! Reads PositionTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_PositionTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_PositionTolerance)& ent) const;
   
   //! Writes PositionTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_PositionTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_PositionTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_PositionTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_PositionTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx
index 0e8a57efd6..ce7cc41f77 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWProjectedZoneDefinition.hxx>
+#include "RWStepDimTol_RWProjectedZoneDefinition.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.hxx b/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.pxx
index ee4b64d931..eba57533e8 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWProjectedZoneDefinition();
+  Standard_HIDDEN RWStepDimTol_RWProjectedZoneDefinition();
   
   //! Reads ProjectedZoneDefinition
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ProjectedZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ProjectedZoneDefinition)& ent)  const;
   
   //! Writes ProjectedZoneDefinition
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ProjectedZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ProjectedZoneDefinition)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_ProjectedZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_ProjectedZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWProjectedZoneDefinition_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
index a50bc4493a..f32385f8a3 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWRoundnessTolerance.hxx>
+#include "RWStepDimTol_RWRoundnessTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.pxx
index 2ad6196dcb..b022f4ab1f 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWRoundnessTolerance();
+  Standard_HIDDEN RWStepDimTol_RWRoundnessTolerance();
   
   //! Reads RoundnessTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_RoundnessTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_RoundnessTolerance)& ent) const;
   
   //! Writes RoundnessTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_RoundnessTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_RoundnessTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_RoundnessTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_RoundnessTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx
index d5c77b1fbf..6a9859abff 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWRunoutZoneDefinition.hxx>
+#include "RWStepDimTol_RWRunoutZoneDefinition.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.hxx b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.pxx
index 223fc7924e..8a6f881a3f 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWRunoutZoneDefinition();
+  Standard_HIDDEN RWStepDimTol_RWRunoutZoneDefinition();
   
   //! Reads RunoutZoneDefinition
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_RunoutZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_RunoutZoneDefinition)& ent)  const;
   
   //! Writes RunoutZoneDefinition
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_RunoutZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_RunoutZoneDefinition)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_RunoutZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_RunoutZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWRunoutZoneDefinition_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.cxx b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.cxx
index d12aa28953..1405699c07 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWRunoutZoneOrientation.hxx>
+#include "RWStepDimTol_RWRunoutZoneOrientation.pxx"
 
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.hxx b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.pxx
similarity index 89%
rename from src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.pxx
index 65a6f1dec4..e531252fa0 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneOrientation.pxx
@@ -37,13 +37,13 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWRunoutZoneOrientation();
+  Standard_HIDDEN RWStepDimTol_RWRunoutZoneOrientation();
   
   //! Reads RunoutZoneOrientation
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_RunoutZoneOrientation)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_RunoutZoneOrientation)& ent)  const;
   
   //! Writes RunoutZoneOrientation
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_RunoutZoneOrientation)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_RunoutZoneOrientation)& ent)  const;
   
 };
 #endif // _RWStepDimTol_RWRunoutZoneOrientation_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
index a11e7ce94a..e57b53b95d 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWStraightnessTolerance.hxx>
+#include "RWStepDimTol_RWStraightnessTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.pxx
index d9a9b2cee1..fa40e96df0 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWStraightnessTolerance();
+  Standard_HIDDEN RWStepDimTol_RWStraightnessTolerance();
   
   //! Reads StraightnessTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_StraightnessTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_StraightnessTolerance)& ent) const;
   
   //! Writes StraightnessTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_StraightnessTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_StraightnessTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_StraightnessTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_StraightnessTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
index a378a129ef..f9fa115f16 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWSurfaceProfileTolerance.hxx>
+#include "RWStepDimTol_RWSurfaceProfileTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.pxx
index aacc5a1449..67930f018a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWSurfaceProfileTolerance();
+  Standard_HIDDEN RWStepDimTol_RWSurfaceProfileTolerance();
   
   //! Reads SurfaceProfileTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_SurfaceProfileTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_SurfaceProfileTolerance)& ent) const;
   
   //! Writes SurfaceProfileTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_SurfaceProfileTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_SurfaceProfileTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_SurfaceProfileTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_SurfaceProfileTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
index 9c4795b991..871c255c0a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWSymmetryTolerance.hxx>
+#include "RWStepDimTol_RWSymmetryTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.pxx
index 2e81996053..6c07a5173a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWSymmetryTolerance();
+  Standard_HIDDEN RWStepDimTol_RWSymmetryTolerance();
   
   //! Reads SymmetryTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_SymmetryTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_SymmetryTolerance)& ent) const;
   
   //! Writes SymmetryTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_SymmetryTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_SymmetryTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_SymmetryTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_SymmetryTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.cxx b/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.cxx
index d2dde91867..0d56a713e7 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWToleranceZone.hxx>
+#include "RWStepDimTol_RWToleranceZone.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.hxx b/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.pxx
similarity index 86%
rename from src/RWStepDimTol/RWStepDimTol_RWToleranceZone.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWToleranceZone.pxx
index 06d3349ce1..c6ade0fc14 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWToleranceZone.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWToleranceZone();
+  Standard_HIDDEN RWStepDimTol_RWToleranceZone();
   
   //! Reads ToleranceZone
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ToleranceZone)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ToleranceZone)& ent)  const;
   
   //! Writes ToleranceZone
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ToleranceZone)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ToleranceZone)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_ToleranceZone)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_ToleranceZone)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWToleranceZone_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx
index 215c99e432..c078410952 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWToleranceZoneDefinition.hxx>
+#include "RWStepDimTol_RWToleranceZoneDefinition.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.hxx b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.pxx
index a951803e7f..ad944eea37 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWToleranceZoneDefinition();
+  Standard_HIDDEN RWStepDimTol_RWToleranceZoneDefinition();
   
   //! Reads ToleranceZoneDefinition
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ToleranceZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ToleranceZoneDefinition)& ent)  const;
   
   //! Writes ToleranceZoneDefinition
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ToleranceZoneDefinition)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ToleranceZoneDefinition)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_ToleranceZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_ToleranceZoneDefinition)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWToleranceZoneDefinition_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.cxx b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.cxx
index 18f8e9fc51..a6598be5ff 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWToleranceZoneForm.hxx>
+#include "RWStepDimTol_RWToleranceZoneForm.pxx"
 
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.hxx b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.pxx
similarity index 89%
rename from src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.pxx
index 49fe35db33..afc15a938c 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneForm.pxx
@@ -37,13 +37,13 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWToleranceZoneForm();
+  Standard_HIDDEN RWStepDimTol_RWToleranceZoneForm();
   
   //! Reads ToleranceZoneForm
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ToleranceZoneForm)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_ToleranceZoneForm)& ent)  const;
   
   //! Writes ToleranceZoneForm
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ToleranceZoneForm)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_ToleranceZoneForm)& ent)  const;
 
 };
 #endif // _RWStepDimTol_RWToleranceZoneForm_HeaderFile
diff --git a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
index b9474c4a63..036efb1541 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepDimTol_RWTotalRunoutTolerance.hxx>
+#include "RWStepDimTol_RWTotalRunoutTolerance.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.pxx
index 684b3234ae..66e831411f 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWTotalRunoutTolerance();
+  Standard_HIDDEN RWStepDimTol_RWTotalRunoutTolerance();
   
   //! Reads TotalRunoutTolerance
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_TotalRunoutTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_TotalRunoutTolerance)& ent) const;
   
   //! Writes TotalRunoutTolerance
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_TotalRunoutTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_TotalRunoutTolerance)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepDimTol_TotalRunoutTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepDimTol_TotalRunoutTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
index 0e29dc84b5..2dac10b3ea 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepDimTol_RWUnequallyDisposedGeometricTolerance.hxx>
+#include "RWStepDimTol_RWUnequallyDisposedGeometricTolerance.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.hxx b/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.pxx
similarity index 87%
rename from src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.hxx
rename to src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.pxx
index b119e856f0..746d07537a 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.hxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepDimTol_RWUnequallyDisposedGeometricTolerance();
+  Standard_HIDDEN RWStepDimTol_RWUnequallyDisposedGeometricTolerance();
   
   //! Reads UnequallyDisposedGeometricTolerance
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& ent)  const;
   
   //! Writes UnequallyDisposedGeometricTolerance
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepDimTol_RWUnequallyDisposedGeometricTolerance_HeaderFile
diff --git a/src/RWStepElement/FILES b/src/RWStepElement/FILES
index cdde9668b8..31a0856571 100644
--- a/src/RWStepElement/FILES
+++ b/src/RWStepElement/FILES
@@ -1,30 +1,30 @@
 RWStepElement_RWAnalysisItemWithinRepresentation.cxx
-RWStepElement_RWAnalysisItemWithinRepresentation.hxx
+RWStepElement_RWAnalysisItemWithinRepresentation.pxx
 RWStepElement_RWCurve3dElementDescriptor.cxx
-RWStepElement_RWCurve3dElementDescriptor.hxx
+RWStepElement_RWCurve3dElementDescriptor.pxx
 RWStepElement_RWCurveElementEndReleasePacket.cxx
-RWStepElement_RWCurveElementEndReleasePacket.hxx
+RWStepElement_RWCurveElementEndReleasePacket.pxx
 RWStepElement_RWCurveElementSectionDefinition.cxx
-RWStepElement_RWCurveElementSectionDefinition.hxx
+RWStepElement_RWCurveElementSectionDefinition.pxx
 RWStepElement_RWCurveElementSectionDerivedDefinitions.cxx
-RWStepElement_RWCurveElementSectionDerivedDefinitions.hxx
+RWStepElement_RWCurveElementSectionDerivedDefinitions.pxx
 RWStepElement_RWElementDescriptor.cxx
-RWStepElement_RWElementDescriptor.hxx
+RWStepElement_RWElementDescriptor.pxx
 RWStepElement_RWElementMaterial.cxx
-RWStepElement_RWElementMaterial.hxx
+RWStepElement_RWElementMaterial.pxx
 RWStepElement_RWSurface3dElementDescriptor.cxx
-RWStepElement_RWSurface3dElementDescriptor.hxx
+RWStepElement_RWSurface3dElementDescriptor.pxx
 RWStepElement_RWSurfaceElementProperty.cxx
-RWStepElement_RWSurfaceElementProperty.hxx
+RWStepElement_RWSurfaceElementProperty.pxx
 RWStepElement_RWSurfaceSection.cxx
-RWStepElement_RWSurfaceSection.hxx
+RWStepElement_RWSurfaceSection.pxx
 RWStepElement_RWSurfaceSectionField.cxx
-RWStepElement_RWSurfaceSectionField.hxx
+RWStepElement_RWSurfaceSectionField.pxx
 RWStepElement_RWSurfaceSectionFieldConstant.cxx
-RWStepElement_RWSurfaceSectionFieldConstant.hxx
+RWStepElement_RWSurfaceSectionFieldConstant.pxx
 RWStepElement_RWSurfaceSectionFieldVarying.cxx
-RWStepElement_RWSurfaceSectionFieldVarying.hxx
+RWStepElement_RWSurfaceSectionFieldVarying.pxx
 RWStepElement_RWUniformSurfaceSection.cxx
-RWStepElement_RWUniformSurfaceSection.hxx
+RWStepElement_RWUniformSurfaceSection.pxx
 RWStepElement_RWVolume3dElementDescriptor.cxx
-RWStepElement_RWVolume3dElementDescriptor.hxx
+RWStepElement_RWVolume3dElementDescriptor.pxx
diff --git a/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.cxx b/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.cxx
index fbab402b83..86af990ed5 100644
--- a/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.cxx
+++ b/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWAnalysisItemWithinRepresentation.hxx>
+#include "RWStepElement_RWAnalysisItemWithinRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.hxx b/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.hxx
rename to src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.pxx
index e4871d71ce..0142863ad7 100644
--- a/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.hxx
+++ b/src/RWStepElement/RWStepElement_RWAnalysisItemWithinRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWAnalysisItemWithinRepresentation();
+  Standard_HIDDEN RWStepElement_RWAnalysisItemWithinRepresentation();
   
   //! Reads AnalysisItemWithinRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_AnalysisItemWithinRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_AnalysisItemWithinRepresentation)& ent) const;
   
   //! Writes AnalysisItemWithinRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_AnalysisItemWithinRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_AnalysisItemWithinRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_AnalysisItemWithinRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_AnalysisItemWithinRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.cxx b/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.cxx
index 747d30808d..cf57619547 100644
--- a/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.cxx
+++ b/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWCurve3dElementDescriptor.hxx>
+#include "RWStepElement_RWCurve3dElementDescriptor.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_Curve3dElementDescriptor.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.hxx b/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.hxx
rename to src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.pxx
index eb00971fa7..7751cdf897 100644
--- a/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.hxx
+++ b/src/RWStepElement/RWStepElement_RWCurve3dElementDescriptor.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWCurve3dElementDescriptor();
+  Standard_HIDDEN RWStepElement_RWCurve3dElementDescriptor();
   
   //! Reads Curve3dElementDescriptor
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_Curve3dElementDescriptor)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_Curve3dElementDescriptor)& ent) const;
   
   //! Writes Curve3dElementDescriptor
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_Curve3dElementDescriptor)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_Curve3dElementDescriptor)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_Curve3dElementDescriptor)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_Curve3dElementDescriptor)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.cxx b/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.cxx
index ab6988a06e..a052cc58fc 100644
--- a/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.cxx
+++ b/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWCurveElementEndReleasePacket.hxx>
+#include "RWStepElement_RWCurveElementEndReleasePacket.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_CurveElementEndReleasePacket.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.hxx b/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.hxx
rename to src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.pxx
index 0e2734d3a3..d54c22b4f0 100644
--- a/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.hxx
+++ b/src/RWStepElement/RWStepElement_RWCurveElementEndReleasePacket.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWCurveElementEndReleasePacket();
+  Standard_HIDDEN RWStepElement_RWCurveElementEndReleasePacket();
   
   //! Reads CurveElementEndReleasePacket
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_CurveElementEndReleasePacket)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_CurveElementEndReleasePacket)& ent) const;
   
   //! Writes CurveElementEndReleasePacket
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_CurveElementEndReleasePacket)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_CurveElementEndReleasePacket)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_CurveElementEndReleasePacket)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_CurveElementEndReleasePacket)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.cxx b/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.cxx
index 9f20aae073..a920f500a4 100644
--- a/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.cxx
+++ b/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWCurveElementSectionDefinition.hxx>
+#include "RWStepElement_RWCurveElementSectionDefinition.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_CurveElementSectionDefinition.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.hxx b/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.hxx
rename to src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.pxx
index b74c2ffc66..cbffa69c66 100644
--- a/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.hxx
+++ b/src/RWStepElement/RWStepElement_RWCurveElementSectionDefinition.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWCurveElementSectionDefinition();
+  Standard_HIDDEN RWStepElement_RWCurveElementSectionDefinition();
   
   //! Reads CurveElementSectionDefinition
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_CurveElementSectionDefinition)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_CurveElementSectionDefinition)& ent) const;
   
   //! Writes CurveElementSectionDefinition
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_CurveElementSectionDefinition)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_CurveElementSectionDefinition)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_CurveElementSectionDefinition)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_CurveElementSectionDefinition)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.cxx b/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.cxx
index d5b62ee529..1d1c627ead 100644
--- a/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.cxx
+++ b/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWCurveElementSectionDerivedDefinitions.hxx>
+#include "RWStepElement_RWCurveElementSectionDerivedDefinitions.pxx"
 #include <Standard_Real.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.hxx b/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.pxx
similarity index 88%
rename from src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.hxx
rename to src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.pxx
index 155d8135ab..b73651b553 100644
--- a/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.hxx
+++ b/src/RWStepElement/RWStepElement_RWCurveElementSectionDerivedDefinitions.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWCurveElementSectionDerivedDefinitions();
+  Standard_HIDDEN RWStepElement_RWCurveElementSectionDerivedDefinitions();
   
   //! Reads CurveElementSectionDerivedDefinitions
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_CurveElementSectionDerivedDefinitions)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_CurveElementSectionDerivedDefinitions)& ent) const;
   
   //! Writes CurveElementSectionDerivedDefinitions
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_CurveElementSectionDerivedDefinitions)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_CurveElementSectionDerivedDefinitions)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_CurveElementSectionDerivedDefinitions)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_CurveElementSectionDerivedDefinitions)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWElementDescriptor.cxx b/src/RWStepElement/RWStepElement_RWElementDescriptor.cxx
index 4481407257..eb81335945 100644
--- a/src/RWStepElement/RWStepElement_RWElementDescriptor.cxx
+++ b/src/RWStepElement/RWStepElement_RWElementDescriptor.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWElementDescriptor.hxx>
+#include "RWStepElement_RWElementDescriptor.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_ElementDescriptor.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWElementDescriptor.hxx b/src/RWStepElement/RWStepElement_RWElementDescriptor.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWElementDescriptor.hxx
rename to src/RWStepElement/RWStepElement_RWElementDescriptor.pxx
index c6d881f02c..34c28b2fb0 100644
--- a/src/RWStepElement/RWStepElement_RWElementDescriptor.hxx
+++ b/src/RWStepElement/RWStepElement_RWElementDescriptor.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWElementDescriptor();
+  Standard_HIDDEN RWStepElement_RWElementDescriptor();
   
   //! Reads ElementDescriptor
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_ElementDescriptor)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_ElementDescriptor)& ent) const;
   
   //! Writes ElementDescriptor
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_ElementDescriptor)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_ElementDescriptor)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_ElementDescriptor)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_ElementDescriptor)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWElementMaterial.cxx b/src/RWStepElement/RWStepElement_RWElementMaterial.cxx
index bef0d44b2c..cdb9e1ace1 100644
--- a/src/RWStepElement/RWStepElement_RWElementMaterial.cxx
+++ b/src/RWStepElement/RWStepElement_RWElementMaterial.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWElementMaterial.hxx>
+#include "RWStepElement_RWElementMaterial.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_ElementMaterial.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWElementMaterial.hxx b/src/RWStepElement/RWStepElement_RWElementMaterial.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWElementMaterial.hxx
rename to src/RWStepElement/RWStepElement_RWElementMaterial.pxx
index 9c1e124b21..8a0de87bcd 100644
--- a/src/RWStepElement/RWStepElement_RWElementMaterial.hxx
+++ b/src/RWStepElement/RWStepElement_RWElementMaterial.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWElementMaterial();
+  Standard_HIDDEN RWStepElement_RWElementMaterial();
   
   //! Reads ElementMaterial
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_ElementMaterial)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_ElementMaterial)& ent) const;
   
   //! Writes ElementMaterial
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_ElementMaterial)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_ElementMaterial)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_ElementMaterial)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_ElementMaterial)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.cxx b/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.cxx
index 4e8da9a41d..8ea4ae61a6 100644
--- a/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.cxx
+++ b/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWSurface3dElementDescriptor.hxx>
+#include "RWStepElement_RWSurface3dElementDescriptor.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_HSequenceOfSurfaceElementPurposeMember.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.hxx b/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.hxx
rename to src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.pxx
index 235be5d6ea..f431bfeee4 100644
--- a/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.hxx
+++ b/src/RWStepElement/RWStepElement_RWSurface3dElementDescriptor.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWSurface3dElementDescriptor();
+  Standard_HIDDEN RWStepElement_RWSurface3dElementDescriptor();
   
   //! Reads Surface3dElementDescriptor
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_Surface3dElementDescriptor)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_Surface3dElementDescriptor)& ent) const;
   
   //! Writes Surface3dElementDescriptor
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_Surface3dElementDescriptor)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_Surface3dElementDescriptor)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_Surface3dElementDescriptor)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_Surface3dElementDescriptor)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.cxx b/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.cxx
index 17284bba7e..8544d201c8 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.cxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWSurfaceElementProperty.hxx>
+#include "RWStepElement_RWSurfaceElementProperty.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_SurfaceElementProperty.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.hxx b/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWSurfaceElementProperty.hxx
rename to src/RWStepElement/RWStepElement_RWSurfaceElementProperty.pxx
index 627acaf242..6ed903dbd7 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.hxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceElementProperty.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWSurfaceElementProperty();
+  Standard_HIDDEN RWStepElement_RWSurfaceElementProperty();
   
   //! Reads SurfaceElementProperty
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceElementProperty)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceElementProperty)& ent) const;
   
   //! Writes SurfaceElementProperty
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceElementProperty)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceElementProperty)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_SurfaceElementProperty)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_SurfaceElementProperty)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSection.cxx b/src/RWStepElement/RWStepElement_RWSurfaceSection.cxx
index d13125431d..1cefd8e485 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSection.cxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSection.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWSurfaceSection.hxx>
+#include "RWStepElement_RWSurfaceSection.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_SurfaceSection.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSection.hxx b/src/RWStepElement/RWStepElement_RWSurfaceSection.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWSurfaceSection.hxx
rename to src/RWStepElement/RWStepElement_RWSurfaceSection.pxx
index 0b87fa79f9..41bb1ff337 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSection.hxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSection.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWSurfaceSection();
+  Standard_HIDDEN RWStepElement_RWSurfaceSection();
   
   //! Reads SurfaceSection
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSection)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSection)& ent) const;
   
   //! Writes SurfaceSection
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSection)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSection)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_SurfaceSection)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_SurfaceSection)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSectionField.cxx b/src/RWStepElement/RWStepElement_RWSurfaceSectionField.cxx
index 606ad952ed..bd34646f58 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSectionField.cxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSectionField.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWSurfaceSectionField.hxx>
+#include "RWStepElement_RWSurfaceSectionField.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_SurfaceSectionField.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSectionField.hxx b/src/RWStepElement/RWStepElement_RWSurfaceSectionField.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWSurfaceSectionField.hxx
rename to src/RWStepElement/RWStepElement_RWSurfaceSectionField.pxx
index 951d992ca2..b8e488ff6f 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSectionField.hxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSectionField.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWSurfaceSectionField();
+  Standard_HIDDEN RWStepElement_RWSurfaceSectionField();
   
   //! Reads SurfaceSectionField
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSectionField)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSectionField)& ent) const;
   
   //! Writes SurfaceSectionField
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSectionField)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSectionField)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_SurfaceSectionField)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_SurfaceSectionField)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.cxx b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.cxx
index 3d78fdbbdd..da957b4e33 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.cxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWSurfaceSectionFieldConstant.hxx>
+#include "RWStepElement_RWSurfaceSectionFieldConstant.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_SurfaceSection.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.hxx b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.hxx
rename to src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.pxx
index 6a60df4e55..c7271333d3 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.hxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldConstant.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWSurfaceSectionFieldConstant();
+  Standard_HIDDEN RWStepElement_RWSurfaceSectionFieldConstant();
   
   //! Reads SurfaceSectionFieldConstant
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSectionFieldConstant)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSectionFieldConstant)& ent) const;
   
   //! Writes SurfaceSectionFieldConstant
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSectionFieldConstant)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSectionFieldConstant)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_SurfaceSectionFieldConstant)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_SurfaceSectionFieldConstant)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.cxx b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.cxx
index 37eca4fe3c..d451f052c2 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.cxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWSurfaceSectionFieldVarying.hxx>
+#include "RWStepElement_RWSurfaceSectionFieldVarying.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_SurfaceSection.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.hxx b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.hxx
rename to src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.pxx
index 28544d5123..e20310e961 100644
--- a/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.hxx
+++ b/src/RWStepElement/RWStepElement_RWSurfaceSectionFieldVarying.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWSurfaceSectionFieldVarying();
+  Standard_HIDDEN RWStepElement_RWSurfaceSectionFieldVarying();
   
   //! Reads SurfaceSectionFieldVarying
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSectionFieldVarying)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_SurfaceSectionFieldVarying)& ent) const;
   
   //! Writes SurfaceSectionFieldVarying
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSectionFieldVarying)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_SurfaceSectionFieldVarying)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_SurfaceSectionFieldVarying)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_SurfaceSectionFieldVarying)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.cxx b/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.cxx
index 0139f37efe..8cf76dc21f 100644
--- a/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.cxx
+++ b/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWUniformSurfaceSection.hxx>
+#include "RWStepElement_RWUniformSurfaceSection.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_UniformSurfaceSection.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.hxx b/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWUniformSurfaceSection.hxx
rename to src/RWStepElement/RWStepElement_RWUniformSurfaceSection.pxx
index 626692acc9..6baad93dc8 100644
--- a/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.hxx
+++ b/src/RWStepElement/RWStepElement_RWUniformSurfaceSection.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWUniformSurfaceSection();
+  Standard_HIDDEN RWStepElement_RWUniformSurfaceSection();
   
   //! Reads UniformSurfaceSection
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_UniformSurfaceSection)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_UniformSurfaceSection)& ent) const;
   
   //! Writes UniformSurfaceSection
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_UniformSurfaceSection)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_UniformSurfaceSection)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_UniformSurfaceSection)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_UniformSurfaceSection)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.cxx b/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.cxx
index 81df941c16..2de8d9bd9c 100644
--- a/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.cxx
+++ b/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepElement_RWVolume3dElementDescriptor.hxx>
+#include "RWStepElement_RWVolume3dElementDescriptor.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_Volume3dElementDescriptor.hxx>
diff --git a/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.hxx b/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.pxx
similarity index 87%
rename from src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.hxx
rename to src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.pxx
index 961cde80fd..2ab0fc32b2 100644
--- a/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.hxx
+++ b/src/RWStepElement/RWStepElement_RWVolume3dElementDescriptor.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepElement_RWVolume3dElementDescriptor();
+  Standard_HIDDEN RWStepElement_RWVolume3dElementDescriptor();
   
   //! Reads Volume3dElementDescriptor
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_Volume3dElementDescriptor)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepElement_Volume3dElementDescriptor)& ent) const;
   
   //! Writes Volume3dElementDescriptor
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_Volume3dElementDescriptor)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepElement_Volume3dElementDescriptor)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepElement_Volume3dElementDescriptor)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepElement_Volume3dElementDescriptor)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/FILES b/src/RWStepFEA/FILES
index 944aaa3dc8..25abdc7507 100644
--- a/src/RWStepFEA/FILES
+++ b/src/RWStepFEA/FILES
@@ -1,104 +1,104 @@
 RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.cxx
-RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.hxx
+RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.pxx
 RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.cxx
-RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.hxx
+RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.pxx
 RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.cxx
-RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.hxx
+RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.pxx
 RWStepFEA_RWConstantSurface3dElementCoordinateSystem.cxx
-RWStepFEA_RWConstantSurface3dElementCoordinateSystem.hxx
+RWStepFEA_RWConstantSurface3dElementCoordinateSystem.pxx
 RWStepFEA_RWCurve3dElementProperty.cxx
-RWStepFEA_RWCurve3dElementProperty.hxx
+RWStepFEA_RWCurve3dElementProperty.pxx
 RWStepFEA_RWCurve3dElementRepresentation.cxx
-RWStepFEA_RWCurve3dElementRepresentation.hxx
+RWStepFEA_RWCurve3dElementRepresentation.pxx
 RWStepFEA_RWCurveElementEndOffset.cxx
-RWStepFEA_RWCurveElementEndOffset.hxx
+RWStepFEA_RWCurveElementEndOffset.pxx
 RWStepFEA_RWCurveElementEndRelease.cxx
-RWStepFEA_RWCurveElementEndRelease.hxx
+RWStepFEA_RWCurveElementEndRelease.pxx
 RWStepFEA_RWCurveElementInterval.cxx
-RWStepFEA_RWCurveElementInterval.hxx
+RWStepFEA_RWCurveElementInterval.pxx
 RWStepFEA_RWCurveElementIntervalConstant.cxx
-RWStepFEA_RWCurveElementIntervalConstant.hxx
+RWStepFEA_RWCurveElementIntervalConstant.pxx
 RWStepFEA_RWCurveElementIntervalLinearlyVarying.cxx
-RWStepFEA_RWCurveElementIntervalLinearlyVarying.hxx
+RWStepFEA_RWCurveElementIntervalLinearlyVarying.pxx
 RWStepFEA_RWCurveElementLocation.cxx
-RWStepFEA_RWCurveElementLocation.hxx
+RWStepFEA_RWCurveElementLocation.pxx
 RWStepFEA_RWDummyNode.cxx
-RWStepFEA_RWDummyNode.hxx
+RWStepFEA_RWDummyNode.pxx
 RWStepFEA_RWElementGeometricRelationship.cxx
-RWStepFEA_RWElementGeometricRelationship.hxx
+RWStepFEA_RWElementGeometricRelationship.pxx
 RWStepFEA_RWElementGroup.cxx
-RWStepFEA_RWElementGroup.hxx
+RWStepFEA_RWElementGroup.pxx
 RWStepFEA_RWElementRepresentation.cxx
-RWStepFEA_RWElementRepresentation.hxx
+RWStepFEA_RWElementRepresentation.pxx
 RWStepFEA_RWFeaAreaDensity.cxx
-RWStepFEA_RWFeaAreaDensity.hxx
+RWStepFEA_RWFeaAreaDensity.pxx
 RWStepFEA_RWFeaAxis2Placement3d.cxx
-RWStepFEA_RWFeaAxis2Placement3d.hxx
+RWStepFEA_RWFeaAxis2Placement3d.pxx
 RWStepFEA_RWFeaCurveSectionGeometricRelationship.cxx
-RWStepFEA_RWFeaCurveSectionGeometricRelationship.hxx
+RWStepFEA_RWFeaCurveSectionGeometricRelationship.pxx
 RWStepFEA_RWFeaGroup.cxx
-RWStepFEA_RWFeaGroup.hxx
+RWStepFEA_RWFeaGroup.pxx
 RWStepFEA_RWFeaLinearElasticity.cxx
-RWStepFEA_RWFeaLinearElasticity.hxx
+RWStepFEA_RWFeaLinearElasticity.pxx
 RWStepFEA_RWFeaMassDensity.cxx
-RWStepFEA_RWFeaMassDensity.hxx
+RWStepFEA_RWFeaMassDensity.pxx
 RWStepFEA_RWFeaMaterialPropertyRepresentation.cxx
-RWStepFEA_RWFeaMaterialPropertyRepresentation.hxx
+RWStepFEA_RWFeaMaterialPropertyRepresentation.pxx
 RWStepFEA_RWFeaMaterialPropertyRepresentationItem.cxx
-RWStepFEA_RWFeaMaterialPropertyRepresentationItem.hxx
+RWStepFEA_RWFeaMaterialPropertyRepresentationItem.pxx
 RWStepFEA_RWFeaModel.cxx
-RWStepFEA_RWFeaModel.hxx
+RWStepFEA_RWFeaModel.pxx
 RWStepFEA_RWFeaModel3d.cxx
-RWStepFEA_RWFeaModel3d.hxx
+RWStepFEA_RWFeaModel3d.pxx
 RWStepFEA_RWFeaModelDefinition.cxx
-RWStepFEA_RWFeaModelDefinition.hxx
+RWStepFEA_RWFeaModelDefinition.pxx
 RWStepFEA_RWFeaMoistureAbsorption.cxx
-RWStepFEA_RWFeaMoistureAbsorption.hxx
+RWStepFEA_RWFeaMoistureAbsorption.pxx
 RWStepFEA_RWFeaParametricPoint.cxx
-RWStepFEA_RWFeaParametricPoint.hxx
+RWStepFEA_RWFeaParametricPoint.pxx
 RWStepFEA_RWFeaRepresentationItem.cxx
-RWStepFEA_RWFeaRepresentationItem.hxx
+RWStepFEA_RWFeaRepresentationItem.pxx
 RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.cxx
-RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.hxx
+RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.pxx
 RWStepFEA_RWFeaShellBendingStiffness.cxx
-RWStepFEA_RWFeaShellBendingStiffness.hxx
+RWStepFEA_RWFeaShellBendingStiffness.pxx
 RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.cxx
-RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.hxx
+RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.pxx
 RWStepFEA_RWFeaShellMembraneStiffness.cxx
-RWStepFEA_RWFeaShellMembraneStiffness.hxx
+RWStepFEA_RWFeaShellMembraneStiffness.pxx
 RWStepFEA_RWFeaShellShearStiffness.cxx
-RWStepFEA_RWFeaShellShearStiffness.hxx
+RWStepFEA_RWFeaShellShearStiffness.pxx
 RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.cxx
-RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.hxx
+RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.pxx
 RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.cxx
-RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.hxx
+RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.pxx
 RWStepFEA_RWFreedomAndCoefficient.cxx
-RWStepFEA_RWFreedomAndCoefficient.hxx
+RWStepFEA_RWFreedomAndCoefficient.pxx
 RWStepFEA_RWFreedomsList.cxx
-RWStepFEA_RWFreedomsList.hxx
+RWStepFEA_RWFreedomsList.pxx
 RWStepFEA_RWGeometricNode.cxx
-RWStepFEA_RWGeometricNode.hxx
+RWStepFEA_RWGeometricNode.pxx
 RWStepFEA_RWNode.cxx
-RWStepFEA_RWNode.hxx
+RWStepFEA_RWNode.pxx
 RWStepFEA_RWNodeDefinition.cxx
-RWStepFEA_RWNodeDefinition.hxx
+RWStepFEA_RWNodeDefinition.pxx
 RWStepFEA_RWNodeGroup.cxx
-RWStepFEA_RWNodeGroup.hxx
+RWStepFEA_RWNodeGroup.pxx
 RWStepFEA_RWNodeRepresentation.cxx
-RWStepFEA_RWNodeRepresentation.hxx
+RWStepFEA_RWNodeRepresentation.pxx
 RWStepFEA_RWNodeSet.cxx
-RWStepFEA_RWNodeSet.hxx
+RWStepFEA_RWNodeSet.pxx
 RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx
-RWStepFEA_RWNodeWithSolutionCoordinateSystem.hxx
+RWStepFEA_RWNodeWithSolutionCoordinateSystem.pxx
 RWStepFEA_RWNodeWithVector.cxx
-RWStepFEA_RWNodeWithVector.hxx
+RWStepFEA_RWNodeWithVector.pxx
 RWStepFEA_RWParametricCurve3dElementCoordinateDirection.cxx
-RWStepFEA_RWParametricCurve3dElementCoordinateDirection.hxx
+RWStepFEA_RWParametricCurve3dElementCoordinateDirection.pxx
 RWStepFEA_RWParametricCurve3dElementCoordinateSystem.cxx
-RWStepFEA_RWParametricCurve3dElementCoordinateSystem.hxx
+RWStepFEA_RWParametricCurve3dElementCoordinateSystem.pxx
 RWStepFEA_RWParametricSurface3dElementCoordinateSystem.cxx
-RWStepFEA_RWParametricSurface3dElementCoordinateSystem.hxx
+RWStepFEA_RWParametricSurface3dElementCoordinateSystem.pxx
 RWStepFEA_RWSurface3dElementRepresentation.cxx
-RWStepFEA_RWSurface3dElementRepresentation.hxx
+RWStepFEA_RWSurface3dElementRepresentation.pxx
 RWStepFEA_RWVolume3dElementRepresentation.cxx
-RWStepFEA_RWVolume3dElementRepresentation.hxx
+RWStepFEA_RWVolume3dElementRepresentation.pxx
diff --git a/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.cxx
index f088295457..3f6474ae64 100644
--- a/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.hxx>
+#include "RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_AlignedCurve3dElementCoordinateSystem.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.hxx b/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.hxx
rename to src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.pxx
index 0fee605694..fa54b88512 100644
--- a/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWAlignedCurve3dElementCoordinateSystem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWAlignedCurve3dElementCoordinateSystem();
+  Standard_HIDDEN RWStepFEA_RWAlignedCurve3dElementCoordinateSystem();
   
   //! Reads AlignedCurve3dElementCoordinateSystem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_AlignedCurve3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_AlignedCurve3dElementCoordinateSystem)& ent) const;
   
   //! Writes AlignedCurve3dElementCoordinateSystem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_AlignedCurve3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_AlignedCurve3dElementCoordinateSystem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_AlignedCurve3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_AlignedCurve3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.cxx
index d29ebc7582..97da38cf8e 100644
--- a/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.hxx>
+#include "RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_AlignedSurface3dElementCoordinateSystem.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.hxx b/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.hxx
rename to src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.pxx
index d0bb7aeb8c..68e6dc546b 100644
--- a/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWAlignedSurface3dElementCoordinateSystem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWAlignedSurface3dElementCoordinateSystem();
+  Standard_HIDDEN RWStepFEA_RWAlignedSurface3dElementCoordinateSystem();
   
   //! Reads AlignedSurface3dElementCoordinateSystem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_AlignedSurface3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_AlignedSurface3dElementCoordinateSystem)& ent) const;
   
   //! Writes AlignedSurface3dElementCoordinateSystem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_AlignedSurface3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_AlignedSurface3dElementCoordinateSystem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_AlignedSurface3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_AlignedSurface3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.cxx
index bab61c1f7a..98eebf675a 100644
--- a/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.hxx>
+#include "RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_ArbitraryVolume3dElementCoordinateSystem.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.hxx b/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.hxx
rename to src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.pxx
index 792516afa2..55b37e5896 100644
--- a/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem();
+  Standard_HIDDEN RWStepFEA_RWArbitraryVolume3dElementCoordinateSystem();
   
   //! Reads ArbitraryVolume3dElementCoordinateSystem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ArbitraryVolume3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ArbitraryVolume3dElementCoordinateSystem)& ent) const;
   
   //! Writes ArbitraryVolume3dElementCoordinateSystem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ArbitraryVolume3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ArbitraryVolume3dElementCoordinateSystem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ArbitraryVolume3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ArbitraryVolume3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.cxx
index 2314541eeb..8e1701bfbe 100644
--- a/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWConstantSurface3dElementCoordinateSystem.hxx>
+#include "RWStepFEA_RWConstantSurface3dElementCoordinateSystem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_ConstantSurface3dElementCoordinateSystem.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.hxx b/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.hxx
rename to src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.pxx
index e97f870b5e..70ad339861 100644
--- a/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWConstantSurface3dElementCoordinateSystem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWConstantSurface3dElementCoordinateSystem();
+  Standard_HIDDEN RWStepFEA_RWConstantSurface3dElementCoordinateSystem();
   
   //! Reads ConstantSurface3dElementCoordinateSystem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ConstantSurface3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ConstantSurface3dElementCoordinateSystem)& ent) const;
   
   //! Writes ConstantSurface3dElementCoordinateSystem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ConstantSurface3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ConstantSurface3dElementCoordinateSystem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ConstantSurface3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ConstantSurface3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.cxx b/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.cxx
index db1d8ef0d3..ab5fe8d7bf 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurve3dElementProperty.hxx>
+#include "RWStepFEA_RWCurve3dElementProperty.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_Curve3dElementProperty.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.hxx b/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.pxx
index 506bc876b1..3f71c35679 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurve3dElementProperty.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurve3dElementProperty();
+  Standard_HIDDEN RWStepFEA_RWCurve3dElementProperty();
   
   //! Reads Curve3dElementProperty
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Curve3dElementProperty)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Curve3dElementProperty)& ent) const;
   
   //! Writes Curve3dElementProperty
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Curve3dElementProperty)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Curve3dElementProperty)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_Curve3dElementProperty)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_Curve3dElementProperty)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx
index 59d124eea0..afd6692680 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurve3dElementRepresentation.hxx>
+#include "RWStepFEA_RWCurve3dElementRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_Curve3dElementDescriptor.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.hxx b/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.pxx
index 0efa2a35cf..2e02be2716 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurve3dElementRepresentation();
+  Standard_HIDDEN RWStepFEA_RWCurve3dElementRepresentation();
   
   //! Reads Curve3dElementRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Curve3dElementRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Curve3dElementRepresentation)& ent) const;
   
   //! Writes Curve3dElementRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Curve3dElementRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Curve3dElementRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_Curve3dElementRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_Curve3dElementRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.cxx b/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.cxx
index cb8e953848..47f0b8c082 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurveElementEndOffset.hxx>
+#include "RWStepFEA_RWCurveElementEndOffset.pxx"
 #include <Standard_Real.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.hxx b/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.pxx
index 4e6d6dbc0a..5247091369 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementEndOffset.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurveElementEndOffset();
+  Standard_HIDDEN RWStepFEA_RWCurveElementEndOffset();
   
   //! Reads CurveElementEndOffset
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementEndOffset)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementEndOffset)& ent) const;
   
   //! Writes CurveElementEndOffset
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementEndOffset)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementEndOffset)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_CurveElementEndOffset)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_CurveElementEndOffset)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.cxx b/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.cxx
index d9d80195b1..12e89922dd 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurveElementEndRelease.hxx>
+#include "RWStepFEA_RWCurveElementEndRelease.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_CurveElementEndRelease.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.hxx b/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.pxx
index 3eda78a71b..621bd87995 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementEndRelease.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurveElementEndRelease();
+  Standard_HIDDEN RWStepFEA_RWCurveElementEndRelease();
   
   //! Reads CurveElementEndRelease
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementEndRelease)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementEndRelease)& ent) const;
   
   //! Writes CurveElementEndRelease
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementEndRelease)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementEndRelease)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_CurveElementEndRelease)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_CurveElementEndRelease)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.cxx b/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.cxx
index 610746f84d..fc11f418a9 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurveElementInterval.hxx>
+#include "RWStepFEA_RWCurveElementInterval.pxx"
 #include <StepBasic_EulerAngles.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.hxx b/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurveElementInterval.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurveElementInterval.pxx
index d43aa577ae..199bd0a31d 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementInterval.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurveElementInterval();
+  Standard_HIDDEN RWStepFEA_RWCurveElementInterval();
   
   //! Reads CurveElementInterval
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementInterval)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementInterval)& ent) const;
   
   //! Writes CurveElementInterval
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementInterval)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementInterval)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_CurveElementInterval)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_CurveElementInterval)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.cxx b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.cxx
index 873dc6ffef..c0eba25603 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurveElementIntervalConstant.hxx>
+#include "RWStepFEA_RWCurveElementIntervalConstant.pxx"
 #include <StepBasic_EulerAngles.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.hxx b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.pxx
index bf89efbeae..f7c400cd73 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalConstant.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurveElementIntervalConstant();
+  Standard_HIDDEN RWStepFEA_RWCurveElementIntervalConstant();
   
   //! Reads CurveElementIntervalConstant
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementIntervalConstant)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementIntervalConstant)& ent) const;
   
   //! Writes CurveElementIntervalConstant
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementIntervalConstant)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementIntervalConstant)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_CurveElementIntervalConstant)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_CurveElementIntervalConstant)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.cxx b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.cxx
index 6feded78ed..d818a0dbd6 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurveElementIntervalLinearlyVarying.hxx>
+#include "RWStepFEA_RWCurveElementIntervalLinearlyVarying.pxx"
 #include <StepBasic_EulerAngles.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.hxx b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.pxx
index b8bae70a88..62a5a82730 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementIntervalLinearlyVarying.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurveElementIntervalLinearlyVarying();
+  Standard_HIDDEN RWStepFEA_RWCurveElementIntervalLinearlyVarying();
   
   //! Reads CurveElementIntervalLinearlyVarying
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementIntervalLinearlyVarying)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementIntervalLinearlyVarying)& ent) const;
   
   //! Writes CurveElementIntervalLinearlyVarying
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementIntervalLinearlyVarying)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementIntervalLinearlyVarying)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_CurveElementIntervalLinearlyVarying)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_CurveElementIntervalLinearlyVarying)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.cxx b/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.cxx
index c251c6426a..a5b4f11859 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWCurveElementLocation.hxx>
+#include "RWStepFEA_RWCurveElementLocation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_CurveElementLocation.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.hxx b/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWCurveElementLocation.hxx
rename to src/RWStepFEA/RWStepFEA_RWCurveElementLocation.pxx
index f0d9660a8a..e2a46f9976 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurveElementLocation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWCurveElementLocation();
+  Standard_HIDDEN RWStepFEA_RWCurveElementLocation();
   
   //! Reads CurveElementLocation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementLocation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_CurveElementLocation)& ent) const;
   
   //! Writes CurveElementLocation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementLocation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_CurveElementLocation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_CurveElementLocation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_CurveElementLocation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx b/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx
index 4a3cedfb8f..12775c7320 100644
--- a/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWDummyNode.hxx>
+#include "RWStepFEA_RWDummyNode.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_DummyNode.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWDummyNode.hxx b/src/RWStepFEA/RWStepFEA_RWDummyNode.pxx
similarity index 86%
rename from src/RWStepFEA/RWStepFEA_RWDummyNode.hxx
rename to src/RWStepFEA/RWStepFEA_RWDummyNode.pxx
index e201cc274c..8c8b916913 100644
--- a/src/RWStepFEA/RWStepFEA_RWDummyNode.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWDummyNode.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWDummyNode();
+  Standard_HIDDEN RWStepFEA_RWDummyNode();
   
   //! Reads DummyNode
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_DummyNode)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_DummyNode)& ent) const;
   
   //! Writes DummyNode
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_DummyNode)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_DummyNode)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_DummyNode)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_DummyNode)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.cxx b/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.cxx
index e641303644..3f312faf2a 100644
--- a/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWElementGeometricRelationship.hxx>
+#include "RWStepFEA_RWElementGeometricRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.hxx b/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.hxx
rename to src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.pxx
index f86a85f66b..0fb4194ee0 100644
--- a/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWElementGeometricRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWElementGeometricRelationship();
+  Standard_HIDDEN RWStepFEA_RWElementGeometricRelationship();
   
   //! Reads ElementGeometricRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ElementGeometricRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ElementGeometricRelationship)& ent) const;
   
   //! Writes ElementGeometricRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ElementGeometricRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ElementGeometricRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ElementGeometricRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ElementGeometricRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWElementGroup.cxx b/src/RWStepFEA/RWStepFEA_RWElementGroup.cxx
index 4c8f222a84..b4028e9af3 100644
--- a/src/RWStepFEA/RWStepFEA_RWElementGroup.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWElementGroup.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWElementGroup.hxx>
+#include "RWStepFEA_RWElementGroup.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_ElementGroup.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWElementGroup.hxx b/src/RWStepFEA/RWStepFEA_RWElementGroup.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWElementGroup.hxx
rename to src/RWStepFEA/RWStepFEA_RWElementGroup.pxx
index 2ed10c0d05..3b0338b706 100644
--- a/src/RWStepFEA/RWStepFEA_RWElementGroup.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWElementGroup.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWElementGroup();
+  Standard_HIDDEN RWStepFEA_RWElementGroup();
   
   //! Reads ElementGroup
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ElementGroup)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ElementGroup)& ent) const;
   
   //! Writes ElementGroup
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ElementGroup)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ElementGroup)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ElementGroup)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ElementGroup)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx
index b26d60daeb..7e42d5ae35 100644
--- a/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWElementRepresentation.hxx>
+#include "RWStepFEA_RWElementRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_ElementRepresentation.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWElementRepresentation.hxx b/src/RWStepFEA/RWStepFEA_RWElementRepresentation.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWElementRepresentation.hxx
rename to src/RWStepFEA/RWStepFEA_RWElementRepresentation.pxx
index c62f5569c9..ea4b0224b7 100644
--- a/src/RWStepFEA/RWStepFEA_RWElementRepresentation.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWElementRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWElementRepresentation();
+  Standard_HIDDEN RWStepFEA_RWElementRepresentation();
   
   //! Reads ElementRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ElementRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ElementRepresentation)& ent) const;
   
   //! Writes ElementRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ElementRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ElementRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ElementRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ElementRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.cxx b/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.cxx
index 05d3ea4f83..2ea97d1035 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaAreaDensity.hxx>
+#include "RWStepFEA_RWFeaAreaDensity.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaAreaDensity.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.hxx b/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.pxx
index 35afbd437f..0e8ee66ae5 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaAreaDensity.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaAreaDensity();
+  Standard_HIDDEN RWStepFEA_RWFeaAreaDensity();
   
   //! Reads FeaAreaDensity
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaAreaDensity)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaAreaDensity)& ent) const;
   
   //! Writes FeaAreaDensity
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaAreaDensity)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaAreaDensity)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaAreaDensity)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaAreaDensity)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.cxx b/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.cxx
index e296d7ce7f..bf27eaa601 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaAxis2Placement3d.hxx>
+#include "RWStepFEA_RWFeaAxis2Placement3d.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaAxis2Placement3d.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.hxx b/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.pxx
index 32b14610cf..bbbb7b1780 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaAxis2Placement3d.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaAxis2Placement3d();
+  Standard_HIDDEN RWStepFEA_RWFeaAxis2Placement3d();
   
   //! Reads FeaAxis2Placement3d
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaAxis2Placement3d)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaAxis2Placement3d)& ent) const;
   
   //! Writes FeaAxis2Placement3d
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaAxis2Placement3d)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaAxis2Placement3d)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaAxis2Placement3d)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaAxis2Placement3d)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.cxx b/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.cxx
index 3a8c03c67b..5563fe31c2 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaCurveSectionGeometricRelationship.hxx>
+#include "RWStepFEA_RWFeaCurveSectionGeometricRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.hxx b/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.pxx
index f301bc0c18..cc1ceb5905 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaCurveSectionGeometricRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaCurveSectionGeometricRelationship();
+  Standard_HIDDEN RWStepFEA_RWFeaCurveSectionGeometricRelationship();
   
   //! Reads FeaCurveSectionGeometricRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaCurveSectionGeometricRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaCurveSectionGeometricRelationship)& ent) const;
   
   //! Writes FeaCurveSectionGeometricRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaCurveSectionGeometricRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaCurveSectionGeometricRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaCurveSectionGeometricRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaCurveSectionGeometricRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaGroup.cxx b/src/RWStepFEA/RWStepFEA_RWFeaGroup.cxx
index 6b2b7a1a64..3ef02718d7 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaGroup.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaGroup.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaGroup.hxx>
+#include "RWStepFEA_RWFeaGroup.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaGroup.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaGroup.hxx b/src/RWStepFEA/RWStepFEA_RWFeaGroup.pxx
similarity index 86%
rename from src/RWStepFEA/RWStepFEA_RWFeaGroup.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaGroup.pxx
index 28d79da79f..11577aec1c 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaGroup.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaGroup.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaGroup();
+  Standard_HIDDEN RWStepFEA_RWFeaGroup();
   
   //! Reads FeaGroup
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaGroup)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaGroup)& ent) const;
   
   //! Writes FeaGroup
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaGroup)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaGroup)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaGroup)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaGroup)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.cxx b/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.cxx
index 5c7c6330f0..53420ee8fc 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaLinearElasticity.hxx>
+#include "RWStepFEA_RWFeaLinearElasticity.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaLinearElasticity.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.hxx b/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.pxx
index aa945fa992..2f04aae5eb 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaLinearElasticity.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaLinearElasticity();
+  Standard_HIDDEN RWStepFEA_RWFeaLinearElasticity();
   
   //! Reads FeaLinearElasticity
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaLinearElasticity)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaLinearElasticity)& ent) const;
   
   //! Writes FeaLinearElasticity
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaLinearElasticity)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaLinearElasticity)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaLinearElasticity)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaLinearElasticity)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.cxx b/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.cxx
index fd3920aff9..5ed2463961 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaMassDensity.hxx>
+#include "RWStepFEA_RWFeaMassDensity.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaMassDensity.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.hxx b/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaMassDensity.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaMassDensity.pxx
index 269a1a32fe..af99a2d263 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMassDensity.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaMassDensity();
+  Standard_HIDDEN RWStepFEA_RWFeaMassDensity();
   
   //! Reads FeaMassDensity
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMassDensity)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMassDensity)& ent) const;
   
   //! Writes FeaMassDensity
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMassDensity)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMassDensity)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaMassDensity)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaMassDensity)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.cxx
index 06857d311f..3658fcb7c1 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaMaterialPropertyRepresentation.hxx>
+#include "RWStepFEA_RWFeaMaterialPropertyRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentation.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.hxx b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.pxx
index 683f695ab5..3d1739bf3e 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaMaterialPropertyRepresentation();
+  Standard_HIDDEN RWStepFEA_RWFeaMaterialPropertyRepresentation();
   
   //! Reads FeaMaterialPropertyRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMaterialPropertyRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMaterialPropertyRepresentation)& ent) const;
   
   //! Writes FeaMaterialPropertyRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMaterialPropertyRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMaterialPropertyRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaMaterialPropertyRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaMaterialPropertyRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.cxx b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.cxx
index 8605c42765..120c41ac92 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaMaterialPropertyRepresentationItem.hxx>
+#include "RWStepFEA_RWFeaMaterialPropertyRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.hxx b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.pxx
index db8d55920f..fdeb4907c5 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMaterialPropertyRepresentationItem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaMaterialPropertyRepresentationItem();
+  Standard_HIDDEN RWStepFEA_RWFeaMaterialPropertyRepresentationItem();
   
   //! Reads FeaMaterialPropertyRepresentationItem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMaterialPropertyRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMaterialPropertyRepresentationItem)& ent) const;
   
   //! Writes FeaMaterialPropertyRepresentationItem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMaterialPropertyRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMaterialPropertyRepresentationItem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaMaterialPropertyRepresentationItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaMaterialPropertyRepresentationItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx b/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx
index aa6be8fe5c..9690aa601e 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaModel.hxx>
+#include "RWStepFEA_RWFeaModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModel.hxx b/src/RWStepFEA/RWStepFEA_RWFeaModel.pxx
similarity index 86%
rename from src/RWStepFEA/RWStepFEA_RWFeaModel.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaModel.pxx
index 6f2a09c05d..2e433e2675 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModel.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModel.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaModel();
+  Standard_HIDDEN RWStepFEA_RWFeaModel();
   
   //! Reads FeaModel
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaModel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaModel)& ent) const;
   
   //! Writes FeaModel
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaModel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaModel)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaModel)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaModel)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx b/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx
index a8320ea881..1385d6c6a8 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaModel3d.hxx>
+#include "RWStepFEA_RWFeaModel3d.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel3d.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModel3d.hxx b/src/RWStepFEA/RWStepFEA_RWFeaModel3d.pxx
similarity index 86%
rename from src/RWStepFEA/RWStepFEA_RWFeaModel3d.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaModel3d.pxx
index 099946cf0a..acbac03ee2 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModel3d.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModel3d.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaModel3d();
+  Standard_HIDDEN RWStepFEA_RWFeaModel3d();
   
   //! Reads FeaModel3d
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaModel3d)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaModel3d)& ent) const;
   
   //! Writes FeaModel3d
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaModel3d)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaModel3d)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaModel3d)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaModel3d)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.cxx b/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.cxx
index b2d48cd815..86a87e7adb 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaModelDefinition.hxx>
+#include "RWStepFEA_RWFeaModelDefinition.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModelDefinition.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.hxx b/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.pxx
index cdfe2db499..7b9bd486fd 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModelDefinition.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaModelDefinition();
+  Standard_HIDDEN RWStepFEA_RWFeaModelDefinition();
   
   //! Reads FeaModelDefinition
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaModelDefinition)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaModelDefinition)& ent) const;
   
   //! Writes FeaModelDefinition
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaModelDefinition)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaModelDefinition)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaModelDefinition)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaModelDefinition)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.cxx b/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.cxx
index d391fa269b..b10ba894a1 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaMoistureAbsorption.hxx>
+#include "RWStepFEA_RWFeaMoistureAbsorption.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaMoistureAbsorption.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.hxx b/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.pxx
index a4415b11b6..bfd31b4c7c 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaMoistureAbsorption.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaMoistureAbsorption();
+  Standard_HIDDEN RWStepFEA_RWFeaMoistureAbsorption();
   
   //! Reads FeaMoistureAbsorption
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMoistureAbsorption)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaMoistureAbsorption)& ent) const;
   
   //! Writes FeaMoistureAbsorption
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMoistureAbsorption)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaMoistureAbsorption)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaMoistureAbsorption)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaMoistureAbsorption)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.cxx b/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.cxx
index 1565eaf5cd..e1a98649ea 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaParametricPoint.hxx>
+#include "RWStepFEA_RWFeaParametricPoint.pxx"
 #include <Standard_Real.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.hxx b/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.pxx
index 9357470115..03120c9af9 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaParametricPoint.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaParametricPoint();
+  Standard_HIDDEN RWStepFEA_RWFeaParametricPoint();
   
   //! Reads FeaParametricPoint
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaParametricPoint)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaParametricPoint)& ent) const;
   
   //! Writes FeaParametricPoint
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaParametricPoint)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaParametricPoint)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaParametricPoint)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaParametricPoint)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.cxx b/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.cxx
index 2602d1b733..c3ad55121e 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaRepresentationItem.hxx>
+#include "RWStepFEA_RWFeaRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaRepresentationItem.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.hxx b/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.pxx
index d3a0b7bb36..95d24c3aa3 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaRepresentationItem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaRepresentationItem();
+  Standard_HIDDEN RWStepFEA_RWFeaRepresentationItem();
   
   //! Reads FeaRepresentationItem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaRepresentationItem)& ent) const;
   
   //! Writes FeaRepresentationItem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaRepresentationItem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaRepresentationItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaRepresentationItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.cxx b/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.cxx
index 0b0eec712e..513ad22fa3 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.hxx>
+#include "RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.hxx b/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.pxx
index 4aa711fe4e..a476dd78da 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion();
+  Standard_HIDDEN RWStepFEA_RWFeaSecantCoefficientOfLinearThermalExpansion();
   
   //! Reads FeaSecantCoefficientOfLinearThermalExpansion
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion)& ent) const;
   
   //! Writes FeaSecantCoefficientOfLinearThermalExpansion
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.cxx b/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.cxx
index 577aa76490..3ff9677d74 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaShellBendingStiffness.hxx>
+#include "RWStepFEA_RWFeaShellBendingStiffness.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaShellBendingStiffness.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.hxx b/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.pxx
index 0cb339941a..2982fa67d7 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellBendingStiffness.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaShellBendingStiffness();
+  Standard_HIDDEN RWStepFEA_RWFeaShellBendingStiffness();
   
   //! Reads FeaShellBendingStiffness
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellBendingStiffness)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellBendingStiffness)& ent) const;
   
   //! Writes FeaShellBendingStiffness
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellBendingStiffness)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellBendingStiffness)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaShellBendingStiffness)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaShellBendingStiffness)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.cxx b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.cxx
index 2deba5f04b..16a56658c5 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.hxx>
+#include "RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.hxx b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.pxx
index 9beec4d1e4..77eafcc2ce 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness();
+  Standard_HIDDEN RWStepFEA_RWFeaShellMembraneBendingCouplingStiffness();
   
   //! Reads FeaShellMembraneBendingCouplingStiffness
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellMembraneBendingCouplingStiffness)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellMembraneBendingCouplingStiffness)& ent) const;
   
   //! Writes FeaShellMembraneBendingCouplingStiffness
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellMembraneBendingCouplingStiffness)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellMembraneBendingCouplingStiffness)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaShellMembraneBendingCouplingStiffness)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaShellMembraneBendingCouplingStiffness)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.cxx b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.cxx
index a4382ed6a6..4c1dad4435 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaShellMembraneStiffness.hxx>
+#include "RWStepFEA_RWFeaShellMembraneStiffness.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaShellMembraneStiffness.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.hxx b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.pxx
index 1074ddd288..a1c43ebae9 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellMembraneStiffness.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaShellMembraneStiffness();
+  Standard_HIDDEN RWStepFEA_RWFeaShellMembraneStiffness();
   
   //! Reads FeaShellMembraneStiffness
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellMembraneStiffness)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellMembraneStiffness)& ent) const;
   
   //! Writes FeaShellMembraneStiffness
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellMembraneStiffness)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellMembraneStiffness)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaShellMembraneStiffness)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaShellMembraneStiffness)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.cxx b/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.cxx
index 02ef4059b1..566db21b9e 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaShellShearStiffness.hxx>
+#include "RWStepFEA_RWFeaShellShearStiffness.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaShellShearStiffness.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.hxx b/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.pxx
index 98f250e04d..17a335bb9c 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaShellShearStiffness.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaShellShearStiffness();
+  Standard_HIDDEN RWStepFEA_RWFeaShellShearStiffness();
   
   //! Reads FeaShellShearStiffness
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellShearStiffness)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaShellShearStiffness)& ent) const;
   
   //! Writes FeaShellShearStiffness
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellShearStiffness)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaShellShearStiffness)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaShellShearStiffness)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaShellShearStiffness)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.cxx b/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.cxx
index 33eacaccc3..6b801afeb5 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.hxx>
+#include "RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.hxx b/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.pxx
index 1c3477f24a..f46ad1f91e 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaSurfaceSectionGeometricRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaSurfaceSectionGeometricRelationship();
+  Standard_HIDDEN RWStepFEA_RWFeaSurfaceSectionGeometricRelationship();
   
   //! Reads FeaSurfaceSectionGeometricRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaSurfaceSectionGeometricRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaSurfaceSectionGeometricRelationship)& ent) const;
   
   //! Writes FeaSurfaceSectionGeometricRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaSurfaceSectionGeometricRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaSurfaceSectionGeometricRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaSurfaceSectionGeometricRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaSurfaceSectionGeometricRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.cxx b/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.cxx
index 471a0287b8..2765aa6d42 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.hxx>
+#include "RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.hxx b/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.hxx
rename to src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.pxx
index 47b1ff6fa6..9098d0f850 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion();
+  Standard_HIDDEN RWStepFEA_RWFeaTangentialCoefficientOfLinearThermalExpansion();
   
   //! Reads FeaTangentialCoefficientOfLinearThermalExpansion
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion)& ent) const;
   
   //! Writes FeaTangentialCoefficientOfLinearThermalExpansion
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.cxx b/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.cxx
index 75b03367a0..b80b0b4515 100644
--- a/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFreedomAndCoefficient.hxx>
+#include "RWStepFEA_RWFreedomAndCoefficient.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FreedomAndCoefficient.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.hxx b/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.hxx
rename to src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.pxx
index 392a7ba578..a64c540644 100644
--- a/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFreedomAndCoefficient.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFreedomAndCoefficient();
+  Standard_HIDDEN RWStepFEA_RWFreedomAndCoefficient();
   
   //! Reads FreedomAndCoefficient
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FreedomAndCoefficient)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FreedomAndCoefficient)& ent) const;
   
   //! Writes FreedomAndCoefficient
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FreedomAndCoefficient)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FreedomAndCoefficient)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FreedomAndCoefficient)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FreedomAndCoefficient)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWFreedomsList.cxx b/src/RWStepFEA/RWStepFEA_RWFreedomsList.cxx
index d1171d1107..d084db5210 100644
--- a/src/RWStepFEA/RWStepFEA_RWFreedomsList.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFreedomsList.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWFreedomsList.hxx>
+#include "RWStepFEA_RWFreedomsList.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FreedomsList.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWFreedomsList.hxx b/src/RWStepFEA/RWStepFEA_RWFreedomsList.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWFreedomsList.hxx
rename to src/RWStepFEA/RWStepFEA_RWFreedomsList.pxx
index ec2db8babf..b0e82842fe 100644
--- a/src/RWStepFEA/RWStepFEA_RWFreedomsList.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWFreedomsList.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWFreedomsList();
+  Standard_HIDDEN RWStepFEA_RWFreedomsList();
   
   //! Reads FreedomsList
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FreedomsList)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_FreedomsList)& ent) const;
   
   //! Writes FreedomsList
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FreedomsList)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_FreedomsList)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_FreedomsList)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_FreedomsList)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx b/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx
index 9c9af39cec..fc46056e13 100644
--- a/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWGeometricNode.hxx>
+#include "RWStepFEA_RWGeometricNode.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWGeometricNode.hxx b/src/RWStepFEA/RWStepFEA_RWGeometricNode.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWGeometricNode.hxx
rename to src/RWStepFEA/RWStepFEA_RWGeometricNode.pxx
index 07ab0f4856..8ae5db2203 100644
--- a/src/RWStepFEA/RWStepFEA_RWGeometricNode.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWGeometricNode.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWGeometricNode();
+  Standard_HIDDEN RWStepFEA_RWGeometricNode();
   
   //! Reads GeometricNode
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_GeometricNode)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_GeometricNode)& ent) const;
   
   //! Writes GeometricNode
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_GeometricNode)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_GeometricNode)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_GeometricNode)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_GeometricNode)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWNode.cxx b/src/RWStepFEA/RWStepFEA_RWNode.cxx
index 0082e89cfb..4ab6f68937 100644
--- a/src/RWStepFEA/RWStepFEA_RWNode.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNode.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWNode.hxx>
+#include "RWStepFEA_RWNode.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWNode.hxx b/src/RWStepFEA/RWStepFEA_RWNode.pxx
similarity index 86%
rename from src/RWStepFEA/RWStepFEA_RWNode.hxx
rename to src/RWStepFEA/RWStepFEA_RWNode.pxx
index 66cad0d88c..18390e4178 100644
--- a/src/RWStepFEA/RWStepFEA_RWNode.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWNode.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWNode();
+  Standard_HIDDEN RWStepFEA_RWNode();
   
   //! Reads Node
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Node)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Node)& ent) const;
   
   //! Writes Node
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Node)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Node)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_Node)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_Node)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeDefinition.cxx b/src/RWStepFEA/RWStepFEA_RWNodeDefinition.cxx
index e5cc8f6ee1..28b2c6c61a 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeDefinition.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeDefinition.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWNodeDefinition.hxx>
+#include "RWStepFEA_RWNodeDefinition.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_NodeDefinition.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeDefinition.hxx b/src/RWStepFEA/RWStepFEA_RWNodeDefinition.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWNodeDefinition.hxx
rename to src/RWStepFEA/RWStepFEA_RWNodeDefinition.pxx
index 096f88793a..bf7784814d 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeDefinition.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeDefinition.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWNodeDefinition();
+  Standard_HIDDEN RWStepFEA_RWNodeDefinition();
   
   //! Reads NodeDefinition
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeDefinition)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeDefinition)& ent) const;
   
   //! Writes NodeDefinition
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeDefinition)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeDefinition)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_NodeDefinition)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_NodeDefinition)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeGroup.cxx b/src/RWStepFEA/RWStepFEA_RWNodeGroup.cxx
index 2e421811f6..7ca1dd16b1 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeGroup.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeGroup.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWNodeGroup.hxx>
+#include "RWStepFEA_RWNodeGroup.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeGroup.hxx b/src/RWStepFEA/RWStepFEA_RWNodeGroup.pxx
similarity index 86%
rename from src/RWStepFEA/RWStepFEA_RWNodeGroup.hxx
rename to src/RWStepFEA/RWStepFEA_RWNodeGroup.pxx
index 46cd7a72ec..6506677eff 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeGroup.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeGroup.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWNodeGroup();
+  Standard_HIDDEN RWStepFEA_RWNodeGroup();
   
   //! Reads NodeGroup
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeGroup)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeGroup)& ent) const;
   
   //! Writes NodeGroup
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeGroup)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeGroup)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_NodeGroup)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_NodeGroup)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx
index 36ed76443b..ee9d347681 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWNodeRepresentation.hxx>
+#include "RWStepFEA_RWNodeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.hxx b/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWNodeRepresentation.hxx
rename to src/RWStepFEA/RWStepFEA_RWNodeRepresentation.pxx
index d5d32290fe..5bc0081608 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWNodeRepresentation();
+  Standard_HIDDEN RWStepFEA_RWNodeRepresentation();
   
   //! Reads NodeRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeRepresentation)& ent) const;
   
   //! Writes NodeRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_NodeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_NodeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeSet.cxx b/src/RWStepFEA/RWStepFEA_RWNodeSet.cxx
index 931b1e3e91..3de82006d3 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeSet.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeSet.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWNodeSet.hxx>
+#include "RWStepFEA_RWNodeSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_NodeRepresentation.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeSet.hxx b/src/RWStepFEA/RWStepFEA_RWNodeSet.pxx
similarity index 86%
rename from src/RWStepFEA/RWStepFEA_RWNodeSet.hxx
rename to src/RWStepFEA/RWStepFEA_RWNodeSet.pxx
index 8f0dd09e28..0a3b92df4e 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeSet.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeSet.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWNodeSet();
+  Standard_HIDDEN RWStepFEA_RWNodeSet();
   
   //! Reads NodeSet
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeSet)& ent) const;
   
   //! Writes NodeSet
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeSet)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_NodeSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_NodeSet)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx
index ae2e6b0123..faf7c57bce 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWNodeWithSolutionCoordinateSystem.hxx>
+#include "RWStepFEA_RWNodeWithSolutionCoordinateSystem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.hxx b/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.hxx
rename to src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.pxx
index 5f67084401..683f56c4e2 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWNodeWithSolutionCoordinateSystem();
+  Standard_HIDDEN RWStepFEA_RWNodeWithSolutionCoordinateSystem();
   
   //! Reads NodeWithSolutionCoordinateSystem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeWithSolutionCoordinateSystem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeWithSolutionCoordinateSystem)& ent) const;
   
   //! Writes NodeWithSolutionCoordinateSystem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeWithSolutionCoordinateSystem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeWithSolutionCoordinateSystem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_NodeWithSolutionCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_NodeWithSolutionCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx b/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx
index 54aee7e877..56d19c84aa 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWNodeWithVector.hxx>
+#include "RWStepFEA_RWNodeWithVector.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_FeaModel.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeWithVector.hxx b/src/RWStepFEA/RWStepFEA_RWNodeWithVector.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWNodeWithVector.hxx
rename to src/RWStepFEA/RWStepFEA_RWNodeWithVector.pxx
index 067233bdb6..60c21e687b 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeWithVector.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeWithVector.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWNodeWithVector();
+  Standard_HIDDEN RWStepFEA_RWNodeWithVector();
   
   //! Reads NodeWithVector
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeWithVector)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_NodeWithVector)& ent) const;
   
   //! Writes NodeWithVector
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeWithVector)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_NodeWithVector)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_NodeWithVector)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_NodeWithVector)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.cxx b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.cxx
index e891e663aa..0ab1996782 100644
--- a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWParametricCurve3dElementCoordinateDirection.hxx>
+#include "RWStepFEA_RWParametricCurve3dElementCoordinateDirection.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_ParametricCurve3dElementCoordinateDirection.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.hxx b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.hxx
rename to src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.pxx
index 90cc74b0c5..776bd81afb 100644
--- a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateDirection.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWParametricCurve3dElementCoordinateDirection();
+  Standard_HIDDEN RWStepFEA_RWParametricCurve3dElementCoordinateDirection();
   
   //! Reads ParametricCurve3dElementCoordinateDirection
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ParametricCurve3dElementCoordinateDirection)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ParametricCurve3dElementCoordinateDirection)& ent) const;
   
   //! Writes ParametricCurve3dElementCoordinateDirection
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ParametricCurve3dElementCoordinateDirection)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ParametricCurve3dElementCoordinateDirection)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ParametricCurve3dElementCoordinateDirection)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ParametricCurve3dElementCoordinateDirection)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.cxx
index fc0accbcc0..e086ba2e28 100644
--- a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWParametricCurve3dElementCoordinateSystem.hxx>
+#include "RWStepFEA_RWParametricCurve3dElementCoordinateSystem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_ParametricCurve3dElementCoordinateDirection.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.hxx b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.hxx
rename to src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.pxx
index f4bf0e2125..8c0be0ce17 100644
--- a/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWParametricCurve3dElementCoordinateSystem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWParametricCurve3dElementCoordinateSystem();
+  Standard_HIDDEN RWStepFEA_RWParametricCurve3dElementCoordinateSystem();
   
   //! Reads ParametricCurve3dElementCoordinateSystem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ParametricCurve3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ParametricCurve3dElementCoordinateSystem)& ent) const;
   
   //! Writes ParametricCurve3dElementCoordinateSystem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ParametricCurve3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ParametricCurve3dElementCoordinateSystem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ParametricCurve3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ParametricCurve3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.cxx
index 376af8c837..b0bbde529f 100644
--- a/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWParametricSurface3dElementCoordinateSystem.hxx>
+#include "RWStepFEA_RWParametricSurface3dElementCoordinateSystem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepFEA_ParametricSurface3dElementCoordinateSystem.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.hxx b/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.pxx
similarity index 88%
rename from src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.hxx
rename to src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.pxx
index 66db34a20e..1e9b7ef48c 100644
--- a/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWParametricSurface3dElementCoordinateSystem.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWParametricSurface3dElementCoordinateSystem();
+  Standard_HIDDEN RWStepFEA_RWParametricSurface3dElementCoordinateSystem();
   
   //! Reads ParametricSurface3dElementCoordinateSystem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ParametricSurface3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_ParametricSurface3dElementCoordinateSystem)& ent) const;
   
   //! Writes ParametricSurface3dElementCoordinateSystem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ParametricSurface3dElementCoordinateSystem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_ParametricSurface3dElementCoordinateSystem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_ParametricSurface3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_ParametricSurface3dElementCoordinateSystem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx
index 0ca6ff2b78..229698d8c6 100644
--- a/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWSurface3dElementRepresentation.hxx>
+#include "RWStepFEA_RWSurface3dElementRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_ElementMaterial.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.hxx b/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.hxx
rename to src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.pxx
index 34a0b5fbb3..e821292c61 100644
--- a/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWSurface3dElementRepresentation();
+  Standard_HIDDEN RWStepFEA_RWSurface3dElementRepresentation();
   
   //! Reads Surface3dElementRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Surface3dElementRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Surface3dElementRepresentation)& ent) const;
   
   //! Writes Surface3dElementRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Surface3dElementRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Surface3dElementRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_Surface3dElementRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_Surface3dElementRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx
index 7d516fe9b1..c8e7a3ce50 100644
--- a/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepFEA_RWVolume3dElementRepresentation.hxx>
+#include "RWStepFEA_RWVolume3dElementRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepElement_ElementMaterial.hxx>
diff --git a/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.hxx b/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.pxx
similarity index 87%
rename from src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.hxx
rename to src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.pxx
index e7fa112fc9..bf44b3a848 100644
--- a/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.hxx
+++ b/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepFEA_RWVolume3dElementRepresentation();
+  Standard_HIDDEN RWStepFEA_RWVolume3dElementRepresentation();
   
   //! Reads Volume3dElementRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Volume3dElementRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepFEA_Volume3dElementRepresentation)& ent) const;
   
   //! Writes Volume3dElementRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Volume3dElementRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepFEA_Volume3dElementRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepFEA_Volume3dElementRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepFEA_Volume3dElementRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/FILES b/src/RWStepGeom/FILES
index 082b068beb..47a8571335 100755
--- a/src/RWStepGeom/FILES
+++ b/src/RWStepGeom/FILES
@@ -1,166 +1,166 @@
 RWStepGeom_RWAxis1Placement.cxx
-RWStepGeom_RWAxis1Placement.hxx
+RWStepGeom_RWAxis1Placement.pxx
 RWStepGeom_RWAxis2Placement2d.cxx
-RWStepGeom_RWAxis2Placement2d.hxx
+RWStepGeom_RWAxis2Placement2d.pxx
 RWStepGeom_RWAxis2Placement3d.cxx
-RWStepGeom_RWAxis2Placement3d.hxx
+RWStepGeom_RWAxis2Placement3d.pxx
 RWStepGeom_RWBezierCurve.cxx
-RWStepGeom_RWBezierCurve.hxx
+RWStepGeom_RWBezierCurve.pxx
 RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cxx
-RWStepGeom_RWBezierCurveAndRationalBSplineCurve.hxx
+RWStepGeom_RWBezierCurveAndRationalBSplineCurve.pxx
 RWStepGeom_RWBezierSurface.cxx
-RWStepGeom_RWBezierSurface.hxx
+RWStepGeom_RWBezierSurface.pxx
 RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cxx
-RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.hxx
+RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.pxx
 RWStepGeom_RWBoundaryCurve.cxx
-RWStepGeom_RWBoundaryCurve.hxx
+RWStepGeom_RWBoundaryCurve.pxx
 RWStepGeom_RWBoundedCurve.cxx
-RWStepGeom_RWBoundedCurve.hxx
+RWStepGeom_RWBoundedCurve.pxx
 RWStepGeom_RWBoundedSurface.cxx
-RWStepGeom_RWBoundedSurface.hxx
+RWStepGeom_RWBoundedSurface.pxx
 RWStepGeom_RWBSplineCurve.cxx
-RWStepGeom_RWBSplineCurve.hxx
+RWStepGeom_RWBSplineCurve.pxx
 RWStepGeom_RWBSplineCurveWithKnots.cxx
-RWStepGeom_RWBSplineCurveWithKnots.hxx
+RWStepGeom_RWBSplineCurveWithKnots.pxx
 RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cxx
-RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.hxx
+RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.pxx
 RWStepGeom_RWBSplineSurface.cxx
-RWStepGeom_RWBSplineSurface.hxx
+RWStepGeom_RWBSplineSurface.pxx
 RWStepGeom_RWBSplineSurfaceWithKnots.cxx
-RWStepGeom_RWBSplineSurfaceWithKnots.hxx
+RWStepGeom_RWBSplineSurfaceWithKnots.pxx
 RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx
-RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
+RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.pxx
 RWStepGeom_RWCartesianPoint.cxx
-RWStepGeom_RWCartesianPoint.hxx
+RWStepGeom_RWCartesianPoint.pxx
 RWStepGeom_RWCartesianTransformationOperator.cxx
-RWStepGeom_RWCartesianTransformationOperator.hxx
+RWStepGeom_RWCartesianTransformationOperator.pxx
 RWStepGeom_RWCartesianTransformationOperator3d.cxx
-RWStepGeom_RWCartesianTransformationOperator3d.hxx
+RWStepGeom_RWCartesianTransformationOperator3d.pxx
 RWStepGeom_RWCircle.cxx
-RWStepGeom_RWCircle.hxx
+RWStepGeom_RWCircle.pxx
 RWStepGeom_RWCompositeCurve.cxx
-RWStepGeom_RWCompositeCurve.hxx
+RWStepGeom_RWCompositeCurve.pxx
 RWStepGeom_RWCompositeCurveOnSurface.cxx
-RWStepGeom_RWCompositeCurveOnSurface.hxx
+RWStepGeom_RWCompositeCurveOnSurface.pxx
 RWStepGeom_RWCompositeCurveSegment.cxx
-RWStepGeom_RWCompositeCurveSegment.hxx
+RWStepGeom_RWCompositeCurveSegment.pxx
 RWStepGeom_RWConic.cxx
-RWStepGeom_RWConic.hxx
+RWStepGeom_RWConic.pxx
 RWStepGeom_RWConicalSurface.cxx
-RWStepGeom_RWConicalSurface.hxx
+RWStepGeom_RWConicalSurface.pxx
 RWStepGeom_RWCurve.cxx
-RWStepGeom_RWCurve.hxx
+RWStepGeom_RWCurve.pxx
 RWStepGeom_RWCurveBoundedSurface.cxx
-RWStepGeom_RWCurveBoundedSurface.hxx
+RWStepGeom_RWCurveBoundedSurface.pxx
 RWStepGeom_RWCurveReplica.cxx
-RWStepGeom_RWCurveReplica.hxx
+RWStepGeom_RWCurveReplica.pxx
 RWStepGeom_RWCylindricalSurface.cxx
-RWStepGeom_RWCylindricalSurface.hxx
+RWStepGeom_RWCylindricalSurface.pxx
 RWStepGeom_RWDegeneratePcurve.cxx
-RWStepGeom_RWDegeneratePcurve.hxx
+RWStepGeom_RWDegeneratePcurve.pxx
 RWStepGeom_RWDegenerateToroidalSurface.cxx
-RWStepGeom_RWDegenerateToroidalSurface.hxx
+RWStepGeom_RWDegenerateToroidalSurface.pxx
 RWStepGeom_RWDirection.cxx
-RWStepGeom_RWDirection.hxx
+RWStepGeom_RWDirection.pxx
 RWStepGeom_RWElementarySurface.cxx
-RWStepGeom_RWElementarySurface.hxx
+RWStepGeom_RWElementarySurface.pxx
 RWStepGeom_RWEllipse.cxx
-RWStepGeom_RWEllipse.hxx
+RWStepGeom_RWEllipse.pxx
 RWStepGeom_RWEvaluatedDegeneratePcurve.cxx
-RWStepGeom_RWEvaluatedDegeneratePcurve.hxx
+RWStepGeom_RWEvaluatedDegeneratePcurve.pxx
 RWStepGeom_RWGeometricRepresentationContext.cxx
-RWStepGeom_RWGeometricRepresentationContext.hxx
+RWStepGeom_RWGeometricRepresentationContext.pxx
 RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
-RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.hxx
+RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.pxx
 RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cxx
-RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.hxx
+RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.pxx
 RWStepGeom_RWGeometricRepresentationItem.cxx
-RWStepGeom_RWGeometricRepresentationItem.hxx
+RWStepGeom_RWGeometricRepresentationItem.pxx
 RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
-RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx
+RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.pxx
 RWStepGeom_RWHyperbola.cxx
-RWStepGeom_RWHyperbola.hxx
+RWStepGeom_RWHyperbola.pxx
 RWStepGeom_RWIntersectionCurve.cxx
-RWStepGeom_RWIntersectionCurve.hxx
+RWStepGeom_RWIntersectionCurve.pxx
 RWStepGeom_RWLine.cxx
-RWStepGeom_RWLine.hxx
+RWStepGeom_RWLine.pxx
 RWStepGeom_RWOffsetCurve3d.cxx
-RWStepGeom_RWOffsetCurve3d.hxx
+RWStepGeom_RWOffsetCurve3d.pxx
 RWStepGeom_RWOffsetSurface.cxx
-RWStepGeom_RWOffsetSurface.hxx
+RWStepGeom_RWOffsetSurface.pxx
 RWStepGeom_RWOrientedSurface.cxx
-RWStepGeom_RWOrientedSurface.hxx
+RWStepGeom_RWOrientedSurface.pxx
 RWStepGeom_RWOuterBoundaryCurve.cxx
-RWStepGeom_RWOuterBoundaryCurve.hxx
+RWStepGeom_RWOuterBoundaryCurve.pxx
 RWStepGeom_RWParabola.cxx
-RWStepGeom_RWParabola.hxx
+RWStepGeom_RWParabola.pxx
 RWStepGeom_RWPcurve.cxx
-RWStepGeom_RWPcurve.hxx
+RWStepGeom_RWPcurve.pxx
 RWStepGeom_RWPlacement.cxx
-RWStepGeom_RWPlacement.hxx
+RWStepGeom_RWPlacement.pxx
 RWStepGeom_RWPlane.cxx
-RWStepGeom_RWPlane.hxx
+RWStepGeom_RWPlane.pxx
 RWStepGeom_RWPoint.cxx
-RWStepGeom_RWPoint.hxx
+RWStepGeom_RWPoint.pxx
 RWStepGeom_RWPointOnCurve.cxx
-RWStepGeom_RWPointOnCurve.hxx
+RWStepGeom_RWPointOnCurve.pxx
 RWStepGeom_RWPointOnSurface.cxx
-RWStepGeom_RWPointOnSurface.hxx
+RWStepGeom_RWPointOnSurface.pxx
 RWStepGeom_RWPointReplica.cxx
-RWStepGeom_RWPointReplica.hxx
+RWStepGeom_RWPointReplica.pxx
 RWStepGeom_RWPolyline.cxx
-RWStepGeom_RWPolyline.hxx
+RWStepGeom_RWPolyline.pxx
 RWStepGeom_RWQuasiUniformCurve.cxx
-RWStepGeom_RWQuasiUniformCurve.hxx
+RWStepGeom_RWQuasiUniformCurve.pxx
 RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cxx
-RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.hxx
+RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.pxx
 RWStepGeom_RWQuasiUniformSurface.cxx
-RWStepGeom_RWQuasiUniformSurface.hxx
+RWStepGeom_RWQuasiUniformSurface.pxx
 RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cxx
-RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.hxx
+RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.pxx
 RWStepGeom_RWRationalBSplineCurve.cxx
-RWStepGeom_RWRationalBSplineCurve.hxx
+RWStepGeom_RWRationalBSplineCurve.pxx
 RWStepGeom_RWRationalBSplineSurface.cxx
-RWStepGeom_RWRationalBSplineSurface.hxx
+RWStepGeom_RWRationalBSplineSurface.pxx
 RWStepGeom_RWRectangularCompositeSurface.cxx
-RWStepGeom_RWRectangularCompositeSurface.hxx
+RWStepGeom_RWRectangularCompositeSurface.pxx
 RWStepGeom_RWRectangularTrimmedSurface.cxx
-RWStepGeom_RWRectangularTrimmedSurface.hxx
+RWStepGeom_RWRectangularTrimmedSurface.pxx
 RWStepGeom_RWReparametrisedCompositeCurveSegment.cxx
-RWStepGeom_RWReparametrisedCompositeCurveSegment.hxx
+RWStepGeom_RWReparametrisedCompositeCurveSegment.pxx
 RWStepGeom_RWSeamCurve.cxx
-RWStepGeom_RWSeamCurve.hxx
+RWStepGeom_RWSeamCurve.pxx
 RWStepGeom_RWSphericalSurface.cxx
-RWStepGeom_RWSphericalSurface.hxx
+RWStepGeom_RWSphericalSurface.pxx
 RWStepGeom_RWSuParameters.cxx
-RWStepGeom_RWSuParameters.hxx
+RWStepGeom_RWSuParameters.pxx
 RWStepGeom_RWSurface.cxx
-RWStepGeom_RWSurface.hxx
+RWStepGeom_RWSurface.pxx
 RWStepGeom_RWSurfaceCurve.cxx
-RWStepGeom_RWSurfaceCurve.hxx
+RWStepGeom_RWSurfaceCurve.pxx
 RWStepGeom_RWSurfaceCurveAndBoundedCurve.cxx
-RWStepGeom_RWSurfaceCurveAndBoundedCurve.hxx
+RWStepGeom_RWSurfaceCurveAndBoundedCurve.pxx
 RWStepGeom_RWSurfaceOfLinearExtrusion.cxx
-RWStepGeom_RWSurfaceOfLinearExtrusion.hxx
+RWStepGeom_RWSurfaceOfLinearExtrusion.pxx
 RWStepGeom_RWSurfaceOfRevolution.cxx
-RWStepGeom_RWSurfaceOfRevolution.hxx
+RWStepGeom_RWSurfaceOfRevolution.pxx
 RWStepGeom_RWSurfacePatch.cxx
-RWStepGeom_RWSurfacePatch.hxx
+RWStepGeom_RWSurfacePatch.pxx
 RWStepGeom_RWSurfaceReplica.cxx
-RWStepGeom_RWSurfaceReplica.hxx
+RWStepGeom_RWSurfaceReplica.pxx
 RWStepGeom_RWSweptSurface.cxx
-RWStepGeom_RWSweptSurface.hxx
+RWStepGeom_RWSweptSurface.pxx
 RWStepGeom_RWToroidalSurface.cxx
-RWStepGeom_RWToroidalSurface.hxx
+RWStepGeom_RWToroidalSurface.pxx
 RWStepGeom_RWTrimmedCurve.cxx
-RWStepGeom_RWTrimmedCurve.hxx
+RWStepGeom_RWTrimmedCurve.pxx
 RWStepGeom_RWUniformCurve.cxx
-RWStepGeom_RWUniformCurve.hxx
+RWStepGeom_RWUniformCurve.pxx
 RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cxx
-RWStepGeom_RWUniformCurveAndRationalBSplineCurve.hxx
+RWStepGeom_RWUniformCurveAndRationalBSplineCurve.pxx
 RWStepGeom_RWUniformSurface.cxx
-RWStepGeom_RWUniformSurface.hxx
+RWStepGeom_RWUniformSurface.pxx
 RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cxx
-RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.hxx
+RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.pxx
 RWStepGeom_RWVector.cxx
-RWStepGeom_RWVector.hxx
+RWStepGeom_RWVector.pxx
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cxx b/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cxx
index 0ff11df421..2b00acdf8c 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWAxis1Placement.hxx>
+#include "RWStepGeom_RWAxis1Placement.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis1Placement.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis1Placement.hxx b/src/RWStepGeom/RWStepGeom_RWAxis1Placement.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWAxis1Placement.hxx
rename to src/RWStepGeom/RWStepGeom_RWAxis1Placement.pxx
index eec72a89ac..82e173e931 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis1Placement.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWAxis1Placement.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWAxis1Placement();
+  Standard_HIDDEN RWStepGeom_RWAxis1Placement();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Axis1Placement)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Axis1Placement)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Axis1Placement)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Axis1Placement)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Axis1Placement)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Axis1Placement)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cxx b/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cxx
index 08d0a93cbb..620835b791 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWAxis2Placement2d.hxx>
+#include "RWStepGeom_RWAxis2Placement2d.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement2d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.hxx b/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.hxx
rename to src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.pxx
index f096954b34..7eaac4d472 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWAxis2Placement2d();
+  Standard_HIDDEN RWStepGeom_RWAxis2Placement2d();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Axis2Placement2d)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Axis2Placement2d)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Axis2Placement2d)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Axis2Placement2d)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Axis2Placement2d)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Axis2Placement2d)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cxx b/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cxx
index 1341cbc88e..3eb31b7e28 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWAxis2Placement3d.hxx>
+#include "RWStepGeom_RWAxis2Placement3d.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.hxx b/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.hxx
rename to src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.pxx
index 4028e0f0b9..5b88c83e29 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWAxis2Placement3d();
+  Standard_HIDDEN RWStepGeom_RWAxis2Placement3d();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Axis2Placement3d)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Axis2Placement3d)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Axis2Placement3d)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Axis2Placement3d)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Axis2Placement3d)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Axis2Placement3d)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cxx b/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cxx
index 5995c45398..145c704405 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWBSplineCurve.hxx>
+#include "RWStepGeom_RWBSplineCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BSplineCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurve.hxx b/src/RWStepGeom/RWStepGeom_RWBSplineCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWBSplineCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWBSplineCurve.pxx
index 31093ea8a0..fbeaa6954a 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBSplineCurve();
+  Standard_HIDDEN RWStepGeom_RWBSplineCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BSplineCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BSplineCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cxx b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cxx
index 6faa4d6ce0..6eb2f479cb 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cxx
@@ -15,7 +15,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWBSplineCurveWithKnots.hxx>
+#include "RWStepGeom_RWBSplineCurveWithKnots.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BSplineCurveWithKnots.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.hxx b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.pxx
similarity index 85%
rename from src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.hxx
rename to src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.pxx
index 9862132928..b970798eae 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBSplineCurveWithKnots();
+  Standard_HIDDEN RWStepGeom_RWBSplineCurveWithKnots();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineCurveWithKnots)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineCurveWithKnots)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineCurveWithKnots)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineCurveWithKnots)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BSplineCurveWithKnots)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BSplineCurveWithKnots)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_BSplineCurveWithKnots)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_BSplineCurveWithKnots)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cxx b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cxx
index 981ce97936..af35f587ec 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cxx
@@ -16,9 +16,9 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWBSplineCurveWithKnots.hxx>
-#include <RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.hxx>
-#include <RWStepGeom_RWRationalBSplineCurve.hxx>
+#include "RWStepGeom_RWBSplineCurveWithKnots.pxx"
+#include "RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.pxx"
+#include "RWStepGeom_RWRationalBSplineCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BSplineCurveWithKnots.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.hxx b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.pxx
index 3435d69d77..8990a85976 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve();
+  Standard_HIDDEN RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cxx b/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cxx
index 51876da8fe..7517b36fdc 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWBSplineSurface.hxx>
+#include "RWStepGeom_RWBSplineSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BSplineSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurface.hxx b/src/RWStepGeom/RWStepGeom_RWBSplineSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWBSplineSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWBSplineSurface.pxx
index 4ac1ca205b..e1f23cfb70 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBSplineSurface();
+  Standard_HIDDEN RWStepGeom_RWBSplineSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BSplineSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BSplineSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cxx b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cxx
index 77203c6ddd..69e3d7cf8a 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cxx
@@ -15,7 +15,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWBSplineSurfaceWithKnots.hxx>
+#include "RWStepGeom_RWBSplineSurfaceWithKnots.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BSplineSurfaceWithKnots.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.hxx b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.pxx
similarity index 85%
rename from src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.hxx
rename to src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.pxx
index 2711429c1b..90970261d1 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBSplineSurfaceWithKnots();
+  Standard_HIDDEN RWStepGeom_RWBSplineSurfaceWithKnots();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineSurfaceWithKnots)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineSurfaceWithKnots)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineSurfaceWithKnots)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineSurfaceWithKnots)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BSplineSurfaceWithKnots)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BSplineSurfaceWithKnots)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_BSplineSurfaceWithKnots)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_BSplineSurfaceWithKnots)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx
index 1a517949b7..6e460461f7 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx
@@ -15,9 +15,9 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWBSplineSurfaceWithKnots.hxx>
-#include <RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx>
-#include <RWStepGeom_RWRationalBSplineSurface.hxx>
+#include "RWStepGeom_RWBSplineSurfaceWithKnots.pxx"
+#include "RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.pxx"
+#include "RWStepGeom_RWRationalBSplineSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BSplineSurfaceWithKnots.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.pxx
index d72ca08b29..f5d357d411 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface();
+  Standard_HIDDEN RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierCurve.cxx b/src/RWStepGeom/RWStepGeom_RWBezierCurve.cxx
index 05b4e4afc0..1af14e8527 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWBezierCurve.hxx>
+#include "RWStepGeom_RWBezierCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BezierCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierCurve.hxx b/src/RWStepGeom/RWStepGeom_RWBezierCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWBezierCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWBezierCurve.pxx
index c5e3fb2369..903bb7ecca 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBezierCurve();
+  Standard_HIDDEN RWStepGeom_RWBezierCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BezierCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BezierCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cxx b/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cxx
index 4e5c51589d..55222aa4b4 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWBezierCurveAndRationalBSplineCurve.hxx>
+#include "RWStepGeom_RWBezierCurveAndRationalBSplineCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BezierCurveAndRationalBSplineCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.hxx b/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.pxx
index c9f64445fa..0ac692e992 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBezierCurveAndRationalBSplineCurve();
+  Standard_HIDDEN RWStepGeom_RWBezierCurveAndRationalBSplineCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierCurveAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierCurveAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierCurveAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierCurveAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BezierCurveAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BezierCurveAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierSurface.cxx b/src/RWStepGeom/RWStepGeom_RWBezierSurface.cxx
index 99ed6a5ed1..b613eec199 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWBezierSurface.hxx>
+#include "RWStepGeom_RWBezierSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BezierSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierSurface.hxx b/src/RWStepGeom/RWStepGeom_RWBezierSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWBezierSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWBezierSurface.pxx
index 5399a40ca9..ccef4749d8 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBezierSurface();
+  Standard_HIDDEN RWStepGeom_RWBezierSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BezierSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BezierSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cxx b/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cxx
index 6886954cb6..5eb797f60e 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.hxx>
+#include "RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.hxx b/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.pxx
index 288d96736e..4c630e85a2 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface();
+  Standard_HIDDEN RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierSurfaceAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BezierSurfaceAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierSurfaceAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BezierSurfaceAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BezierSurfaceAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BezierSurfaceAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cxx b/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cxx
index 26c7909c3c..ad3dc21153 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWBoundaryCurve.hxx>
+#include "RWStepGeom_RWBoundaryCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BoundaryCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.hxx b/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWBoundaryCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWBoundaryCurve.pxx
index 4a8276cbc1..52cdb83c77 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBoundaryCurve();
+  Standard_HIDDEN RWStepGeom_RWBoundaryCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BoundaryCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BoundaryCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BoundaryCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BoundaryCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_BoundaryCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_BoundaryCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cxx b/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cxx
index ada41111eb..661d106ef7 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepGeom_RWBoundedCurve.hxx>
+#include "RWStepGeom_RWBoundedCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BoundedCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundedCurve.hxx b/src/RWStepGeom/RWStepGeom_RWBoundedCurve.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWBoundedCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWBoundedCurve.pxx
index 97ba399820..1819922d7f 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundedCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBoundedCurve.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBoundedCurve();
+  Standard_HIDDEN RWStepGeom_RWBoundedCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BoundedCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BoundedCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BoundedCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BoundedCurve)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cxx b/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cxx
index 745b3e4bd3..4e83e264fc 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepGeom_RWBoundedSurface.hxx>
+#include "RWStepGeom_RWBoundedSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BoundedSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundedSurface.hxx b/src/RWStepGeom/RWStepGeom_RWBoundedSurface.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWBoundedSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWBoundedSurface.pxx
index 5dd653482e..91306fb39a 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundedSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWBoundedSurface.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWBoundedSurface();
+  Standard_HIDDEN RWStepGeom_RWBoundedSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BoundedSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_BoundedSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BoundedSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_BoundedSurface)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cxx b/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cxx
index 580d39438c..9fecda79ea 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_Check.hxx>
-#include <RWStepGeom_RWCartesianPoint.hxx>
+#include "RWStepGeom_RWCartesianPoint.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianPoint.hxx b/src/RWStepGeom/RWStepGeom_RWCartesianPoint.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWCartesianPoint.hxx
rename to src/RWStepGeom/RWStepGeom_RWCartesianPoint.pxx
index 2bc0145ef9..a38663158b 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianPoint.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianPoint.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCartesianPoint();
+  Standard_HIDDEN RWStepGeom_RWCartesianPoint();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CartesianPoint)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CartesianPoint)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CartesianPoint)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CartesianPoint)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cxx b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cxx
index fb4e7d1dcb..c5f1825dcf 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCartesianTransformationOperator.hxx>
+#include "RWStepGeom_RWCartesianTransformationOperator.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.hxx b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.hxx
rename to src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.pxx
index f93efc40a2..031b8284e6 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCartesianTransformationOperator();
+  Standard_HIDDEN RWStepGeom_RWCartesianTransformationOperator();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CartesianTransformationOperator)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CartesianTransformationOperator)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CartesianTransformationOperator)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CartesianTransformationOperator)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_CartesianTransformationOperator)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CartesianTransformationOperator)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cxx b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cxx
index 0fff525e63..1a52f26b53 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCartesianTransformationOperator3d.hxx>
+#include "RWStepGeom_RWCartesianTransformationOperator3d.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.hxx b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.hxx
rename to src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.pxx
index 024ad4c979..64d4800077 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCartesianTransformationOperator3d();
+  Standard_HIDDEN RWStepGeom_RWCartesianTransformationOperator3d();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CartesianTransformationOperator3d)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CartesianTransformationOperator3d)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CartesianTransformationOperator3d)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CartesianTransformationOperator3d)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_CartesianTransformationOperator3d)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CartesianTransformationOperator3d)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCircle.cxx b/src/RWStepGeom/RWStepGeom_RWCircle.cxx
index 63ba5708e8..9467fa1a1b 100644
--- a/src/RWStepGeom/RWStepGeom_RWCircle.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCircle.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCircle.hxx>
+#include "RWStepGeom_RWCircle.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Circle.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCircle.hxx b/src/RWStepGeom/RWStepGeom_RWCircle.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWCircle.hxx
rename to src/RWStepGeom/RWStepGeom_RWCircle.pxx
index 5d275096e8..bf144613a5 100644
--- a/src/RWStepGeom/RWStepGeom_RWCircle.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCircle.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCircle();
+  Standard_HIDDEN RWStepGeom_RWCircle();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Circle)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Circle)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Circle)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Circle)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Circle)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Circle)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cxx b/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cxx
index 49304aa7d6..7ef61d84ce 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCompositeCurve.hxx>
+#include "RWStepGeom_RWCompositeCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CompositeCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurve.hxx b/src/RWStepGeom/RWStepGeom_RWCompositeCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWCompositeCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWCompositeCurve.pxx
index 50ca97c8dd..6d369f13b8 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCompositeCurve();
+  Standard_HIDDEN RWStepGeom_RWCompositeCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CompositeCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CompositeCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CompositeCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CompositeCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_CompositeCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CompositeCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cxx b/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cxx
index 304d83a649..9ef034c9e5 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCompositeCurveOnSurface.hxx>
+#include "RWStepGeom_RWCompositeCurveOnSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CompositeCurveOnSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.hxx b/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.pxx
index df48d657fd..ae2a0e66f9 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCompositeCurveOnSurface();
+  Standard_HIDDEN RWStepGeom_RWCompositeCurveOnSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CompositeCurveOnSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CompositeCurveOnSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CompositeCurveOnSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CompositeCurveOnSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_CompositeCurveOnSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CompositeCurveOnSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cxx b/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cxx
index 70b22306cb..3be07f3e68 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCompositeCurveSegment.hxx>
+#include "RWStepGeom_RWCompositeCurveSegment.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CompositeCurveSegment.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.hxx b/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.hxx
rename to src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.pxx
index 3042624ab2..1121af6f19 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCompositeCurveSegment();
+  Standard_HIDDEN RWStepGeom_RWCompositeCurveSegment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CompositeCurveSegment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CompositeCurveSegment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CompositeCurveSegment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CompositeCurveSegment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_CompositeCurveSegment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CompositeCurveSegment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWConic.cxx b/src/RWStepGeom/RWStepGeom_RWConic.cxx
index 1bf1562579..29862f0d49 100644
--- a/src/RWStepGeom/RWStepGeom_RWConic.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWConic.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWConic.hxx>
+#include "RWStepGeom_RWConic.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Conic.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWConic.hxx b/src/RWStepGeom/RWStepGeom_RWConic.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWConic.hxx
rename to src/RWStepGeom/RWStepGeom_RWConic.pxx
index b08037c6e7..818298d5f5 100644
--- a/src/RWStepGeom/RWStepGeom_RWConic.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWConic.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWConic();
+  Standard_HIDDEN RWStepGeom_RWConic();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Conic)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Conic)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Conic)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Conic)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Conic)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Conic)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWConicalSurface.cxx b/src/RWStepGeom/RWStepGeom_RWConicalSurface.cxx
index 93d2f593a3..6b4e13665b 100644
--- a/src/RWStepGeom/RWStepGeom_RWConicalSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWConicalSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWConicalSurface.hxx>
+#include "RWStepGeom_RWConicalSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWConicalSurface.hxx b/src/RWStepGeom/RWStepGeom_RWConicalSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWConicalSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWConicalSurface.pxx
index 93c46ee227..2750831a16 100644
--- a/src/RWStepGeom/RWStepGeom_RWConicalSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWConicalSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWConicalSurface();
+  Standard_HIDDEN RWStepGeom_RWConicalSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ConicalSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ConicalSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ConicalSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ConicalSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_ConicalSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_ConicalSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCurve.cxx b/src/RWStepGeom/RWStepGeom_RWCurve.cxx
index 841fec18c8..5dcff26b44 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCurve.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepGeom_RWCurve.hxx>
+#include "RWStepGeom_RWCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Curve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCurve.hxx b/src/RWStepGeom/RWStepGeom_RWCurve.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWCurve.pxx
index 765f6361c3..d0e542e321 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCurve.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCurve();
+  Standard_HIDDEN RWStepGeom_RWCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Curve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Curve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Curve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Curve)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.cxx b/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.cxx
index 34f9dba152..f4885ed0d4 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.cxx
@@ -18,7 +18,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCurveBoundedSurface.hxx>
+#include "RWStepGeom_RWCurveBoundedSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.hxx b/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.pxx
index 9b8e411992..1db1f34072 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCurveBoundedSurface.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepGeom_RWCurveBoundedSurface();
+  Standard_HIDDEN RWStepGeom_RWCurveBoundedSurface();
   
   //! Reads CurveBoundedSurface
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CurveBoundedSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CurveBoundedSurface)& ent) const;
   
   //! Writes CurveBoundedSurface
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CurveBoundedSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CurveBoundedSurface)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepGeom_CurveBoundedSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CurveBoundedSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCurveReplica.cxx b/src/RWStepGeom/RWStepGeom_RWCurveReplica.cxx
index ebc4f6d4c0..2183e3c4d4 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurveReplica.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCurveReplica.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCurveReplica.hxx>
+#include "RWStepGeom_RWCurveReplica.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianTransformationOperator.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCurveReplica.hxx b/src/RWStepGeom/RWStepGeom_RWCurveReplica.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWCurveReplica.hxx
rename to src/RWStepGeom/RWStepGeom_RWCurveReplica.pxx
index d4c13702de..31a50aa805 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurveReplica.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCurveReplica.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCurveReplica();
+  Standard_HIDDEN RWStepGeom_RWCurveReplica();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CurveReplica)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CurveReplica)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CurveReplica)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CurveReplica)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_CurveReplica)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CurveReplica)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cxx b/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cxx
index 4f11e645c5..7b3333b4ff 100644
--- a/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWCylindricalSurface.hxx>
+#include "RWStepGeom_RWCylindricalSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.hxx b/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWCylindricalSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWCylindricalSurface.pxx
index cdd48ec791..05956c5651 100644
--- a/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWCylindricalSurface();
+  Standard_HIDDEN RWStepGeom_RWCylindricalSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CylindricalSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_CylindricalSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CylindricalSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_CylindricalSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_CylindricalSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_CylindricalSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cxx b/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cxx
index aea23c1481..811136b790 100644
--- a/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWDegeneratePcurve.hxx>
+#include "RWStepGeom_RWDegeneratePcurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_DegeneratePcurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.hxx b/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.pxx
index 2b1af747e6..7762ae74a1 100644
--- a/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWDegeneratePcurve();
+  Standard_HIDDEN RWStepGeom_RWDegeneratePcurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_DegeneratePcurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_DegeneratePcurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_DegeneratePcurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_DegeneratePcurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_DegeneratePcurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_DegeneratePcurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cxx b/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cxx
index 09883e1e14..9040c333c5 100644
--- a/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWDegenerateToroidalSurface.hxx>
+#include "RWStepGeom_RWDegenerateToroidalSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.hxx b/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.pxx
index cdc05f770e..a3c733e4bb 100644
--- a/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWDegenerateToroidalSurface();
+  Standard_HIDDEN RWStepGeom_RWDegenerateToroidalSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_DegenerateToroidalSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_DegenerateToroidalSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_DegenerateToroidalSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_DegenerateToroidalSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_DegenerateToroidalSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_DegenerateToroidalSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWDirection.cxx b/src/RWStepGeom/RWStepGeom_RWDirection.cxx
index 2e4fc49a37..d398141255 100644
--- a/src/RWStepGeom/RWStepGeom_RWDirection.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWDirection.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWDirection.hxx>
+#include "RWStepGeom_RWDirection.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWDirection.hxx b/src/RWStepGeom/RWStepGeom_RWDirection.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWDirection.hxx
rename to src/RWStepGeom/RWStepGeom_RWDirection.pxx
index 57d4bc3f33..f16966be22 100644
--- a/src/RWStepGeom/RWStepGeom_RWDirection.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWDirection.pxx
@@ -38,13 +38,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWDirection();
+  Standard_HIDDEN RWStepGeom_RWDirection();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Direction)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Direction)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Direction)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Direction)& ent) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_Direction)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_Direction)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWElementarySurface.cxx b/src/RWStepGeom/RWStepGeom_RWElementarySurface.cxx
index 14f07293a4..de911fec8a 100644
--- a/src/RWStepGeom/RWStepGeom_RWElementarySurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWElementarySurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWElementarySurface.hxx>
+#include "RWStepGeom_RWElementarySurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWElementarySurface.hxx b/src/RWStepGeom/RWStepGeom_RWElementarySurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWElementarySurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWElementarySurface.pxx
index 4d4fbd49c0..cf6eef2274 100644
--- a/src/RWStepGeom/RWStepGeom_RWElementarySurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWElementarySurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWElementarySurface();
+  Standard_HIDDEN RWStepGeom_RWElementarySurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ElementarySurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ElementarySurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ElementarySurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ElementarySurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_ElementarySurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_ElementarySurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWEllipse.cxx b/src/RWStepGeom/RWStepGeom_RWEllipse.cxx
index 7831cd01c8..7a5b0109cb 100644
--- a/src/RWStepGeom/RWStepGeom_RWEllipse.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWEllipse.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWEllipse.hxx>
+#include "RWStepGeom_RWEllipse.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Ellipse.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWEllipse.hxx b/src/RWStepGeom/RWStepGeom_RWEllipse.pxx
similarity index 84%
rename from src/RWStepGeom/RWStepGeom_RWEllipse.hxx
rename to src/RWStepGeom/RWStepGeom_RWEllipse.pxx
index cb080cbeec..27dce0575c 100644
--- a/src/RWStepGeom/RWStepGeom_RWEllipse.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWEllipse.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWEllipse();
+  Standard_HIDDEN RWStepGeom_RWEllipse();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Ellipse)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Ellipse)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Ellipse)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Ellipse)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Ellipse)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Ellipse)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_Ellipse)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_Ellipse)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cxx b/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cxx
index 2e915dd569..a066e90b4b 100644
--- a/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWEvaluatedDegeneratePcurve.hxx>
+#include "RWStepGeom_RWEvaluatedDegeneratePcurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.hxx b/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.pxx
index a1616208c3..31369db97a 100644
--- a/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWEvaluatedDegeneratePcurve();
+  Standard_HIDDEN RWStepGeom_RWEvaluatedDegeneratePcurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_EvaluatedDegeneratePcurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_EvaluatedDegeneratePcurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_EvaluatedDegeneratePcurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_EvaluatedDegeneratePcurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_EvaluatedDegeneratePcurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_EvaluatedDegeneratePcurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx b/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
index 08e5798e3f..a6c394dc57 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
+#include "RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx b/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.pxx
similarity index 88%
rename from src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx
rename to src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.pxx
index 3ffba56f60..5e0b8bb145 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.pxx
@@ -38,13 +38,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx();
+  Standard_HIDDEN RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cxx
index b825e9367c..5ff8ef5a55 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepGeom_RWGeometricRepresentationContext.hxx>
+#include "RWStepGeom_RWGeometricRepresentationContext.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_GeometricRepresentationContext.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.hxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.hxx
rename to src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.pxx
index 4a43956894..ce0f4068e4 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWGeometricRepresentationContext();
+  Standard_HIDDEN RWStepGeom_RWGeometricRepresentationContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationContext)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
index 75877c9fc7..f587bd5cb6 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
+#include "RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.hxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.pxx
similarity index 88%
rename from src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.hxx
rename to src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.pxx
index a4453380b4..713657f058 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext();
+  Standard_HIDDEN RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cxx
index d6375e17e7..5bd0d9a127 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.hxx>
+#include "RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.hxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.pxx
similarity index 88%
rename from src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.hxx
rename to src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.pxx
index d72965dcf2..9ed2233581 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext();
+  Standard_HIDDEN RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cxx
index 481d84abc8..d77947d048 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepGeom_RWGeometricRepresentationItem.hxx>
+#include "RWStepGeom_RWGeometricRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.hxx b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.hxx
rename to src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.pxx
index 8e0f8dea3f..b9e2892d3f 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWGeometricRepresentationItem();
+  Standard_HIDDEN RWStepGeom_RWGeometricRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_GeometricRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_GeometricRepresentationItem)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWHyperbola.cxx b/src/RWStepGeom/RWStepGeom_RWHyperbola.cxx
index 545b525494..e9840832e4 100644
--- a/src/RWStepGeom/RWStepGeom_RWHyperbola.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWHyperbola.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWHyperbola.hxx>
+#include "RWStepGeom_RWHyperbola.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Hyperbola.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWHyperbola.hxx b/src/RWStepGeom/RWStepGeom_RWHyperbola.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWHyperbola.hxx
rename to src/RWStepGeom/RWStepGeom_RWHyperbola.pxx
index 989cf991f0..a8c596cbc9 100644
--- a/src/RWStepGeom/RWStepGeom_RWHyperbola.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWHyperbola.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWHyperbola();
+  Standard_HIDDEN RWStepGeom_RWHyperbola();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Hyperbola)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Hyperbola)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Hyperbola)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Hyperbola)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Hyperbola)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Hyperbola)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cxx b/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cxx
index b3d8b4a5c7..be6538a4e5 100644
--- a/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWIntersectionCurve.hxx>
+#include "RWStepGeom_RWIntersectionCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_IntersectionCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.hxx b/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWIntersectionCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWIntersectionCurve.pxx
index de4443bf9a..3e2a9f6ad4 100644
--- a/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWIntersectionCurve();
+  Standard_HIDDEN RWStepGeom_RWIntersectionCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_IntersectionCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_IntersectionCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_IntersectionCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_IntersectionCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_IntersectionCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_IntersectionCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWLine.cxx b/src/RWStepGeom/RWStepGeom_RWLine.cxx
index 08954a583d..c6f8decd2c 100644
--- a/src/RWStepGeom/RWStepGeom_RWLine.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWLine.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWLine.hxx>
+#include "RWStepGeom_RWLine.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWLine.hxx b/src/RWStepGeom/RWStepGeom_RWLine.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWLine.hxx
rename to src/RWStepGeom/RWStepGeom_RWLine.pxx
index 69ffd3942d..e3dfdd7733 100644
--- a/src/RWStepGeom/RWStepGeom_RWLine.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWLine.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWLine();
+  Standard_HIDDEN RWStepGeom_RWLine();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Line)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Line)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Line)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Line)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Line)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Line)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cxx b/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cxx
index dc2c1273a9..1a79474a2b 100644
--- a/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWOffsetCurve3d.hxx>
+#include "RWStepGeom_RWOffsetCurve3d.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.hxx b/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.hxx
rename to src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.pxx
index 5a6ff17dd4..90320c8221 100644
--- a/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWOffsetCurve3d();
+  Standard_HIDDEN RWStepGeom_RWOffsetCurve3d();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OffsetCurve3d)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OffsetCurve3d)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OffsetCurve3d)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OffsetCurve3d)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_OffsetCurve3d)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_OffsetCurve3d)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cxx b/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cxx
index 38d9208713..ecf47c8f6b 100644
--- a/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWOffsetSurface.hxx>
+#include "RWStepGeom_RWOffsetSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_OffsetSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWOffsetSurface.hxx b/src/RWStepGeom/RWStepGeom_RWOffsetSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWOffsetSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWOffsetSurface.pxx
index 16d8071edd..b851412da5 100644
--- a/src/RWStepGeom/RWStepGeom_RWOffsetSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWOffsetSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWOffsetSurface();
+  Standard_HIDDEN RWStepGeom_RWOffsetSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OffsetSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OffsetSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OffsetSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OffsetSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_OffsetSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_OffsetSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWOrientedSurface.cxx b/src/RWStepGeom/RWStepGeom_RWOrientedSurface.cxx
index e73a4e6f4c..7b63008fc5 100644
--- a/src/RWStepGeom/RWStepGeom_RWOrientedSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWOrientedSurface.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWOrientedSurface.hxx>
+#include "RWStepGeom_RWOrientedSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_OrientedSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWOrientedSurface.hxx b/src/RWStepGeom/RWStepGeom_RWOrientedSurface.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWOrientedSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWOrientedSurface.pxx
index cb78ae590f..691c724f4a 100644
--- a/src/RWStepGeom/RWStepGeom_RWOrientedSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWOrientedSurface.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepGeom_RWOrientedSurface();
+  Standard_HIDDEN RWStepGeom_RWOrientedSurface();
   
   //! Reads OrientedSurface
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OrientedSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OrientedSurface)& ent) const;
   
   //! Writes OrientedSurface
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OrientedSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OrientedSurface)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepGeom_OrientedSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_OrientedSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cxx b/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cxx
index 4a1be87858..2118f7272b 100644
--- a/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWOuterBoundaryCurve.hxx>
+#include "RWStepGeom_RWOuterBoundaryCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_OuterBoundaryCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.hxx b/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.pxx
index d6fffde73d..eec10b77c6 100644
--- a/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWOuterBoundaryCurve();
+  Standard_HIDDEN RWStepGeom_RWOuterBoundaryCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OuterBoundaryCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_OuterBoundaryCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OuterBoundaryCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_OuterBoundaryCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_OuterBoundaryCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_OuterBoundaryCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWParabola.cxx b/src/RWStepGeom/RWStepGeom_RWParabola.cxx
index 835bfc0742..2157b9bbd2 100644
--- a/src/RWStepGeom/RWStepGeom_RWParabola.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWParabola.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWParabola.hxx>
+#include "RWStepGeom_RWParabola.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Parabola.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWParabola.hxx b/src/RWStepGeom/RWStepGeom_RWParabola.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWParabola.hxx
rename to src/RWStepGeom/RWStepGeom_RWParabola.pxx
index 729bee6fd6..f724d1e73a 100644
--- a/src/RWStepGeom/RWStepGeom_RWParabola.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWParabola.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWParabola();
+  Standard_HIDDEN RWStepGeom_RWParabola();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Parabola)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Parabola)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Parabola)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Parabola)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Parabola)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Parabola)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPcurve.cxx b/src/RWStepGeom/RWStepGeom_RWPcurve.cxx
index 5e28186e19..75d5892bc8 100644
--- a/src/RWStepGeom/RWStepGeom_RWPcurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPcurve.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWPcurve.hxx>
+#include "RWStepGeom_RWPcurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Pcurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPcurve.hxx b/src/RWStepGeom/RWStepGeom_RWPcurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWPcurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWPcurve.pxx
index b8186460c4..d6650fc3f2 100644
--- a/src/RWStepGeom/RWStepGeom_RWPcurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPcurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPcurve();
+  Standard_HIDDEN RWStepGeom_RWPcurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Pcurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Pcurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Pcurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Pcurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Pcurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Pcurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPlacement.cxx b/src/RWStepGeom/RWStepGeom_RWPlacement.cxx
index 276854bed0..88a2b304a7 100644
--- a/src/RWStepGeom/RWStepGeom_RWPlacement.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPlacement.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWPlacement.hxx>
+#include "RWStepGeom_RWPlacement.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPlacement.hxx b/src/RWStepGeom/RWStepGeom_RWPlacement.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWPlacement.hxx
rename to src/RWStepGeom/RWStepGeom_RWPlacement.pxx
index d8d94e0620..684863d119 100644
--- a/src/RWStepGeom/RWStepGeom_RWPlacement.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPlacement.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPlacement();
+  Standard_HIDDEN RWStepGeom_RWPlacement();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Placement)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Placement)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Placement)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Placement)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Placement)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Placement)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPlane.cxx b/src/RWStepGeom/RWStepGeom_RWPlane.cxx
index 7f99ada800..2468e4ee22 100644
--- a/src/RWStepGeom/RWStepGeom_RWPlane.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPlane.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWPlane.hxx>
+#include "RWStepGeom_RWPlane.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPlane.hxx b/src/RWStepGeom/RWStepGeom_RWPlane.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWPlane.hxx
rename to src/RWStepGeom/RWStepGeom_RWPlane.pxx
index e8dff855ee..c0fe675323 100644
--- a/src/RWStepGeom/RWStepGeom_RWPlane.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPlane.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPlane();
+  Standard_HIDDEN RWStepGeom_RWPlane();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Plane)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Plane)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Plane)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Plane)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Plane)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Plane)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPoint.cxx b/src/RWStepGeom/RWStepGeom_RWPoint.cxx
index a62e54c429..2ae859f9e1 100644
--- a/src/RWStepGeom/RWStepGeom_RWPoint.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPoint.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepGeom_RWPoint.hxx>
+#include "RWStepGeom_RWPoint.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Point.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPoint.hxx b/src/RWStepGeom/RWStepGeom_RWPoint.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWPoint.hxx
rename to src/RWStepGeom/RWStepGeom_RWPoint.pxx
index 89d6f99bfd..3ac4a47c1f 100644
--- a/src/RWStepGeom/RWStepGeom_RWPoint.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPoint.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPoint();
+  Standard_HIDDEN RWStepGeom_RWPoint();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Point)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Point)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Point)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Point)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cxx b/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cxx
index 8b24e8713e..3e794c12d2 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWPointOnCurve.hxx>
+#include "RWStepGeom_RWPointOnCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Curve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPointOnCurve.hxx b/src/RWStepGeom/RWStepGeom_RWPointOnCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWPointOnCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWPointOnCurve.pxx
index 67cdc06e21..83245bb1fb 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointOnCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPointOnCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPointOnCurve();
+  Standard_HIDDEN RWStepGeom_RWPointOnCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_PointOnCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_PointOnCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_PointOnCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_PointOnCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_PointOnCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_PointOnCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cxx b/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cxx
index 3923126135..62b58036c9 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWPointOnSurface.hxx>
+#include "RWStepGeom_RWPointOnSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_PointOnSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPointOnSurface.hxx b/src/RWStepGeom/RWStepGeom_RWPointOnSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWPointOnSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWPointOnSurface.pxx
index 5bf4aa0c17..a7c453e1ec 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointOnSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPointOnSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPointOnSurface();
+  Standard_HIDDEN RWStepGeom_RWPointOnSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_PointOnSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_PointOnSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_PointOnSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_PointOnSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_PointOnSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_PointOnSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPointReplica.cxx b/src/RWStepGeom/RWStepGeom_RWPointReplica.cxx
index 93ebb45245..69ba4df23c 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointReplica.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPointReplica.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWPointReplica.hxx>
+#include "RWStepGeom_RWPointReplica.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianTransformationOperator.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPointReplica.hxx b/src/RWStepGeom/RWStepGeom_RWPointReplica.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWPointReplica.hxx
rename to src/RWStepGeom/RWStepGeom_RWPointReplica.pxx
index 2fcc852a66..a4573250e5 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointReplica.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPointReplica.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPointReplica();
+  Standard_HIDDEN RWStepGeom_RWPointReplica();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_PointReplica)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_PointReplica)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_PointReplica)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_PointReplica)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_PointReplica)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_PointReplica)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPolyline.cxx b/src/RWStepGeom/RWStepGeom_RWPolyline.cxx
index 2db0c34ba7..798a7a63bf 100644
--- a/src/RWStepGeom/RWStepGeom_RWPolyline.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWPolyline.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWPolyline.hxx>
+#include "RWStepGeom_RWPolyline.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Polyline.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWPolyline.hxx b/src/RWStepGeom/RWStepGeom_RWPolyline.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWPolyline.hxx
rename to src/RWStepGeom/RWStepGeom_RWPolyline.pxx
index 3c8af1297a..05376b8c05 100644
--- a/src/RWStepGeom/RWStepGeom_RWPolyline.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWPolyline.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWPolyline();
+  Standard_HIDDEN RWStepGeom_RWPolyline();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Polyline)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Polyline)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Polyline)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Polyline)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Polyline)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Polyline)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cxx
index fc8b9dafd2..79d22695d3 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWQuasiUniformCurve.hxx>
+#include "RWStepGeom_RWQuasiUniformCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_QuasiUniformCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.hxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.pxx
index 911fbeb2b6..54cc0585d1 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWQuasiUniformCurve();
+  Standard_HIDDEN RWStepGeom_RWQuasiUniformCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_QuasiUniformCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_QuasiUniformCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cxx
index c0ad975c19..974f54f63c 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.hxx>
+#include "RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.hxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.pxx
index 04e637e6ab..9df215d9d5 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve();
+  Standard_HIDDEN RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cxx
index 344e58c6e9..3519a4a8c0 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWQuasiUniformSurface.hxx>
+#include "RWStepGeom_RWQuasiUniformSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_QuasiUniformSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.hxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.pxx
index 93212931fb..7e30aa5bbe 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWQuasiUniformSurface();
+  Standard_HIDDEN RWStepGeom_RWQuasiUniformSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_QuasiUniformSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_QuasiUniformSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cxx
index 5adb28f313..a17f78023c 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.hxx>
+#include "RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.hxx b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.pxx
index 4532bf1544..519bd107f1 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface();
+  Standard_HIDDEN RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cxx b/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cxx
index bae56fa1ef..337933bb76 100644
--- a/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cxx
@@ -15,7 +15,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWRationalBSplineCurve.hxx>
+#include "RWStepGeom_RWRationalBSplineCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_RationalBSplineCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.hxx b/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.pxx
similarity index 85%
rename from src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.pxx
index c1f823eec6..6de06f8891 100644
--- a/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWRationalBSplineCurve();
+  Standard_HIDDEN RWStepGeom_RWRationalBSplineCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_RationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_RationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_RationalBSplineCurve)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_RationalBSplineCurve)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cxx b/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cxx
index b1d694e654..d1c2a192c7 100644
--- a/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cxx
@@ -15,7 +15,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWRationalBSplineSurface.hxx>
+#include "RWStepGeom_RWRationalBSplineSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_RationalBSplineSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.hxx b/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.pxx
similarity index 85%
rename from src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.pxx
index 8c9e6917f4..1cb33c54a8 100644
--- a/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWRationalBSplineSurface();
+  Standard_HIDDEN RWStepGeom_RWRationalBSplineSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_RationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_RationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_RationalBSplineSurface)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_RationalBSplineSurface)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cxx b/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cxx
index 21d425955a..7f7a8b5eca 100644
--- a/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWRectangularCompositeSurface.hxx>
+#include "RWStepGeom_RWRectangularCompositeSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_RectangularCompositeSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.hxx b/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.pxx
index 99fb975533..6fa12495fb 100644
--- a/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWRectangularCompositeSurface();
+  Standard_HIDDEN RWStepGeom_RWRectangularCompositeSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RectangularCompositeSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RectangularCompositeSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RectangularCompositeSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RectangularCompositeSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_RectangularCompositeSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_RectangularCompositeSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cxx b/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cxx
index 853ff256d3..709bf6a822 100644
--- a/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWRectangularTrimmedSurface.hxx>
+#include "RWStepGeom_RWRectangularTrimmedSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_RectangularTrimmedSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.hxx b/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.pxx
index 33a0fdc26e..5b4e2251a0 100644
--- a/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWRectangularTrimmedSurface();
+  Standard_HIDDEN RWStepGeom_RWRectangularTrimmedSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RectangularTrimmedSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_RectangularTrimmedSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RectangularTrimmedSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_RectangularTrimmedSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_RectangularTrimmedSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_RectangularTrimmedSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cxx b/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cxx
index 25983b0ace..8c05e1a471 100644
--- a/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWReparametrisedCompositeCurveSegment.hxx>
+#include "RWStepGeom_RWReparametrisedCompositeCurveSegment.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Curve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.hxx b/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.hxx
rename to src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.pxx
index 8780d764eb..385f485a61 100644
--- a/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWReparametrisedCompositeCurveSegment();
+  Standard_HIDDEN RWStepGeom_RWReparametrisedCompositeCurveSegment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ReparametrisedCompositeCurveSegment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ReparametrisedCompositeCurveSegment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ReparametrisedCompositeCurveSegment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ReparametrisedCompositeCurveSegment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_ReparametrisedCompositeCurveSegment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_ReparametrisedCompositeCurveSegment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSeamCurve.cxx b/src/RWStepGeom/RWStepGeom_RWSeamCurve.cxx
index 5d2b073df7..b600572422 100644
--- a/src/RWStepGeom/RWStepGeom_RWSeamCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSeamCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSeamCurve.hxx>
+#include "RWStepGeom_RWSeamCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_SeamCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSeamCurve.hxx b/src/RWStepGeom/RWStepGeom_RWSeamCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSeamCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWSeamCurve.pxx
index 2b414ccaab..9b8da20f53 100644
--- a/src/RWStepGeom/RWStepGeom_RWSeamCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSeamCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSeamCurve();
+  Standard_HIDDEN RWStepGeom_RWSeamCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SeamCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SeamCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SeamCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SeamCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SeamCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SeamCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cxx b/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cxx
index 2dc774ebf1..8429c582f3 100644
--- a/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSphericalSurface.hxx>
+#include "RWStepGeom_RWSphericalSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSphericalSurface.hxx b/src/RWStepGeom/RWStepGeom_RWSphericalSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSphericalSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWSphericalSurface.pxx
index dd86e0d35f..7b15886e8a 100644
--- a/src/RWStepGeom/RWStepGeom_RWSphericalSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSphericalSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSphericalSurface();
+  Standard_HIDDEN RWStepGeom_RWSphericalSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SphericalSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SphericalSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SphericalSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SphericalSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SphericalSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SphericalSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSuParameters.cxx b/src/RWStepGeom/RWStepGeom_RWSuParameters.cxx
index b299060c49..ad1f531a95 100644
--- a/src/RWStepGeom/RWStepGeom_RWSuParameters.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSuParameters.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepGeom_RWSuParameters.hxx>
+#include "RWStepGeom_RWSuParameters.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSuParameters.hxx b/src/RWStepGeom/RWStepGeom_RWSuParameters.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSuParameters.hxx
rename to src/RWStepGeom/RWStepGeom_RWSuParameters.pxx
index 0e68ea0c8d..68f16809ed 100644
--- a/src/RWStepGeom/RWStepGeom_RWSuParameters.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSuParameters.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepGeom_RWSuParameters();
+  Standard_HIDDEN RWStepGeom_RWSuParameters();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theAch, const Handle(StepGeom_SuParameters)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theAch, const Handle(StepGeom_SuParameters)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepGeom_SuParameters)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepGeom_SuParameters)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepGeom_SuParameters)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepGeom_SuParameters)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepGeom_RWSuParameters_HeaderFile_
diff --git a/src/RWStepGeom/RWStepGeom_RWSurface.cxx b/src/RWStepGeom/RWStepGeom_RWSurface.cxx
index 2251d4bea2..946f5f38d3 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurface.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepGeom_RWSurface.hxx>
+#include "RWStepGeom_RWSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Surface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSurface.hxx b/src/RWStepGeom/RWStepGeom_RWSurface.pxx
similarity index 89%
rename from src/RWStepGeom/RWStepGeom_RWSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWSurface.pxx
index 98be250290..93ab524005 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurface.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSurface();
+  Standard_HIDDEN RWStepGeom_RWSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Surface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Surface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Surface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Surface)& ent) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cxx b/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cxx
index 711996b177..152180a6b4 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSurfaceCurve.hxx>
+#include "RWStepGeom_RWSurfaceCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_SurfaceCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.hxx b/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSurfaceCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWSurfaceCurve.pxx
index 1907c967ca..2e96bf5e29 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSurfaceCurve();
+  Standard_HIDDEN RWStepGeom_RWSurfaceCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SurfaceCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SurfaceCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cxx b/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cxx
index 186c6173e9..92aafca142 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cxx
@@ -20,8 +20,8 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSurfaceCurve.hxx>
-#include <RWStepGeom_RWSurfaceCurveAndBoundedCurve.hxx>
+#include "RWStepGeom_RWSurfaceCurve.pxx"
+#include "RWStepGeom_RWSurfaceCurveAndBoundedCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BoundedCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.hxx b/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.pxx
index 720034d0fb..5e39cde6f0 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSurfaceCurveAndBoundedCurve();
+  Standard_HIDDEN RWStepGeom_RWSurfaceCurveAndBoundedCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceCurveAndBoundedCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceCurveAndBoundedCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceCurveAndBoundedCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceCurveAndBoundedCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SurfaceCurveAndBoundedCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SurfaceCurveAndBoundedCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cxx b/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cxx
index 63d46a0cf5..b5ff6e5ad7 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSurfaceOfLinearExtrusion.hxx>
+#include "RWStepGeom_RWSurfaceOfLinearExtrusion.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Curve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.hxx b/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.hxx
rename to src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.pxx
index e615e9739b..5993ab922e 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSurfaceOfLinearExtrusion();
+  Standard_HIDDEN RWStepGeom_RWSurfaceOfLinearExtrusion();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceOfLinearExtrusion)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceOfLinearExtrusion)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceOfLinearExtrusion)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceOfLinearExtrusion)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SurfaceOfLinearExtrusion)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SurfaceOfLinearExtrusion)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cxx b/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cxx
index 71ebc91417..5e8c1b80e2 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSurfaceOfRevolution.hxx>
+#include "RWStepGeom_RWSurfaceOfRevolution.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis1Placement.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.hxx b/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.hxx
rename to src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.pxx
index 4c22c90a41..3fb19a05c0 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSurfaceOfRevolution();
+  Standard_HIDDEN RWStepGeom_RWSurfaceOfRevolution();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceOfRevolution)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceOfRevolution)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceOfRevolution)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceOfRevolution)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SurfaceOfRevolution)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SurfaceOfRevolution)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cxx b/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cxx
index 847f04c877..1175134420 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSurfacePatch.hxx>
+#include "RWStepGeom_RWSurfacePatch.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_BoundedSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfacePatch.hxx b/src/RWStepGeom/RWStepGeom_RWSurfacePatch.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSurfacePatch.hxx
rename to src/RWStepGeom/RWStepGeom_RWSurfacePatch.pxx
index 7ade3b175c..7cd5cba62a 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfacePatch.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfacePatch.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSurfacePatch();
+  Standard_HIDDEN RWStepGeom_RWSurfacePatch();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfacePatch)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfacePatch)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfacePatch)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfacePatch)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SurfacePatch)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SurfacePatch)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cxx b/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cxx
index e561e40a30..bfdda33a14 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSurfaceReplica.hxx>
+#include "RWStepGeom_RWSurfaceReplica.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianTransformationOperator3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.hxx b/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSurfaceReplica.hxx
rename to src/RWStepGeom/RWStepGeom_RWSurfaceReplica.pxx
index 46215250f4..4da0040aad 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSurfaceReplica();
+  Standard_HIDDEN RWStepGeom_RWSurfaceReplica();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceReplica)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SurfaceReplica)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceReplica)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SurfaceReplica)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SurfaceReplica)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SurfaceReplica)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSweptSurface.cxx b/src/RWStepGeom/RWStepGeom_RWSweptSurface.cxx
index d4f4341e0f..60cb50fc09 100644
--- a/src/RWStepGeom/RWStepGeom_RWSweptSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWSweptSurface.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWSweptSurface.hxx>
+#include "RWStepGeom_RWSweptSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Curve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWSweptSurface.hxx b/src/RWStepGeom/RWStepGeom_RWSweptSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWSweptSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWSweptSurface.pxx
index a6a39dfcf5..465708c0ab 100644
--- a/src/RWStepGeom/RWStepGeom_RWSweptSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWSweptSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWSweptSurface();
+  Standard_HIDDEN RWStepGeom_RWSweptSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SweptSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_SweptSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SweptSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_SweptSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_SweptSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_SweptSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cxx b/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cxx
index e3978da45d..356fa6b9f6 100644
--- a/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWToroidalSurface.hxx>
+#include "RWStepGeom_RWToroidalSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWToroidalSurface.hxx b/src/RWStepGeom/RWStepGeom_RWToroidalSurface.pxx
similarity index 84%
rename from src/RWStepGeom/RWStepGeom_RWToroidalSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWToroidalSurface.pxx
index 698155d9a2..ad0f4310cb 100644
--- a/src/RWStepGeom/RWStepGeom_RWToroidalSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWToroidalSurface.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWToroidalSurface();
+  Standard_HIDDEN RWStepGeom_RWToroidalSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ToroidalSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_ToroidalSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ToroidalSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_ToroidalSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_ToroidalSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_ToroidalSurface)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_ToroidalSurface)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_ToroidalSurface)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cxx b/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cxx
index 7b8cb727f3..b96bbae74e 100644
--- a/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWTrimmedCurve.hxx>
+#include "RWStepGeom_RWTrimmedCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.hxx b/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWTrimmedCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWTrimmedCurve.pxx
index 0636742944..dbe3c76c30 100644
--- a/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWTrimmedCurve();
+  Standard_HIDDEN RWStepGeom_RWTrimmedCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_TrimmedCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_TrimmedCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_TrimmedCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_TrimmedCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_TrimmedCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_TrimmedCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformCurve.cxx b/src/RWStepGeom/RWStepGeom_RWUniformCurve.cxx
index f8c3cff983..39018b30ea 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWUniformCurve.hxx>
+#include "RWStepGeom_RWUniformCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_UniformCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformCurve.hxx b/src/RWStepGeom/RWStepGeom_RWUniformCurve.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWUniformCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWUniformCurve.pxx
index 0a78df7c73..9236e1b323 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWUniformCurve();
+  Standard_HIDDEN RWStepGeom_RWUniformCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_UniformCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_UniformCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cxx b/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cxx
index 55ea135840..b8e72fae28 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWUniformCurveAndRationalBSplineCurve.hxx>
+#include "RWStepGeom_RWUniformCurveAndRationalBSplineCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_RationalBSplineCurve.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.hxx b/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.hxx
rename to src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.pxx
index 7c7a510a6f..226f6cecdf 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWUniformCurveAndRationalBSplineCurve();
+  Standard_HIDDEN RWStepGeom_RWUniformCurveAndRationalBSplineCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformCurveAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformCurveAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformCurveAndRationalBSplineCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformCurveAndRationalBSplineCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_UniformCurveAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_UniformCurveAndRationalBSplineCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformSurface.cxx b/src/RWStepGeom/RWStepGeom_RWUniformSurface.cxx
index cdc9caea6e..29b0c91862 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWUniformSurface.hxx>
+#include "RWStepGeom_RWUniformSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_UniformSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformSurface.hxx b/src/RWStepGeom/RWStepGeom_RWUniformSurface.pxx
similarity index 86%
rename from src/RWStepGeom/RWStepGeom_RWUniformSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWUniformSurface.pxx
index 4f7e5bfdd3..9f127d6c12 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWUniformSurface();
+  Standard_HIDDEN RWStepGeom_RWUniformSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_UniformSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_UniformSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cxx b/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cxx
index 5cef2b3806..a91b4fa0b5 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.hxx>
+#include "RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_RationalBSplineSurface.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.hxx b/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.pxx
similarity index 87%
rename from src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.hxx
rename to src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.pxx
index 8a6427d638..e381a4422b 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface();
+  Standard_HIDDEN RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepGeom/RWStepGeom_RWVector.cxx b/src/RWStepGeom/RWStepGeom_RWVector.cxx
index 1417a3ace6..920332b4e8 100644
--- a/src/RWStepGeom/RWStepGeom_RWVector.cxx
+++ b/src/RWStepGeom/RWStepGeom_RWVector.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepGeom_RWVector.hxx>
+#include "RWStepGeom_RWVector.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/RWStepGeom/RWStepGeom_RWVector.hxx b/src/RWStepGeom/RWStepGeom_RWVector.pxx
similarity index 84%
rename from src/RWStepGeom/RWStepGeom_RWVector.hxx
rename to src/RWStepGeom/RWStepGeom_RWVector.pxx
index 14b900a93b..4ba990a075 100644
--- a/src/RWStepGeom/RWStepGeom_RWVector.hxx
+++ b/src/RWStepGeom/RWStepGeom_RWVector.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepGeom_RWVector();
+  Standard_HIDDEN RWStepGeom_RWVector();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Vector)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepGeom_Vector)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Vector)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepGeom_Vector)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepGeom_Vector)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepGeom_Vector)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepGeom_Vector)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepGeom_Vector)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepKinematics/FILES b/src/RWStepKinematics/FILES
index 9aa1669306..b75bd4a9db 100644
--- a/src/RWStepKinematics/FILES
+++ b/src/RWStepKinematics/FILES
@@ -1,148 +1,148 @@
 RWStepKinematics_RWActuatedKinematicPair.cxx
-RWStepKinematics_RWActuatedKinematicPair.hxx
+RWStepKinematics_RWActuatedKinematicPair.pxx
 RWStepKinematics_RWContextDependentKinematicLinkRepresentation.cxx
-RWStepKinematics_RWContextDependentKinematicLinkRepresentation.hxx
+RWStepKinematics_RWContextDependentKinematicLinkRepresentation.pxx
 RWStepKinematics_RWCylindricalPair.cxx
-RWStepKinematics_RWCylindricalPair.hxx
+RWStepKinematics_RWCylindricalPair.pxx
 RWStepKinematics_RWCylindricalPairValue.cxx
-RWStepKinematics_RWCylindricalPairValue.hxx
+RWStepKinematics_RWCylindricalPairValue.pxx
 RWStepKinematics_RWCylindricalPairWithRange.cxx
-RWStepKinematics_RWCylindricalPairWithRange.hxx
+RWStepKinematics_RWCylindricalPairWithRange.pxx
 RWStepKinematics_RWFullyConstrainedPair.cxx
-RWStepKinematics_RWFullyConstrainedPair.hxx
+RWStepKinematics_RWFullyConstrainedPair.pxx
 RWStepKinematics_RWGearPair.cxx
-RWStepKinematics_RWGearPair.hxx
+RWStepKinematics_RWGearPair.pxx
 RWStepKinematics_RWGearPairValue.cxx
-RWStepKinematics_RWGearPairValue.hxx
+RWStepKinematics_RWGearPairValue.pxx
 RWStepKinematics_RWGearPairWithRange.cxx
-RWStepKinematics_RWGearPairWithRange.hxx
+RWStepKinematics_RWGearPairWithRange.pxx
 RWStepKinematics_RWHomokineticPair.cxx
-RWStepKinematics_RWHomokineticPair.hxx
+RWStepKinematics_RWHomokineticPair.pxx
 RWStepKinematics_RWActuatedKinPairAndOrderKinPair.cxx
-RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx
+RWStepKinematics_RWActuatedKinPairAndOrderKinPair.pxx
 RWStepKinematics_RWKinematicJoint.cxx
-RWStepKinematics_RWKinematicJoint.hxx
+RWStepKinematics_RWKinematicJoint.pxx
 RWStepKinematics_RWKinematicLink.cxx
-RWStepKinematics_RWKinematicLink.hxx
+RWStepKinematics_RWKinematicLink.pxx
 RWStepKinematics_RWKinematicLinkRepresentationAssociation.cxx
-RWStepKinematics_RWKinematicLinkRepresentationAssociation.hxx
+RWStepKinematics_RWKinematicLinkRepresentationAssociation.pxx
 RWStepKinematics_RWKinematicPropertyMechanismRepresentation.cxx
-RWStepKinematics_RWKinematicPropertyMechanismRepresentation.hxx
+RWStepKinematics_RWKinematicPropertyMechanismRepresentation.pxx
 RWStepKinematics_RWKinematicTopologyStructure.cxx
-RWStepKinematics_RWKinematicTopologyStructure.hxx
+RWStepKinematics_RWKinematicTopologyStructure.pxx
 RWStepKinematics_RWLinearFlexibleAndPinionPair.cxx
-RWStepKinematics_RWLinearFlexibleAndPinionPair.hxx
+RWStepKinematics_RWLinearFlexibleAndPinionPair.pxx
 RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.cxx
-RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.hxx
+RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.pxx
 RWStepKinematics_RWLinearFlexibleLinkRepresentation.cxx
-RWStepKinematics_RWLinearFlexibleLinkRepresentation.hxx
+RWStepKinematics_RWLinearFlexibleLinkRepresentation.pxx
 RWStepKinematics_RWLowOrderKinematicPair.cxx
-RWStepKinematics_RWLowOrderKinematicPair.hxx
+RWStepKinematics_RWLowOrderKinematicPair.pxx
 RWStepKinematics_RWLowOrderKinematicPairValue.cxx
-RWStepKinematics_RWLowOrderKinematicPairValue.hxx
+RWStepKinematics_RWLowOrderKinematicPairValue.pxx
 RWStepKinematics_RWLowOrderKinematicPairWithRange.cxx
-RWStepKinematics_RWLowOrderKinematicPairWithRange.hxx
+RWStepKinematics_RWLowOrderKinematicPairWithRange.pxx
 RWStepKinematics_RWMechanismRepresentation.cxx
-RWStepKinematics_RWMechanismRepresentation.hxx
+RWStepKinematics_RWMechanismRepresentation.pxx
 RWStepKinematics_RWMechanismStateRepresentation.cxx
-RWStepKinematics_RWMechanismStateRepresentation.hxx
+RWStepKinematics_RWMechanismStateRepresentation.pxx
 RWStepKinematics_RWOrientedJoint.cxx
-RWStepKinematics_RWOrientedJoint.hxx
+RWStepKinematics_RWOrientedJoint.pxx
 RWStepKinematics_RWPairRepresentationRelationship.cxx
-RWStepKinematics_RWPairRepresentationRelationship.hxx
+RWStepKinematics_RWPairRepresentationRelationship.pxx
 RWStepKinematics_RWPlanarCurvePair.cxx
-RWStepKinematics_RWPlanarCurvePair.hxx
+RWStepKinematics_RWPlanarCurvePair.pxx
 RWStepKinematics_RWPlanarCurvePairRange.cxx
-RWStepKinematics_RWPlanarCurvePairRange.hxx
+RWStepKinematics_RWPlanarCurvePairRange.pxx
 RWStepKinematics_RWPlanarPair.cxx
-RWStepKinematics_RWPlanarPair.hxx
+RWStepKinematics_RWPlanarPair.pxx
 RWStepKinematics_RWPlanarPairValue.cxx
-RWStepKinematics_RWPlanarPairValue.hxx
+RWStepKinematics_RWPlanarPairValue.pxx
 RWStepKinematics_RWPlanarPairWithRange.cxx
-RWStepKinematics_RWPlanarPairWithRange.hxx
+RWStepKinematics_RWPlanarPairWithRange.pxx
 RWStepKinematics_RWPointOnPlanarCurvePair.cxx
-RWStepKinematics_RWPointOnPlanarCurvePair.hxx
+RWStepKinematics_RWPointOnPlanarCurvePair.pxx
 RWStepKinematics_RWPointOnPlanarCurvePairValue.cxx
-RWStepKinematics_RWPointOnPlanarCurvePairValue.hxx
+RWStepKinematics_RWPointOnPlanarCurvePairValue.pxx
 RWStepKinematics_RWPointOnPlanarCurvePairWithRange.cxx
-RWStepKinematics_RWPointOnPlanarCurvePairWithRange.hxx
+RWStepKinematics_RWPointOnPlanarCurvePairWithRange.pxx
 RWStepKinematics_RWPointOnSurfacePair.cxx
-RWStepKinematics_RWPointOnSurfacePair.hxx
+RWStepKinematics_RWPointOnSurfacePair.pxx
 RWStepKinematics_RWPointOnSurfacePairValue.cxx
-RWStepKinematics_RWPointOnSurfacePairValue.hxx
+RWStepKinematics_RWPointOnSurfacePairValue.pxx
 RWStepKinematics_RWPointOnSurfacePairWithRange.cxx
-RWStepKinematics_RWPointOnSurfacePairWithRange.hxx
+RWStepKinematics_RWPointOnSurfacePairWithRange.pxx
 RWStepKinematics_RWPrismaticPair.cxx
-RWStepKinematics_RWPrismaticPair.hxx
+RWStepKinematics_RWPrismaticPair.pxx
 RWStepKinematics_RWPrismaticPairValue.cxx
-RWStepKinematics_RWPrismaticPairValue.hxx
+RWStepKinematics_RWPrismaticPairValue.pxx
 RWStepKinematics_RWPrismaticPairWithRange.cxx
-RWStepKinematics_RWPrismaticPairWithRange.hxx
+RWStepKinematics_RWPrismaticPairWithRange.pxx
 RWStepKinematics_RWProductDefinitionKinematics.cxx
-RWStepKinematics_RWProductDefinitionKinematics.hxx
+RWStepKinematics_RWProductDefinitionKinematics.pxx
 RWStepKinematics_RWProductDefinitionRelationshipKinematics.cxx
-RWStepKinematics_RWProductDefinitionRelationshipKinematics.hxx
+RWStepKinematics_RWProductDefinitionRelationshipKinematics.pxx
 RWStepKinematics_RWRackAndPinionPair.cxx
-RWStepKinematics_RWRackAndPinionPair.hxx
+RWStepKinematics_RWRackAndPinionPair.pxx
 RWStepKinematics_RWRackAndPinionPairValue.cxx
-RWStepKinematics_RWRackAndPinionPairValue.hxx
+RWStepKinematics_RWRackAndPinionPairValue.pxx
 RWStepKinematics_RWRackAndPinionPairWithRange.cxx
-RWStepKinematics_RWRackAndPinionPairWithRange.hxx
+RWStepKinematics_RWRackAndPinionPairWithRange.pxx
 RWStepKinematics_RWRevolutePair.cxx
-RWStepKinematics_RWRevolutePair.hxx
+RWStepKinematics_RWRevolutePair.pxx
 RWStepKinematics_RWRevolutePairValue.cxx
-RWStepKinematics_RWRevolutePairValue.hxx
+RWStepKinematics_RWRevolutePairValue.pxx
 RWStepKinematics_RWRevolutePairWithRange.cxx
-RWStepKinematics_RWRevolutePairWithRange.hxx
+RWStepKinematics_RWRevolutePairWithRange.pxx
 RWStepKinematics_RWRigidLinkRepresentation.cxx
-RWStepKinematics_RWRigidLinkRepresentation.hxx
+RWStepKinematics_RWRigidLinkRepresentation.pxx
 RWStepKinematics_RWRollingCurvePair.cxx
-RWStepKinematics_RWRollingCurvePair.hxx
+RWStepKinematics_RWRollingCurvePair.pxx
 RWStepKinematics_RWRollingCurvePairValue.cxx
-RWStepKinematics_RWRollingCurvePairValue.hxx
+RWStepKinematics_RWRollingCurvePairValue.pxx
 RWStepKinematics_RWRollingSurfacePair.cxx
-RWStepKinematics_RWRollingSurfacePair.hxx
+RWStepKinematics_RWRollingSurfacePair.pxx
 RWStepKinematics_RWRollingSurfacePairValue.cxx
-RWStepKinematics_RWRollingSurfacePairValue.hxx
+RWStepKinematics_RWRollingSurfacePairValue.pxx
 RWStepKinematics_RWRotationAboutDirection.cxx
-RWStepKinematics_RWRotationAboutDirection.hxx
+RWStepKinematics_RWRotationAboutDirection.pxx
 RWStepKinematics_RWScrewPair.cxx
-RWStepKinematics_RWScrewPair.hxx
+RWStepKinematics_RWScrewPair.pxx
 RWStepKinematics_RWScrewPairValue.cxx
-RWStepKinematics_RWScrewPairValue.hxx
+RWStepKinematics_RWScrewPairValue.pxx
 RWStepKinematics_RWScrewPairWithRange.cxx
-RWStepKinematics_RWScrewPairWithRange.hxx
+RWStepKinematics_RWScrewPairWithRange.pxx
 RWStepKinematics_RWSlidingCurvePair.cxx
-RWStepKinematics_RWSlidingCurvePair.hxx
+RWStepKinematics_RWSlidingCurvePair.pxx
 RWStepKinematics_RWSlidingCurvePairValue.cxx
-RWStepKinematics_RWSlidingCurvePairValue.hxx
+RWStepKinematics_RWSlidingCurvePairValue.pxx
 RWStepKinematics_RWSlidingSurfacePair.cxx
-RWStepKinematics_RWSlidingSurfacePair.hxx
+RWStepKinematics_RWSlidingSurfacePair.pxx
 RWStepKinematics_RWSlidingSurfacePairValue.cxx
-RWStepKinematics_RWSlidingSurfacePairValue.hxx
+RWStepKinematics_RWSlidingSurfacePairValue.pxx
 RWStepKinematics_RWSphericalPair.cxx
-RWStepKinematics_RWSphericalPair.hxx
+RWStepKinematics_RWSphericalPair.pxx
 RWStepKinematics_RWSphericalPairValue.cxx
-RWStepKinematics_RWSphericalPairValue.hxx
+RWStepKinematics_RWSphericalPairValue.pxx
 RWStepKinematics_RWSphericalPairWithPin.cxx
-RWStepKinematics_RWSphericalPairWithPin.hxx
+RWStepKinematics_RWSphericalPairWithPin.pxx
 RWStepKinematics_RWSphericalPairWithPinAndRange.cxx
-RWStepKinematics_RWSphericalPairWithPinAndRange.hxx
+RWStepKinematics_RWSphericalPairWithPinAndRange.pxx
 RWStepKinematics_RWSphericalPairWithRange.cxx
-RWStepKinematics_RWSphericalPairWithRange.hxx
+RWStepKinematics_RWSphericalPairWithRange.pxx
 RWStepKinematics_RWSurfacePairWithRange.cxx
-RWStepKinematics_RWSurfacePairWithRange.hxx
+RWStepKinematics_RWSurfacePairWithRange.pxx
 RWStepKinematics_RWKinematicTopologyDirectedStructure.cxx
-RWStepKinematics_RWKinematicTopologyDirectedStructure.hxx
+RWStepKinematics_RWKinematicTopologyDirectedStructure.pxx
 RWStepKinematics_RWKinematicTopologyNetworkStructure.cxx
-RWStepKinematics_RWKinematicTopologyNetworkStructure.hxx
+RWStepKinematics_RWKinematicTopologyNetworkStructure.pxx
 RWStepKinematics_RWUnconstrainedPair.cxx
-RWStepKinematics_RWUnconstrainedPair.hxx
+RWStepKinematics_RWUnconstrainedPair.pxx
 RWStepKinematics_RWUnconstrainedPairValue.cxx
-RWStepKinematics_RWUnconstrainedPairValue.hxx
+RWStepKinematics_RWUnconstrainedPairValue.pxx
 RWStepKinematics_RWUniversalPair.cxx
-RWStepKinematics_RWUniversalPair.hxx
+RWStepKinematics_RWUniversalPair.pxx
 RWStepKinematics_RWUniversalPairValue.cxx
-RWStepKinematics_RWUniversalPairValue.hxx
+RWStepKinematics_RWUniversalPairValue.pxx
 RWStepKinematics_RWUniversalPairWithRange.cxx
-RWStepKinematics_RWUniversalPairWithRange.hxx
\ No newline at end of file
+RWStepKinematics_RWUniversalPairWithRange.pxx
\ No newline at end of file
diff --git a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.cxx
index 6800c7557e..b12249efb5 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx>
+#include "RWStepKinematics_RWActuatedKinPairAndOrderKinPair.pxx"
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.pxx
index 07a60a2119..0bb67fbb7e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinPairAndOrderKinPair.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepKinematics_RWActuatedKinPairAndOrderKinPair();
+  Standard_HIDDEN RWStepKinematics_RWActuatedKinPairAndOrderKinPair();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ActuatedKinPairAndOrderKinPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ActuatedKinPairAndOrderKinPair)& theEnt) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW, const Handle(StepKinematics_ActuatedKinPairAndOrderKinPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW, const Handle(StepKinematics_ActuatedKinPairAndOrderKinPair)& theEnt) const;
   
-  Standard_EXPORT void Share (const Handle(StepKinematics_ActuatedKinPairAndOrderKinPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepKinematics_ActuatedKinPairAndOrderKinPair)& theEnt, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepDimTol_RWGeoTolAndGeoTolWthMod_HeaderFile
diff --git a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.cxx
index 81c6f23897..46303659db 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWActuatedKinematicPair.hxx>
+#include "RWStepKinematics_RWActuatedKinematicPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.pxx
index 353c7e9813..0dcc0590e6 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWActuatedKinematicPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWActuatedKinematicPair();
+  Standard_HIDDEN RWStepKinematics_RWActuatedKinematicPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ActuatedKinematicPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ActuatedKinematicPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ActuatedKinematicPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ActuatedKinematicPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_ActuatedKinematicPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_ActuatedKinematicPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWActuatedKinematicPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.cxx b/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.cxx
index 104f157268..c7fcfbed3a 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWContextDependentKinematicLinkRepresentation.hxx>
+#include "RWStepKinematics_RWContextDependentKinematicLinkRepresentation.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.hxx b/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.pxx
index f905b20aed..65bd1f7571 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWContextDependentKinematicLinkRepresentation.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWContextDependentKinematicLinkRepresentation();
+  Standard_HIDDEN RWStepKinematics_RWContextDependentKinematicLinkRepresentation();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ContextDependentKinematicLinkRepresentation)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ContextDependentKinematicLinkRepresentation)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ContextDependentKinematicLinkRepresentation)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ContextDependentKinematicLinkRepresentation)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_ContextDependentKinematicLinkRepresentation)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_ContextDependentKinematicLinkRepresentation)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWContextDependentKinematicLinkRepresentation_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.cxx
index f1ee0e99a4..dd5c193fc6 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWCylindricalPair.hxx>
+#include "RWStepKinematics_RWCylindricalPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.pxx
index bccc2d4764..5a7764c13e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWCylindricalPair();
+  Standard_HIDDEN RWStepKinematics_RWCylindricalPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_CylindricalPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_CylindricalPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_CylindricalPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_CylindricalPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_CylindricalPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_CylindricalPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWCylindricalPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.cxx
index 3b7583aa2c..10d4a58d6c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWCylindricalPairValue.hxx>
+#include "RWStepKinematics_RWCylindricalPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.pxx
index c4449c6dac..2d038edaf5 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWCylindricalPairValue();
+  Standard_HIDDEN RWStepKinematics_RWCylindricalPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_CylindricalPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_CylindricalPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_CylindricalPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_CylindricalPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_CylindricalPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_CylindricalPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWCylindricalPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.cxx
index 540e9f9e2c..90ba336eca 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWCylindricalPairWithRange.hxx>
+#include "RWStepKinematics_RWCylindricalPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.pxx
index a547f407c1..08cbd52a7c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWCylindricalPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWCylindricalPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWCylindricalPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_CylindricalPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_CylindricalPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_CylindricalPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_CylindricalPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_CylindricalPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_CylindricalPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWCylindricalPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.cxx
index 674f0794fc..013481fe8d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWFullyConstrainedPair.hxx>
+#include "RWStepKinematics_RWFullyConstrainedPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.pxx
index 0ea24d8f50..35ae9df80e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWFullyConstrainedPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWFullyConstrainedPair();
+  Standard_HIDDEN RWStepKinematics_RWFullyConstrainedPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_FullyConstrainedPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_FullyConstrainedPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_FullyConstrainedPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_FullyConstrainedPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_FullyConstrainedPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_FullyConstrainedPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWFullyConstrainedPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWGearPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWGearPair.cxx
index 3aa037d18b..4d763b7311 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWGearPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWGearPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWGearPair.hxx>
+#include "RWStepKinematics_RWGearPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWGearPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWGearPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWGearPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWGearPair.pxx
index 925939954c..0ddb6ed650 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWGearPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWGearPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWGearPair();
+  Standard_HIDDEN RWStepKinematics_RWGearPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_GearPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_GearPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_GearPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_GearPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_GearPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_GearPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWGearPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.cxx
index 74715d5a7e..4029d4d09e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWGearPairValue.hxx>
+#include "RWStepKinematics_RWGearPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWGearPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWGearPairValue.pxx
index 9e1fe2b871..b8f409bd7b 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWGearPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWGearPairValue();
+  Standard_HIDDEN RWStepKinematics_RWGearPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_GearPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_GearPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_GearPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_GearPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_GearPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_GearPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWGearPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.cxx
index 292f3aa3f6..8504014230 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWGearPairWithRange.hxx>
+#include "RWStepKinematics_RWGearPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.pxx
index ae79708ced..d05fde0b61 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWGearPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWGearPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWGearPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_GearPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_GearPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_GearPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_GearPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_GearPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_GearPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWGearPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.cxx
index 5c59606fe0..67a7177136 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWHomokineticPair.hxx>
+#include "RWStepKinematics_RWHomokineticPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.pxx
index 53146bb6a5..d95fcbb308 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWHomokineticPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWHomokineticPair();
+  Standard_HIDDEN RWStepKinematics_RWHomokineticPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_HomokineticPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_HomokineticPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_HomokineticPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_HomokineticPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_HomokineticPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_HomokineticPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWHomokineticPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.cxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.cxx
index 32e7db487b..6cf5d04812 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWKinematicJoint.hxx>
+#include "RWStepKinematics_RWKinematicJoint.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.hxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.pxx
index 9b7cc9952c..c027c69c0c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicJoint.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWKinematicJoint();
+  Standard_HIDDEN RWStepKinematics_RWKinematicJoint();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicJoint)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicJoint)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicJoint)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicJoint)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_KinematicJoint)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_KinematicJoint)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWKinematicJoint_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.cxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.cxx
index 688ed56b8e..2659fc5604 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWKinematicLink.hxx>
+#include "RWStepKinematics_RWKinematicLink.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.hxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWKinematicLink.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWKinematicLink.pxx
index 65dc3ef165..7ab2f8baab 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicLink.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWKinematicLink();
+  Standard_HIDDEN RWStepKinematics_RWKinematicLink();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicLink)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicLink)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicLink)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicLink)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_KinematicLink)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_KinematicLink)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWKinematicLink_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.cxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.cxx
index e6d0753fc5..3afb5ce01c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWKinematicLinkRepresentationAssociation.hxx>
+#include "RWStepKinematics_RWKinematicLinkRepresentationAssociation.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.hxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.pxx
index 514bac06a3..c5de72968f 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicLinkRepresentationAssociation.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWKinematicLinkRepresentationAssociation();
+  Standard_HIDDEN RWStepKinematics_RWKinematicLinkRepresentationAssociation();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicLinkRepresentationAssociation)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicLinkRepresentationAssociation)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicLinkRepresentationAssociation)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicLinkRepresentationAssociation)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_KinematicLinkRepresentationAssociation)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_KinematicLinkRepresentationAssociation)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWKinematicLinkRepresentationAssociation_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.cxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.cxx
index 7108842ee2..2a97153e6e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWKinematicPropertyMechanismRepresentation.hxx>
+#include "RWStepKinematics_RWKinematicPropertyMechanismRepresentation.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.hxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.pxx
index ca281d752e..1eddeadd71 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicPropertyMechanismRepresentation.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWKinematicPropertyMechanismRepresentation();
+  Standard_HIDDEN RWStepKinematics_RWKinematicPropertyMechanismRepresentation();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicPropertyMechanismRepresentation)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicPropertyMechanismRepresentation)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicPropertyMechanismRepresentation)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicPropertyMechanismRepresentation)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_KinematicPropertyMechanismRepresentation)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_KinematicPropertyMechanismRepresentation)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWKinematicPropertyMechanismRepresentation_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.cxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.cxx
index 59021d0c79..e213305273 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWKinematicTopologyDirectedStructure.hxx>
+#include "RWStepKinematics_RWKinematicTopologyDirectedStructure.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.hxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.pxx
index 4aa061bc91..e7bd04acab 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyDirectedStructure.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWKinematicTopologyDirectedStructure();
+  Standard_HIDDEN RWStepKinematics_RWKinematicTopologyDirectedStructure();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicTopologyDirectedStructure)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicTopologyDirectedStructure)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicTopologyDirectedStructure)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicTopologyDirectedStructure)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_KinematicTopologyDirectedStructure)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_KinematicTopologyDirectedStructure)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWKinematicTopologyDirectedStructure_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.cxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.cxx
index f1e11db7b8..6e1e29af00 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWKinematicTopologyNetworkStructure.hxx>
+#include "RWStepKinematics_RWKinematicTopologyNetworkStructure.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.hxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.pxx
index 0bfa4bc559..b993ed4c0b 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyNetworkStructure.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWKinematicTopologyNetworkStructure();
+  Standard_HIDDEN RWStepKinematics_RWKinematicTopologyNetworkStructure();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicTopologyNetworkStructure)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicTopologyNetworkStructure)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicTopologyNetworkStructure)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicTopologyNetworkStructure)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_KinematicTopologyNetworkStructure)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_KinematicTopologyNetworkStructure)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWKinematicTopologyNetworkStructure_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.cxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.cxx
index 25de7bd368..7418a7521b 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWKinematicTopologyStructure.hxx>
+#include "RWStepKinematics_RWKinematicTopologyStructure.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.hxx b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.pxx
index 86643d4ea2..b0e88f7b88 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWKinematicTopologyStructure.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWKinematicTopologyStructure();
+  Standard_HIDDEN RWStepKinematics_RWKinematicTopologyStructure();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicTopologyStructure)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_KinematicTopologyStructure)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicTopologyStructure)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_KinematicTopologyStructure)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_KinematicTopologyStructure)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_KinematicTopologyStructure)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWKinematicTopologyStructure_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.cxx
index b6aca30c9c..2e80b22635 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWLinearFlexibleAndPinionPair.hxx>
+#include "RWStepKinematics_RWLinearFlexibleAndPinionPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.pxx
index cc3d9125c9..28f633a8c2 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPinionPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWLinearFlexibleAndPinionPair();
+  Standard_HIDDEN RWStepKinematics_RWLinearFlexibleAndPinionPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LinearFlexibleAndPinionPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LinearFlexibleAndPinionPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LinearFlexibleAndPinionPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LinearFlexibleAndPinionPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_LinearFlexibleAndPinionPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_LinearFlexibleAndPinionPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWLinearFlexibleAndPinionPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.cxx
index bb4fa46f46..5ba1ca70b3 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.hxx>
+#include "RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.pxx
index 58d1582fc8..d49a9bd0c0 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair();
+  Standard_HIDDEN RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LinearFlexibleAndPlanarCurvePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LinearFlexibleAndPlanarCurvePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LinearFlexibleAndPlanarCurvePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LinearFlexibleAndPlanarCurvePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_LinearFlexibleAndPlanarCurvePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_LinearFlexibleAndPlanarCurvePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWLinearFlexibleAndPlanarCurvePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.cxx b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.cxx
index f73067b647..4f116a25b0 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWLinearFlexibleLinkRepresentation.hxx>
+#include "RWStepKinematics_RWLinearFlexibleLinkRepresentation.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.hxx b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.pxx
index 567e5a8c0e..e927dbc329 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLinearFlexibleLinkRepresentation.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWLinearFlexibleLinkRepresentation();
+  Standard_HIDDEN RWStepKinematics_RWLinearFlexibleLinkRepresentation();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LinearFlexibleLinkRepresentation)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LinearFlexibleLinkRepresentation)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LinearFlexibleLinkRepresentation)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LinearFlexibleLinkRepresentation)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_LinearFlexibleLinkRepresentation)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_LinearFlexibleLinkRepresentation)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWLinearFlexibleLinkRepresentation_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.cxx
index 1f7da0c5b5..64c41379fe 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWLowOrderKinematicPair.hxx>
+#include "RWStepKinematics_RWLowOrderKinematicPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.pxx
index 74e5a45880..bbbafe431d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWLowOrderKinematicPair();
+  Standard_HIDDEN RWStepKinematics_RWLowOrderKinematicPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LowOrderKinematicPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LowOrderKinematicPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LowOrderKinematicPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LowOrderKinematicPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_LowOrderKinematicPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_LowOrderKinematicPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWLowOrderKinematicPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.cxx
index 41a432b814..88c09fc934 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWLowOrderKinematicPairValue.hxx>
+#include "RWStepKinematics_RWLowOrderKinematicPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.pxx
index b9060d0348..f8caff4d10 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWLowOrderKinematicPairValue();
+  Standard_HIDDEN RWStepKinematics_RWLowOrderKinematicPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LowOrderKinematicPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LowOrderKinematicPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LowOrderKinematicPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LowOrderKinematicPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_LowOrderKinematicPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_LowOrderKinematicPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWLowOrderKinematicPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.cxx
index 34572fcb39..8cd1342038 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWLowOrderKinematicPairWithRange.hxx>
+#include "RWStepKinematics_RWLowOrderKinematicPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.pxx
index 8b1f3c669d..4463f1384f 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWLowOrderKinematicPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWLowOrderKinematicPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWLowOrderKinematicPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LowOrderKinematicPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_LowOrderKinematicPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LowOrderKinematicPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_LowOrderKinematicPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_LowOrderKinematicPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_LowOrderKinematicPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWLowOrderKinematicPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.cxx b/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.cxx
index f15a344521..2ea5af4874 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWMechanismRepresentation.hxx>
+#include "RWStepKinematics_RWMechanismRepresentation.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.hxx b/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.pxx
index 8032b8f60f..2c4ad947cf 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWMechanismRepresentation.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWMechanismRepresentation();
+  Standard_HIDDEN RWStepKinematics_RWMechanismRepresentation();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_MechanismRepresentation)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_MechanismRepresentation)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_MechanismRepresentation)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_MechanismRepresentation)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_MechanismRepresentation)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_MechanismRepresentation)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWMechanismRepresentation_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.cxx b/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.cxx
index 5478b6874e..cc21326bff 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepKinematics_RWMechanismStateRepresentation.hxx>
+#include "RWStepKinematics_RWMechanismStateRepresentation.pxx"
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.hxx b/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.pxx
index 5bdde4c7cc..cdd2e62880 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWMechanismStateRepresentation.pxx
@@ -35,13 +35,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWMechanismStateRepresentation();
+  Standard_HIDDEN RWStepKinematics_RWMechanismStateRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_MechanismStateRepresentation)& theEnt) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_MechanismStateRepresentation)& theEnt) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW, const Handle(StepKinematics_MechanismStateRepresentation)& theEnt) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW, const Handle(StepKinematics_MechanismStateRepresentation)& theEnt) const;
   
-  Standard_EXPORT void Share (const Handle(StepKinematics_MechanismStateRepresentation)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepKinematics_MechanismStateRepresentation)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWMechanismStateRepresentation_HeaderFile
diff --git a/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.cxx b/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.cxx
index 029d6c4073..f9acc07c8a 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWOrientedJoint.hxx>
+#include "RWStepKinematics_RWOrientedJoint.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.hxx b/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.pxx
index 47dd3f9f2e..3c068e0a99 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWOrientedJoint.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWOrientedJoint();
+  Standard_HIDDEN RWStepKinematics_RWOrientedJoint();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_OrientedJoint)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_OrientedJoint)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_OrientedJoint)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_OrientedJoint)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_OrientedJoint)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_OrientedJoint)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWOrientedJoint_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.cxx b/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.cxx
index 5dfd3e531f..451131c879 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPairRepresentationRelationship.hxx>
+#include "RWStepKinematics_RWPairRepresentationRelationship.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.hxx b/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.pxx
index 23fa5e698f..0456cbf01d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPairRepresentationRelationship.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPairRepresentationRelationship();
+  Standard_HIDDEN RWStepKinematics_RWPairRepresentationRelationship();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PairRepresentationRelationship)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PairRepresentationRelationship)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PairRepresentationRelationship)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PairRepresentationRelationship)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PairRepresentationRelationship)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PairRepresentationRelationship)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPairRepresentationRelationship_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.cxx
index 8ae05a8cff..888d94070d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPlanarCurvePair.hxx>
+#include "RWStepKinematics_RWPlanarCurvePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.pxx
index 577b943242..c3c59dee33 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPlanarCurvePair();
+  Standard_HIDDEN RWStepKinematics_RWPlanarCurvePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarCurvePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarCurvePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarCurvePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarCurvePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PlanarCurvePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PlanarCurvePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPlanarCurvePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.cxx
index 746976d09d..19ad0eff5e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPlanarCurvePairRange.hxx>
+#include "RWStepKinematics_RWPlanarCurvePairRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.pxx
index 8da86eeaa4..99061b37cd 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarCurvePairRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPlanarCurvePairRange();
+  Standard_HIDDEN RWStepKinematics_RWPlanarCurvePairRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarCurvePairRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarCurvePairRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarCurvePairRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarCurvePairRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PlanarCurvePairRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PlanarCurvePairRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPlanarCurvePairRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.cxx
index 7097d7bd2a..dc9fcfb8e1 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPlanarPair.hxx>
+#include "RWStepKinematics_RWPlanarPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPlanarPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPlanarPair.pxx
index 8ba23e684f..1867e1cff1 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPlanarPair();
+  Standard_HIDDEN RWStepKinematics_RWPlanarPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PlanarPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PlanarPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPlanarPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.cxx
index f93b976eb3..edceb8cb68 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPlanarPairValue.hxx>
+#include "RWStepKinematics_RWPlanarPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.pxx
index 5382856a06..dd624b37b0 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPlanarPairValue();
+  Standard_HIDDEN RWStepKinematics_RWPlanarPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PlanarPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PlanarPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPlanarPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.cxx
index 322a7b62db..80115cd433 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPlanarPairWithRange.hxx>
+#include "RWStepKinematics_RWPlanarPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.pxx
index f1a8229a8a..fdc42a72dd 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPlanarPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPlanarPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWPlanarPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PlanarPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PlanarPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PlanarPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PlanarPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPlanarPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.cxx
index d288a84d9e..3813213fbe 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPointOnPlanarCurvePair.hxx>
+#include "RWStepKinematics_RWPointOnPlanarCurvePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.pxx
index 54d5fd1545..64a682cb76 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPointOnPlanarCurvePair();
+  Standard_HIDDEN RWStepKinematics_RWPointOnPlanarCurvePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnPlanarCurvePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnPlanarCurvePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnPlanarCurvePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnPlanarCurvePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PointOnPlanarCurvePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PointOnPlanarCurvePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPointOnPlanarCurvePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.cxx
index c05ef8f6e6..162dd00372 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPointOnPlanarCurvePairValue.hxx>
+#include "RWStepKinematics_RWPointOnPlanarCurvePairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.pxx
index 29e605eb87..42b16b3b06 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPointOnPlanarCurvePairValue();
+  Standard_HIDDEN RWStepKinematics_RWPointOnPlanarCurvePairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnPlanarCurvePairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnPlanarCurvePairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnPlanarCurvePairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnPlanarCurvePairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PointOnPlanarCurvePairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PointOnPlanarCurvePairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPointOnPlanarCurvePairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.cxx
index 22f209ffa5..6395be9491 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPointOnPlanarCurvePairWithRange.hxx>
+#include "RWStepKinematics_RWPointOnPlanarCurvePairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.pxx
index b4c93d4707..3952954e81 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnPlanarCurvePairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPointOnPlanarCurvePairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWPointOnPlanarCurvePairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnPlanarCurvePairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnPlanarCurvePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnPlanarCurvePairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnPlanarCurvePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PointOnPlanarCurvePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PointOnPlanarCurvePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPointOnPlanarCurvePairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.cxx
index 3c476808e7..a4f226a9ff 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPointOnSurfacePair.hxx>
+#include "RWStepKinematics_RWPointOnSurfacePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.pxx
index d990b26468..43c87475ad 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPointOnSurfacePair();
+  Standard_HIDDEN RWStepKinematics_RWPointOnSurfacePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnSurfacePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnSurfacePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnSurfacePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnSurfacePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PointOnSurfacePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PointOnSurfacePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPointOnSurfacePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.cxx
index 94ae94355c..d46fe35a31 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPointOnSurfacePairValue.hxx>
+#include "RWStepKinematics_RWPointOnSurfacePairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.pxx
index b8341294c9..6bdbd75b8b 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPointOnSurfacePairValue();
+  Standard_HIDDEN RWStepKinematics_RWPointOnSurfacePairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnSurfacePairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnSurfacePairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnSurfacePairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnSurfacePairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PointOnSurfacePairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PointOnSurfacePairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPointOnSurfacePairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.cxx
index 91014584d9..01f23d473e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPointOnSurfacePairWithRange.hxx>
+#include "RWStepKinematics_RWPointOnSurfacePairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.pxx
index 45ed322ece..cd1c11510e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPointOnSurfacePairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPointOnSurfacePairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWPointOnSurfacePairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnSurfacePairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PointOnSurfacePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnSurfacePairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PointOnSurfacePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PointOnSurfacePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PointOnSurfacePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPointOnSurfacePairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.cxx
index 51e71ac1f7..1bf4170ab8 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPrismaticPair.hxx>
+#include "RWStepKinematics_RWPrismaticPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.pxx
index e685a6ad4e..905eaf9c75 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPrismaticPair();
+  Standard_HIDDEN RWStepKinematics_RWPrismaticPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PrismaticPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PrismaticPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PrismaticPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PrismaticPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PrismaticPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PrismaticPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPrismaticPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.cxx
index 6c9d9052be..90850dfba9 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPrismaticPairValue.hxx>
+#include "RWStepKinematics_RWPrismaticPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.pxx
index fee0c19933..ff35816be1 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPrismaticPairValue();
+  Standard_HIDDEN RWStepKinematics_RWPrismaticPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PrismaticPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PrismaticPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PrismaticPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PrismaticPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PrismaticPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PrismaticPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPrismaticPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.cxx
index e7f21ebeb2..22fbacfd1a 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWPrismaticPairWithRange.hxx>
+#include "RWStepKinematics_RWPrismaticPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.pxx
index 665069283e..2da01cd7a8 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWPrismaticPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWPrismaticPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWPrismaticPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PrismaticPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_PrismaticPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PrismaticPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_PrismaticPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_PrismaticPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_PrismaticPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWPrismaticPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.cxx b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.cxx
index ef3b100e2f..c937acdf5a 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWProductDefinitionKinematics.hxx>
+#include "RWStepKinematics_RWProductDefinitionKinematics.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.hxx b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.pxx
index 3d5796fbc6..24098cbf94 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionKinematics.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWProductDefinitionKinematics();
+  Standard_HIDDEN RWStepKinematics_RWProductDefinitionKinematics();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ProductDefinitionKinematics)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ProductDefinitionKinematics)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ProductDefinitionKinematics)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ProductDefinitionKinematics)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_ProductDefinitionKinematics)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_ProductDefinitionKinematics)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWProductDefinitionKinematics_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.cxx b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.cxx
index b191df446c..ef5d868e5c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWProductDefinitionRelationshipKinematics.hxx>
+#include "RWStepKinematics_RWProductDefinitionRelationshipKinematics.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.hxx b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.pxx
similarity index 87%
rename from src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.pxx
index 0fc3a20722..d401cf7c40 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWProductDefinitionRelationshipKinematics.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWProductDefinitionRelationshipKinematics();
+  Standard_HIDDEN RWStepKinematics_RWProductDefinitionRelationshipKinematics();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ProductDefinitionRelationshipKinematics)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ProductDefinitionRelationshipKinematics)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ProductDefinitionRelationshipKinematics)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ProductDefinitionRelationshipKinematics)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_ProductDefinitionRelationshipKinematics)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_ProductDefinitionRelationshipKinematics)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWProductDefinitionRelationshipKinematics_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.cxx
index ebbd68bbf9..43fa9e9339 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRackAndPinionPair.hxx>
+#include "RWStepKinematics_RWRackAndPinionPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.pxx
index 1032ae3701..e634d1104e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRackAndPinionPair();
+  Standard_HIDDEN RWStepKinematics_RWRackAndPinionPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RackAndPinionPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RackAndPinionPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RackAndPinionPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RackAndPinionPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RackAndPinionPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RackAndPinionPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRackAndPinionPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.cxx
index 650d333c57..c6c3f3a8b2 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRackAndPinionPairValue.hxx>
+#include "RWStepKinematics_RWRackAndPinionPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.pxx
index e7cbc804de..172c47c39d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRackAndPinionPairValue();
+  Standard_HIDDEN RWStepKinematics_RWRackAndPinionPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RackAndPinionPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RackAndPinionPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RackAndPinionPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RackAndPinionPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RackAndPinionPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RackAndPinionPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRackAndPinionPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.cxx
index b97d8ba6f6..c7626cf335 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRackAndPinionPairWithRange.hxx>
+#include "RWStepKinematics_RWRackAndPinionPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.pxx
index 5179abfaa4..88c8ac7b6c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRackAndPinionPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRackAndPinionPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWRackAndPinionPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RackAndPinionPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RackAndPinionPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RackAndPinionPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RackAndPinionPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RackAndPinionPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RackAndPinionPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRackAndPinionPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.cxx
index 5eea8712d8..7b1a39a920 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRevolutePair.hxx>
+#include "RWStepKinematics_RWRevolutePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRevolutePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRevolutePair.pxx
index b4b3d40037..3ebb451cde 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRevolutePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRevolutePair();
+  Standard_HIDDEN RWStepKinematics_RWRevolutePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RevolutePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RevolutePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RevolutePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RevolutePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RevolutePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RevolutePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRevolutePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.cxx
index 98ae04859b..8e9e36db1a 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRevolutePairValue.hxx>
+#include "RWStepKinematics_RWRevolutePairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.pxx
index eb38224ca6..e4995d15ed 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRevolutePairValue();
+  Standard_HIDDEN RWStepKinematics_RWRevolutePairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RevolutePairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RevolutePairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RevolutePairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RevolutePairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RevolutePairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RevolutePairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRevolutePairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.cxx
index a2cf369909..afa5b1aef4 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRevolutePairWithRange.hxx>
+#include "RWStepKinematics_RWRevolutePairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.pxx
index d594494186..1e82c8a103 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRevolutePairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRevolutePairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWRevolutePairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RevolutePairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RevolutePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RevolutePairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RevolutePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RevolutePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RevolutePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRevolutePairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.cxx b/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.cxx
index 3b486573f9..b05a2c1171 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRigidLinkRepresentation.hxx>
+#include "RWStepKinematics_RWRigidLinkRepresentation.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.hxx b/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.pxx
index 0f95af72b0..bf5a640797 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRigidLinkRepresentation.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRigidLinkRepresentation();
+  Standard_HIDDEN RWStepKinematics_RWRigidLinkRepresentation();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RigidLinkRepresentation)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RigidLinkRepresentation)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RigidLinkRepresentation)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RigidLinkRepresentation)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RigidLinkRepresentation)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RigidLinkRepresentation)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRigidLinkRepresentation_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.cxx
index 5aa9b984d5..a53954dbf2 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRollingCurvePair.hxx>
+#include "RWStepKinematics_RWRollingCurvePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.pxx
index 6b4e6c1597..8d2e6bf59a 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRollingCurvePair();
+  Standard_HIDDEN RWStepKinematics_RWRollingCurvePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingCurvePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingCurvePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingCurvePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingCurvePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RollingCurvePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RollingCurvePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRollingCurvePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.cxx
index b608d04469..ad736aa988 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRollingCurvePairValue.hxx>
+#include "RWStepKinematics_RWRollingCurvePairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.pxx
index 9ec3e53661..40ffae05e9 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingCurvePairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRollingCurvePairValue();
+  Standard_HIDDEN RWStepKinematics_RWRollingCurvePairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingCurvePairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingCurvePairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingCurvePairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingCurvePairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RollingCurvePairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RollingCurvePairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRollingCurvePairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.cxx
index 68c6596e36..46204e9d1b 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRollingSurfacePair.hxx>
+#include "RWStepKinematics_RWRollingSurfacePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.pxx
index 491eda205b..c4f99dd6b3 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRollingSurfacePair();
+  Standard_HIDDEN RWStepKinematics_RWRollingSurfacePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingSurfacePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingSurfacePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingSurfacePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingSurfacePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RollingSurfacePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RollingSurfacePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRollingSurfacePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.cxx
index 78851c7ee8..505cea868f 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRollingSurfacePairValue.hxx>
+#include "RWStepKinematics_RWRollingSurfacePairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.pxx
index 5ae75477ad..c30231584f 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRollingSurfacePairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRollingSurfacePairValue();
+  Standard_HIDDEN RWStepKinematics_RWRollingSurfacePairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingSurfacePairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RollingSurfacePairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingSurfacePairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RollingSurfacePairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RollingSurfacePairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RollingSurfacePairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRollingSurfacePairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.cxx b/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.cxx
index 65f3109391..a557b817a3 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWRotationAboutDirection.hxx>
+#include "RWStepKinematics_RWRotationAboutDirection.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.hxx b/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.pxx
index 32e35d6490..4d351cdb51 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWRotationAboutDirection.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWRotationAboutDirection();
+  Standard_HIDDEN RWStepKinematics_RWRotationAboutDirection();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RotationAboutDirection)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_RotationAboutDirection)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RotationAboutDirection)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_RotationAboutDirection)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_RotationAboutDirection)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_RotationAboutDirection)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWRotationAboutDirection_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWScrewPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWScrewPair.cxx
index 3bed0f9004..1a8cdaed1f 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWScrewPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWScrewPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWScrewPair.hxx>
+#include "RWStepKinematics_RWScrewPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWScrewPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWScrewPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWScrewPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWScrewPair.pxx
index 379e7dd34b..dc43864b33 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWScrewPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWScrewPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWScrewPair();
+  Standard_HIDDEN RWStepKinematics_RWScrewPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ScrewPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ScrewPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ScrewPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ScrewPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_ScrewPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_ScrewPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWScrewPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.cxx
index 06343e4538..1903a0480d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWScrewPairValue.hxx>
+#include "RWStepKinematics_RWScrewPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.pxx
index 916284e17f..8aa23aafc6 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWScrewPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWScrewPairValue();
+  Standard_HIDDEN RWStepKinematics_RWScrewPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ScrewPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ScrewPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ScrewPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ScrewPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_ScrewPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_ScrewPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWScrewPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.cxx
index 7fe42958a9..33f7ec36db 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWScrewPairWithRange.hxx>
+#include "RWStepKinematics_RWScrewPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.pxx
index 8826564b04..05a20cf70d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWScrewPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWScrewPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWScrewPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ScrewPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_ScrewPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ScrewPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_ScrewPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_ScrewPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_ScrewPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWScrewPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.cxx
index aba9c3dd05..2640ffea5c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSlidingCurvePair.hxx>
+#include "RWStepKinematics_RWSlidingCurvePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.pxx
index 6b319d28c3..fb9470f627 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSlidingCurvePair();
+  Standard_HIDDEN RWStepKinematics_RWSlidingCurvePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingCurvePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingCurvePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingCurvePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingCurvePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SlidingCurvePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SlidingCurvePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSlidingCurvePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.cxx
index 67eb5f9e1e..0484aa07fc 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSlidingCurvePairValue.hxx>
+#include "RWStepKinematics_RWSlidingCurvePairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.pxx
index 262d7882a5..72e4c6f811 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingCurvePairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSlidingCurvePairValue();
+  Standard_HIDDEN RWStepKinematics_RWSlidingCurvePairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingCurvePairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingCurvePairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingCurvePairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingCurvePairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SlidingCurvePairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SlidingCurvePairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSlidingCurvePairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.cxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.cxx
index 9e134b8e33..31b1d02090 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSlidingSurfacePair.hxx>
+#include "RWStepKinematics_RWSlidingSurfacePair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.hxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.pxx
index dbc46e4ab1..4391b83d30 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSlidingSurfacePair();
+  Standard_HIDDEN RWStepKinematics_RWSlidingSurfacePair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingSurfacePair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingSurfacePair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingSurfacePair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingSurfacePair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SlidingSurfacePair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SlidingSurfacePair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSlidingSurfacePair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.cxx
index fabe4bd53c..a90a2ef864 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSlidingSurfacePairValue.hxx>
+#include "RWStepKinematics_RWSlidingSurfacePairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.pxx
index 278adb3d82..6b73a8859e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSlidingSurfacePairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSlidingSurfacePairValue();
+  Standard_HIDDEN RWStepKinematics_RWSlidingSurfacePairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingSurfacePairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SlidingSurfacePairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingSurfacePairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SlidingSurfacePairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SlidingSurfacePairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SlidingSurfacePairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSlidingSurfacePairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.cxx
index 16f8ac8504..2725b71d7b 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSphericalPair.hxx>
+#include "RWStepKinematics_RWSphericalPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSphericalPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSphericalPair.pxx
index 9f9967c3e9..0794b1592a 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSphericalPair();
+  Standard_HIDDEN RWStepKinematics_RWSphericalPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SphericalPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SphericalPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSphericalPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.cxx
index 5bf44d0d2f..d275d80093 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSphericalPairValue.hxx>
+#include "RWStepKinematics_RWSphericalPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.pxx
index f145b48a11..85bed91ffb 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSphericalPairValue();
+  Standard_HIDDEN RWStepKinematics_RWSphericalPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SphericalPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SphericalPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSphericalPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.cxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.cxx
index 726c2ba0ba..294702ca3f 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSphericalPairWithPin.hxx>
+#include "RWStepKinematics_RWSphericalPairWithPin.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.hxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.pxx
index eb398abb53..c2d5658c9d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPin.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSphericalPairWithPin();
+  Standard_HIDDEN RWStepKinematics_RWSphericalPairWithPin();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairWithPin)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairWithPin)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairWithPin)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairWithPin)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SphericalPairWithPin)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SphericalPairWithPin)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSphericalPairWithPin_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.cxx
index 4e47edddff..54117677b5 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSphericalPairWithPinAndRange.hxx>
+#include "RWStepKinematics_RWSphericalPairWithPinAndRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.pxx
index 8a0e0b4c05..16a6764cad 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithPinAndRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSphericalPairWithPinAndRange();
+  Standard_HIDDEN RWStepKinematics_RWSphericalPairWithPinAndRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairWithPinAndRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairWithPinAndRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairWithPinAndRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairWithPinAndRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SphericalPairWithPinAndRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SphericalPairWithPinAndRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSphericalPairWithPinAndRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.cxx
index f089f9d7e0..be42648200 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSphericalPairWithRange.hxx>
+#include "RWStepKinematics_RWSphericalPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.pxx
index f08c617128..1131b1391d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSphericalPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSphericalPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWSphericalPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SphericalPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SphericalPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SphericalPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SphericalPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSphericalPairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.cxx
index 81d8dfeb88..05c7784cf1 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWSurfacePairWithRange.hxx>
+#include "RWStepKinematics_RWSurfacePairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.pxx
index b423e4b7ef..ee25df8d9d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWSurfacePairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWSurfacePairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWSurfacePairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SurfacePairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_SurfacePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SurfacePairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_SurfacePairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_SurfacePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_SurfacePairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWSurfacePairWithRange_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.cxx
index e8f4b3319f..81668e53f5 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWUnconstrainedPair.hxx>
+#include "RWStepKinematics_RWUnconstrainedPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.pxx
index 9b262bd9ae..607cb9e68c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWUnconstrainedPair();
+  Standard_HIDDEN RWStepKinematics_RWUnconstrainedPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UnconstrainedPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UnconstrainedPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UnconstrainedPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UnconstrainedPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_UnconstrainedPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_UnconstrainedPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWUnconstrainedPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.cxx
index d5c05409db..1c90d704ed 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWUnconstrainedPairValue.hxx>
+#include "RWStepKinematics_RWUnconstrainedPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.pxx
index 8f53fb4bf5..6efe224a6d 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUnconstrainedPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWUnconstrainedPairValue();
+  Standard_HIDDEN RWStepKinematics_RWUnconstrainedPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UnconstrainedPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UnconstrainedPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UnconstrainedPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UnconstrainedPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_UnconstrainedPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_UnconstrainedPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWUnconstrainedPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.cxx b/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.cxx
index 3cffe5357e..5232fb88f8 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWUniversalPair.hxx>
+#include "RWStepKinematics_RWUniversalPair.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.hxx b/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWUniversalPair.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWUniversalPair.pxx
index 687f3ed934..f892bae299 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUniversalPair.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWUniversalPair();
+  Standard_HIDDEN RWStepKinematics_RWUniversalPair();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UniversalPair)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UniversalPair)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UniversalPair)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UniversalPair)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_UniversalPair)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_UniversalPair)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWUniversalPair_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.cxx b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.cxx
index 45b86dbed6..4901f7727e 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWUniversalPairValue.hxx>
+#include "RWStepKinematics_RWUniversalPairValue.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.hxx b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.pxx
index d31050498e..7adc5515ca 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairValue.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWUniversalPairValue();
+  Standard_HIDDEN RWStepKinematics_RWUniversalPairValue();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UniversalPairValue)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UniversalPairValue)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UniversalPairValue)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UniversalPairValue)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_UniversalPairValue)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_UniversalPairValue)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWUniversalPairValue_HeaderFile_
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.cxx b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.cxx
index 496ee0bd01..9ab8059bea 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.cxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepKinematics_RWUniversalPairWithRange.hxx>
+#include "RWStepKinematics_RWUniversalPairWithRange.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.hxx b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.pxx
similarity index 86%
rename from src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.hxx
rename to src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.pxx
index c4bbbe36df..04ee26838c 100644
--- a/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.hxx
+++ b/src/RWStepKinematics/RWStepKinematics_RWUniversalPairWithRange.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepKinematics_RWUniversalPairWithRange();
+  Standard_HIDDEN RWStepKinematics_RWUniversalPairWithRange();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UniversalPairWithRange)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theArch, const Handle(StepKinematics_UniversalPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UniversalPairWithRange)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW, const Handle(StepKinematics_UniversalPairWithRange)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepKinematics_UniversalPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepKinematics_UniversalPairWithRange)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepKinematics_RWUniversalPairWithRange_HeaderFile_
diff --git a/src/RWStepRepr/FILES b/src/RWStepRepr/FILES
index ea5252162d..2bfc87d5c9 100644
--- a/src/RWStepRepr/FILES
+++ b/src/RWStepRepr/FILES
@@ -1,140 +1,140 @@
 RWStepRepr_RWAllAroundShapeAspect.cxx
-RWStepRepr_RWAllAroundShapeAspect.hxx
+RWStepRepr_RWAllAroundShapeAspect.pxx
 RWStepRepr_RWApex.cxx
-RWStepRepr_RWApex.hxx
+RWStepRepr_RWApex.pxx
 RWStepRepr_RWAssemblyComponentUsage.cxx
-RWStepRepr_RWAssemblyComponentUsage.hxx
+RWStepRepr_RWAssemblyComponentUsage.pxx
 RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx
-RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx
+RWStepRepr_RWAssemblyComponentUsageSubstitute.pxx
 RWStepRepr_RWBetweenShapeAspect.cxx
-RWStepRepr_RWBetweenShapeAspect.hxx
+RWStepRepr_RWBetweenShapeAspect.pxx
 RWStepRepr_RWBooleanRepresentationItem.cxx
-RWStepRepr_RWBooleanRepresentationItem.hxx
+RWStepRepr_RWBooleanRepresentationItem.pxx
 RWStepRepr_RWCentreOfSymmetry.cxx
-RWStepRepr_RWCentreOfSymmetry.hxx
+RWStepRepr_RWCentreOfSymmetry.pxx
 RWStepRepr_RWCharacterizedRepresentation.cxx
-RWStepRepr_RWCharacterizedRepresentation.hxx
+RWStepRepr_RWCharacterizedRepresentation.pxx
 RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx
-RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx
+RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.pxx
 RWStepRepr_RWCompositeGroupShapeAspect.cxx
-RWStepRepr_RWCompositeGroupShapeAspect.hxx
+RWStepRepr_RWCompositeGroupShapeAspect.pxx
 RWStepRepr_RWCompositeShapeAspect.cxx
-RWStepRepr_RWCompositeShapeAspect.hxx
+RWStepRepr_RWCompositeShapeAspect.pxx
 RWStepRepr_RWCompoundRepresentationItem.cxx
-RWStepRepr_RWCompoundRepresentationItem.hxx
+RWStepRepr_RWCompoundRepresentationItem.pxx
 RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.cxx
-RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx
+RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.pxx
 RWStepRepr_RWConfigurationDesign.cxx
-RWStepRepr_RWConfigurationDesign.hxx
+RWStepRepr_RWConfigurationDesign.pxx
 RWStepRepr_RWConfigurationEffectivity.cxx
-RWStepRepr_RWConfigurationEffectivity.hxx
+RWStepRepr_RWConfigurationEffectivity.pxx
 RWStepRepr_RWConfigurationItem.cxx
-RWStepRepr_RWConfigurationItem.hxx
+RWStepRepr_RWConfigurationItem.pxx
 RWStepRepr_RWConstructiveGeometryRepresentation.cxx
-RWStepRepr_RWConstructiveGeometryRepresentation.hxx
+RWStepRepr_RWConstructiveGeometryRepresentation.pxx
 RWStepRepr_RWConstructiveGeometryRepresentationRelationship.cxx
-RWStepRepr_RWConstructiveGeometryRepresentationRelationship.hxx
+RWStepRepr_RWConstructiveGeometryRepresentationRelationship.pxx
 RWStepRepr_RWContinuosShapeAspect.cxx
-RWStepRepr_RWContinuosShapeAspect.hxx
+RWStepRepr_RWContinuosShapeAspect.pxx
 RWStepRepr_RWDataEnvironment.cxx
-RWStepRepr_RWDataEnvironment.hxx
+RWStepRepr_RWDataEnvironment.pxx
 RWStepRepr_RWDefinitionalRepresentation.cxx
-RWStepRepr_RWDefinitionalRepresentation.hxx
+RWStepRepr_RWDefinitionalRepresentation.pxx
 RWStepRepr_RWDerivedShapeAspect.cxx
-RWStepRepr_RWDerivedShapeAspect.hxx
+RWStepRepr_RWDerivedShapeAspect.pxx
 RWStepRepr_RWDescriptiveRepresentationItem.cxx
-RWStepRepr_RWDescriptiveRepresentationItem.hxx
+RWStepRepr_RWDescriptiveRepresentationItem.pxx
 RWStepRepr_RWExtension.cxx
-RWStepRepr_RWExtension.hxx
+RWStepRepr_RWExtension.pxx
 RWStepRepr_RWFeatureForDatumTargetRelationship.cxx
-RWStepRepr_RWFeatureForDatumTargetRelationship.hxx
+RWStepRepr_RWFeatureForDatumTargetRelationship.pxx
 RWStepRepr_RWFunctionallyDefinedTransformation.cxx
-RWStepRepr_RWFunctionallyDefinedTransformation.hxx
+RWStepRepr_RWFunctionallyDefinedTransformation.pxx
 RWStepRepr_RWGeometricAlignment.cxx
-RWStepRepr_RWGeometricAlignment.hxx
+RWStepRepr_RWGeometricAlignment.pxx
 RWStepRepr_RWGlobalUncertaintyAssignedContext.cxx
-RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx
+RWStepRepr_RWGlobalUncertaintyAssignedContext.pxx
 RWStepRepr_RWGlobalUnitAssignedContext.cxx
-RWStepRepr_RWGlobalUnitAssignedContext.hxx
+RWStepRepr_RWGlobalUnitAssignedContext.pxx
 RWStepRepr_RWIntegerRepresentationItem.cxx
-RWStepRepr_RWIntegerRepresentationItem.hxx
+RWStepRepr_RWIntegerRepresentationItem.pxx
 RWStepRepr_RWItemDefinedTransformation.cxx
-RWStepRepr_RWItemDefinedTransformation.hxx
+RWStepRepr_RWItemDefinedTransformation.pxx
 RWStepRepr_RWMakeFromUsageOption.cxx
-RWStepRepr_RWMakeFromUsageOption.hxx
+RWStepRepr_RWMakeFromUsageOption.pxx
 RWStepRepr_RWMappedItem.cxx
-RWStepRepr_RWMappedItem.hxx
+RWStepRepr_RWMappedItem.pxx
 RWStepRepr_RWMaterialDesignation.cxx
-RWStepRepr_RWMaterialDesignation.hxx
+RWStepRepr_RWMaterialDesignation.pxx
 RWStepRepr_RWMaterialProperty.cxx
-RWStepRepr_RWMaterialProperty.hxx
+RWStepRepr_RWMaterialProperty.pxx
 RWStepRepr_RWMaterialPropertyRepresentation.cxx
-RWStepRepr_RWMaterialPropertyRepresentation.hxx
+RWStepRepr_RWMaterialPropertyRepresentation.pxx
 RWStepRepr_RWMeasureRepresentationItem.cxx
-RWStepRepr_RWMeasureRepresentationItem.hxx
+RWStepRepr_RWMeasureRepresentationItem.pxx
 RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.cxx
-RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx
+RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.pxx
 RWStepRepr_RWParallelOffset.cxx
-RWStepRepr_RWParallelOffset.hxx
+RWStepRepr_RWParallelOffset.pxx
 RWStepRepr_RWParametricRepresentationContext.cxx
-RWStepRepr_RWParametricRepresentationContext.hxx
+RWStepRepr_RWParametricRepresentationContext.pxx
 RWStepRepr_RWPerpendicularTo.cxx
-RWStepRepr_RWPerpendicularTo.hxx
+RWStepRepr_RWPerpendicularTo.pxx
 RWStepRepr_RWProductConcept.cxx
-RWStepRepr_RWProductConcept.hxx
+RWStepRepr_RWProductConcept.pxx
 RWStepRepr_RWProductDefinitionShape.cxx
-RWStepRepr_RWProductDefinitionShape.hxx
+RWStepRepr_RWProductDefinitionShape.pxx
 RWStepRepr_RWPropertyDefinition.cxx
-RWStepRepr_RWPropertyDefinition.hxx
+RWStepRepr_RWPropertyDefinition.pxx
 RWStepRepr_RWPropertyDefinitionRelationship.cxx
-RWStepRepr_RWPropertyDefinitionRelationship.hxx
+RWStepRepr_RWPropertyDefinitionRelationship.pxx
 RWStepRepr_RWPropertyDefinitionRepresentation.cxx
-RWStepRepr_RWPropertyDefinitionRepresentation.hxx
+RWStepRepr_RWPropertyDefinitionRepresentation.pxx
 RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
-RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx
+RWStepRepr_RWQuantifiedAssemblyComponentUsage.pxx
 RWStepRepr_RWRealRepresentationItem.cxx
-RWStepRepr_RWRealRepresentationItem.hxx
+RWStepRepr_RWRealRepresentationItem.pxx
 RWStepRepr_RWRepresentation.cxx
-RWStepRepr_RWRepresentation.hxx
+RWStepRepr_RWRepresentation.pxx
 RWStepRepr_RWRepresentationContext.cxx
-RWStepRepr_RWRepresentationContext.hxx
+RWStepRepr_RWRepresentationContext.pxx
 RWStepRepr_RWRepresentationContextReference.cxx
-RWStepRepr_RWRepresentationContextReference.hxx
+RWStepRepr_RWRepresentationContextReference.pxx
 RWStepRepr_RWRepresentationItem.cxx
-RWStepRepr_RWRepresentationItem.hxx
+RWStepRepr_RWRepresentationItem.pxx
 RWStepRepr_RWRepresentationMap.cxx
-RWStepRepr_RWRepresentationMap.hxx
+RWStepRepr_RWRepresentationMap.pxx
 RWStepRepr_RWRepresentationReference.cxx
-RWStepRepr_RWRepresentationReference.hxx
+RWStepRepr_RWRepresentationReference.pxx
 RWStepRepr_RWRepresentationRelationship.cxx
-RWStepRepr_RWRepresentationRelationship.hxx
+RWStepRepr_RWRepresentationRelationship.pxx
 RWStepRepr_RWRepresentationRelationshipWithTransformation.cxx
-RWStepRepr_RWRepresentationRelationshipWithTransformation.hxx
+RWStepRepr_RWRepresentationRelationshipWithTransformation.pxx
 RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cxx
-RWStepRepr_RWReprItemAndLengthMeasureWithUnit.hxx
+RWStepRepr_RWReprItemAndLengthMeasureWithUnit.pxx
 RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.cxx
-RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.hxx
+RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.pxx
 RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.cxx
-RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.hxx
+RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.pxx
 RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx
-RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx
+RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.pxx
 RWStepRepr_RWShapeAspect.cxx
-RWStepRepr_RWShapeAspect.hxx
+RWStepRepr_RWShapeAspect.pxx
 RWStepRepr_RWShapeAspectDerivingRelationship.cxx
-RWStepRepr_RWShapeAspectDerivingRelationship.hxx
+RWStepRepr_RWShapeAspectDerivingRelationship.pxx
 RWStepRepr_RWShapeAspectRelationship.cxx
-RWStepRepr_RWShapeAspectRelationship.hxx
+RWStepRepr_RWShapeAspectRelationship.pxx
 RWStepRepr_RWShapeAspectTransition.cxx
-RWStepRepr_RWShapeAspectTransition.hxx
+RWStepRepr_RWShapeAspectTransition.pxx
 RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cxx
-RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.hxx
+RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.pxx
 RWStepRepr_RWSpecifiedHigherUsageOccurrence.cxx
-RWStepRepr_RWSpecifiedHigherUsageOccurrence.hxx
+RWStepRepr_RWSpecifiedHigherUsageOccurrence.pxx
 RWStepRepr_RWStructuralResponseProperty.cxx
-RWStepRepr_RWStructuralResponseProperty.hxx
+RWStepRepr_RWStructuralResponseProperty.pxx
 RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.cxx
-RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.hxx
+RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.pxx
 RWStepRepr_RWTangent.cxx
-RWStepRepr_RWTangent.hxx
+RWStepRepr_RWTangent.pxx
 RWStepRepr_RWValueRepresentationItem.cxx
-RWStepRepr_RWValueRepresentationItem.hxx
\ No newline at end of file
+RWStepRepr_RWValueRepresentationItem.pxx
\ No newline at end of file
diff --git a/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.cxx b/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.cxx
index d22fb96984..0d925ba4a4 100644
--- a/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWAllAroundShapeAspect.hxx>
+#include "RWStepRepr_RWAllAroundShapeAspect.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.hxx b/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.hxx
rename to src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.pxx
index 3c1dde9b86..02ad52bd2a 100644
--- a/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWAllAroundShapeAspect.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWAllAroundShapeAspect();
+  Standard_HIDDEN RWStepRepr_RWAllAroundShapeAspect();
   
   //! Reads AllAroundShapeAspect
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_AllAroundShapeAspect)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_AllAroundShapeAspect)& ent)  const;
   
   //! Writes AllAroundShapeAspect
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_AllAroundShapeAspect)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_AllAroundShapeAspect)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_AllAroundShapeAspect)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_AllAroundShapeAspect)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWAllAroundShapeAspect_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWApex.cxx b/src/RWStepRepr/RWStepRepr_RWApex.cxx
index bb5b1889b9..7dfbf6a595 100644
--- a/src/RWStepRepr/RWStepRepr_RWApex.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWApex.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWApex.hxx>
+#include "RWStepRepr_RWApex.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWApex.hxx b/src/RWStepRepr/RWStepRepr_RWApex.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWApex.hxx
rename to src/RWStepRepr/RWStepRepr_RWApex.pxx
index d29d006f3e..1453c703bd 100644
--- a/src/RWStepRepr/RWStepRepr_RWApex.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWApex.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWApex();
+  Standard_HIDDEN RWStepRepr_RWApex();
   
   //! Reads Apex
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Apex)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Apex)& ent)  const;
   
   //! Writes Apex
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Apex)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Apex)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_Apex)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_Apex)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWApex_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx
index 1be4348711..d29a6f26ca 100644
--- a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWAssemblyComponentUsage.hxx>
+#include "RWStepRepr_RWAssemblyComponentUsage.pxx"
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.hxx b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.hxx
rename to src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.pxx
index 610008c57c..ba6b2ae00c 100644
--- a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWAssemblyComponentUsage();
+  Standard_HIDDEN RWStepRepr_RWAssemblyComponentUsage();
   
   //! Reads AssemblyComponentUsage
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_AssemblyComponentUsage)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_AssemblyComponentUsage)& ent) const;
   
   //! Writes AssemblyComponentUsage
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_AssemblyComponentUsage)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_AssemblyComponentUsage)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_AssemblyComponentUsage)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_AssemblyComponentUsage)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx
index 1a4ffa01c5..2eee30906f 100644
--- a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx>
+#include "RWStepRepr_RWAssemblyComponentUsageSubstitute.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_AssemblyComponentUsage.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx
rename to src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.pxx
index d978c6e6e6..5e4b2db689 100644
--- a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWAssemblyComponentUsageSubstitute();
+  Standard_HIDDEN RWStepRepr_RWAssemblyComponentUsageSubstitute();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_AssemblyComponentUsageSubstitute)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_AssemblyComponentUsageSubstitute)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_AssemblyComponentUsageSubstitute)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_AssemblyComponentUsageSubstitute)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_AssemblyComponentUsageSubstitute)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_AssemblyComponentUsageSubstitute)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.cxx b/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.cxx
index 8bd7064fc5..5b2677688f 100644
--- a/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWBetweenShapeAspect.hxx>
+#include "RWStepRepr_RWBetweenShapeAspect.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.hxx b/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.hxx
rename to src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.pxx
index 180ec37635..d4209267bc 100644
--- a/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWBetweenShapeAspect.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWBetweenShapeAspect();
+  Standard_HIDDEN RWStepRepr_RWBetweenShapeAspect();
   
   //! Reads BetweenShapeAspect
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_BetweenShapeAspect)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_BetweenShapeAspect)& ent)  const;
   
   //! Writes BetweenShapeAspect
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_BetweenShapeAspect)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_BetweenShapeAspect)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_BetweenShapeAspect)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_BetweenShapeAspect)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWBetweenShapeAspect_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.cxx
index e4abd6f556..addcff230b 100644
--- a/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
+#include "RWStepRepr_RWBooleanRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_BooleanRepresentationItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.pxx
index 61c613fca7..37795bcfc6 100644
--- a/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.pxx
@@ -32,14 +32,14 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepRepr_RWBooleanRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWBooleanRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData,
                                  const Standard_Integer theNum,
                                  Handle(Interface_Check)& theAch,
                                  const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW,
                                   const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
 };
 #endif // _RWStepRepr_RWBooleanRepresentationItem_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.cxx b/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.cxx
index 64ee2c7e6d..5a3b3702a9 100644
--- a/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWCentreOfSymmetry.hxx>
+#include "RWStepRepr_RWCentreOfSymmetry.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.hxx b/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.hxx
rename to src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.pxx
index 24d7d3999a..c73e128dbd 100644
--- a/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWCentreOfSymmetry.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWCentreOfSymmetry();
+  Standard_HIDDEN RWStepRepr_RWCentreOfSymmetry();
   
   //! Reads CentreOfSymmetry
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CentreOfSymmetry)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CentreOfSymmetry)& ent)  const;
   
   //! Writes CentreOfSymmetry
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CentreOfSymmetry)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CentreOfSymmetry)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_CentreOfSymmetry)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_CentreOfSymmetry)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWCentreOfSymmetry_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.cxx b/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.cxx
index 449a1d4bdf..20fe7bcfdc 100644
--- a/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWCharacterizedRepresentation.hxx>
+#include "RWStepRepr_RWCharacterizedRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_CharacterizedRepresentation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.hxx b/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.hxx
rename to src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.pxx
index 6bb160895b..c357be71a1 100644
--- a/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWCharacterizedRepresentation.pxx
@@ -36,13 +36,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWCharacterizedRepresentation();
+  Standard_HIDDEN RWStepRepr_RWCharacterizedRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CharacterizedRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CharacterizedRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CharacterizedRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CharacterizedRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_CharacterizedRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_CharacterizedRepresentation)& ent, Interface_EntityIterator& iter) const;
 };
 
 #endif // _RWStepRepr_RWCharacterizedRepresentation_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx b/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx
index 86813f1006..2bf8867d3c 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx
@@ -15,7 +15,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
+#include "RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx b/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx
rename to src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.pxx
index 690125ef1e..af1c0f5098 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp();
+  Standard_HIDDEN RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.cxx b/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.cxx
index 575a7be374..1431282488 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.cxx
@@ -15,7 +15,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx>
+#include "RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx b/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx
rename to src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.pxx
index 14dcab151e..be2a75efb1 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.pxx
@@ -36,12 +36,12 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWCompShAspAndDatumFeatAndShAsp();
+  Standard_HIDDEN RWStepRepr_RWCompShAspAndDatumFeatAndShAsp();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompShAspAndDatumFeatAndShAsp)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompShAspAndDatumFeatAndShAsp)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompShAspAndDatumFeatAndShAsp)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompShAspAndDatumFeatAndShAsp)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_CompShAspAndDatumFeatAndShAsp)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_CompShAspAndDatumFeatAndShAsp)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepRepr_RWCompShAspAndDatumFeatAndShAsp_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.cxx b/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.cxx
index f8974197c1..59f74e33c0 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWCompositeGroupShapeAspect.hxx>
+#include "RWStepRepr_RWCompositeGroupShapeAspect.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.hxx b/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.hxx
rename to src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.pxx
index 90b1b7620b..13655fb37d 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompositeGroupShapeAspect.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWCompositeGroupShapeAspect();
+  Standard_HIDDEN RWStepRepr_RWCompositeGroupShapeAspect();
   
   //! Reads CompositeGroupShapeAspect
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompositeGroupShapeAspect)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompositeGroupShapeAspect)& ent)  const;
   
   //! Writes CompositeGroupShapeAspect
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompositeGroupShapeAspect)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompositeGroupShapeAspect)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_CompositeGroupShapeAspect)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_CompositeGroupShapeAspect)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWCompositeGroupShapeAspect_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.cxx b/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.cxx
index 428ae1ddf4..332d8d3f67 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWCompositeShapeAspect.hxx>
+#include "RWStepRepr_RWCompositeShapeAspect.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_CompositeShapeAspect.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.hxx b/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.hxx
rename to src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.pxx
index 225839bd7a..8154492850 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompositeShapeAspect.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWCompositeShapeAspect();
+  Standard_HIDDEN RWStepRepr_RWCompositeShapeAspect();
   
   //! Reads CompositeShapeAspect
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompositeShapeAspect)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompositeShapeAspect)& ent) const;
   
   //! Writes CompositeShapeAspect
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompositeShapeAspect)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompositeShapeAspect)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_CompositeShapeAspect)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_CompositeShapeAspect)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cxx
index 1c8b6e2787..159f3ed763 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWCompoundRepresentationItem.hxx>
+#include "RWStepRepr_RWCompoundRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_CompoundRepresentationItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.pxx
index 8ab0b3732a..62c6b0de98 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.pxx
@@ -37,14 +37,14 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWCompoundRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWCompoundRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompoundRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_CompoundRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompoundRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_CompoundRepresentationItem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_CompoundRepresentationItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_CompoundRepresentationItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.cxx b/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.cxx
index c9f473c195..5154ad4149 100644
--- a/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWConfigurationDesign.hxx>
+#include "RWStepRepr_RWConfigurationDesign.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ConfigurationDesign.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.hxx b/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWConfigurationDesign.hxx
rename to src/RWStepRepr/RWStepRepr_RWConfigurationDesign.pxx
index 74a1122271..24e9b17d4a 100644
--- a/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWConfigurationDesign.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWConfigurationDesign();
+  Standard_HIDDEN RWStepRepr_RWConfigurationDesign();
   
   //! Reads ConfigurationDesign
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConfigurationDesign)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConfigurationDesign)& ent) const;
   
   //! Writes ConfigurationDesign
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConfigurationDesign)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConfigurationDesign)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ConfigurationDesign)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ConfigurationDesign)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.cxx b/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.cxx
index 178a5f9ba6..0418f91bc7 100644
--- a/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWConfigurationEffectivity.hxx>
+#include "RWStepRepr_RWConfigurationEffectivity.pxx"
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.hxx b/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.hxx
rename to src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.pxx
index bc9c03dc65..7f5d36fce0 100644
--- a/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWConfigurationEffectivity.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWConfigurationEffectivity();
+  Standard_HIDDEN RWStepRepr_RWConfigurationEffectivity();
   
   //! Reads ConfigurationEffectivity
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConfigurationEffectivity)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConfigurationEffectivity)& ent) const;
   
   //! Writes ConfigurationEffectivity
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConfigurationEffectivity)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConfigurationEffectivity)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ConfigurationEffectivity)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ConfigurationEffectivity)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWConfigurationItem.cxx b/src/RWStepRepr/RWStepRepr_RWConfigurationItem.cxx
index 5acca307c2..91571c4e56 100644
--- a/src/RWStepRepr/RWStepRepr_RWConfigurationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWConfigurationItem.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWConfigurationItem.hxx>
+#include "RWStepRepr_RWConfigurationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ConfigurationItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWConfigurationItem.hxx b/src/RWStepRepr/RWStepRepr_RWConfigurationItem.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWConfigurationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWConfigurationItem.pxx
index a3a45d9661..5d4d04e654 100644
--- a/src/RWStepRepr/RWStepRepr_RWConfigurationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWConfigurationItem.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWConfigurationItem();
+  Standard_HIDDEN RWStepRepr_RWConfigurationItem();
   
   //! Reads ConfigurationItem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConfigurationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConfigurationItem)& ent) const;
   
   //! Writes ConfigurationItem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConfigurationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConfigurationItem)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ConfigurationItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ConfigurationItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.cxx b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.cxx
index 48dbebb911..5932c7a5d7 100644
--- a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWConstructiveGeometryRepresentation.hxx>
+#include "RWStepRepr_RWConstructiveGeometryRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.hxx b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.hxx
rename to src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.pxx
index d33a609f4b..6fe82af6e8 100644
--- a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentation.pxx
@@ -36,13 +36,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepRepr_RWConstructiveGeometryRepresentation();
+  Standard_HIDDEN RWStepRepr_RWConstructiveGeometryRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConstructiveGeometryRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConstructiveGeometryRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConstructiveGeometryRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConstructiveGeometryRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_ConstructiveGeometryRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ConstructiveGeometryRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepRepr_RWConstructiveGeometryRepresentation_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.cxx b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.cxx
index e93e64c803..e8c9e4d564 100644
--- a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWConstructiveGeometryRepresentationRelationship.hxx>
+#include "RWStepRepr_RWConstructiveGeometryRepresentationRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ConstructiveGeometryRepresentation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.hxx b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.hxx
rename to src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.pxx
index 6417d95b80..57f680ba54 100644
--- a/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWConstructiveGeometryRepresentationRelationship.pxx
@@ -35,13 +35,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepRepr_RWConstructiveGeometryRepresentationRelationship();
+  Standard_HIDDEN RWStepRepr_RWConstructiveGeometryRepresentationRelationship();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& ent, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepRepr_RWConstructiveGeometryRepresentationRelationship_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.cxx b/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.cxx
index e7f2b88555..d17cf62ec4 100644
--- a/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWContinuosShapeAspect.hxx>
+#include "RWStepRepr_RWContinuosShapeAspect.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.hxx b/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.hxx
rename to src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.pxx
index f518d97e21..cfc1b46cb5 100644
--- a/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWContinuosShapeAspect.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWContinuosShapeAspect();
+  Standard_HIDDEN RWStepRepr_RWContinuosShapeAspect();
   
   //! Reads ContinuosShapeAspect
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ContinuosShapeAspect)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ContinuosShapeAspect)& ent)  const;
   
   //! Writes ContinuosShapeAspect
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ContinuosShapeAspect)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ContinuosShapeAspect)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_ContinuosShapeAspect)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_ContinuosShapeAspect)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWContinuosShapeAspect_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWDataEnvironment.cxx b/src/RWStepRepr/RWStepRepr_RWDataEnvironment.cxx
index 06682413e8..0ee8e2d5e3 100644
--- a/src/RWStepRepr/RWStepRepr_RWDataEnvironment.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWDataEnvironment.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWDataEnvironment.hxx>
+#include "RWStepRepr_RWDataEnvironment.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_DataEnvironment.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWDataEnvironment.hxx b/src/RWStepRepr/RWStepRepr_RWDataEnvironment.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWDataEnvironment.hxx
rename to src/RWStepRepr/RWStepRepr_RWDataEnvironment.pxx
index 351f875fd9..b1c2a667a0 100644
--- a/src/RWStepRepr/RWStepRepr_RWDataEnvironment.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWDataEnvironment.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWDataEnvironment();
+  Standard_HIDDEN RWStepRepr_RWDataEnvironment();
   
   //! Reads DataEnvironment
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DataEnvironment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DataEnvironment)& ent) const;
   
   //! Writes DataEnvironment
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DataEnvironment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DataEnvironment)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_DataEnvironment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_DataEnvironment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cxx b/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cxx
index 0dd96f40eb..f743aef05e 100644
--- a/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWDefinitionalRepresentation.hxx>
+#include "RWStepRepr_RWDefinitionalRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_DefinitionalRepresentation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.hxx b/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.hxx
rename to src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.pxx
index 16cac9c9b2..d4cf131293 100644
--- a/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWDefinitionalRepresentation();
+  Standard_HIDDEN RWStepRepr_RWDefinitionalRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DefinitionalRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DefinitionalRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DefinitionalRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DefinitionalRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_DefinitionalRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_DefinitionalRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.cxx b/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.cxx
index 42da482c4b..627d14cb01 100644
--- a/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWDerivedShapeAspect.hxx>
+#include "RWStepRepr_RWDerivedShapeAspect.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_DerivedShapeAspect.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.hxx b/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.hxx
rename to src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.pxx
index 7cab605e92..1671c9bcd2 100644
--- a/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWDerivedShapeAspect.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWDerivedShapeAspect();
+  Standard_HIDDEN RWStepRepr_RWDerivedShapeAspect();
   
   //! Reads DerivedShapeAspect
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DerivedShapeAspect)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DerivedShapeAspect)& ent) const;
   
   //! Writes DerivedShapeAspect
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DerivedShapeAspect)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DerivedShapeAspect)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_DerivedShapeAspect)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_DerivedShapeAspect)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx
index 09217e0749..104cba1151 100644
--- a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_Check.hxx>
-#include <RWStepRepr_RWDescriptiveRepresentationItem.hxx>
+#include "RWStepRepr_RWDescriptiveRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.pxx
index 1475317ea6..3f54eadf29 100644
--- a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWDescriptiveRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWDescriptiveRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DescriptiveRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_DescriptiveRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DescriptiveRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_DescriptiveRepresentationItem)& ent) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWExtension.cxx b/src/RWStepRepr/RWStepRepr_RWExtension.cxx
index d549b0023e..7237a1ab89 100644
--- a/src/RWStepRepr/RWStepRepr_RWExtension.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWExtension.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWExtension.hxx>
+#include "RWStepRepr_RWExtension.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Extension.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWExtension.hxx b/src/RWStepRepr/RWStepRepr_RWExtension.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWExtension.hxx
rename to src/RWStepRepr/RWStepRepr_RWExtension.pxx
index 51f972eafe..c8d97f03c9 100644
--- a/src/RWStepRepr/RWStepRepr_RWExtension.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWExtension.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWExtension();
+  Standard_HIDDEN RWStepRepr_RWExtension();
   
   //! Reads Extension
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Extension)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Extension)& ent) const;
   
   //! Writes Extension
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Extension)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Extension)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_Extension)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_Extension)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.cxx b/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.cxx
index c67098dba1..99036a6961 100644
--- a/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWFeatureForDatumTargetRelationship.hxx>
+#include "RWStepRepr_RWFeatureForDatumTargetRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.hxx b/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.hxx
rename to src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.pxx
index 47eb8f1be4..159d7ebaed 100644
--- a/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWFeatureForDatumTargetRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWFeatureForDatumTargetRelationship();
+  Standard_HIDDEN RWStepRepr_RWFeatureForDatumTargetRelationship();
   
   //! Reads ShapeAspectRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_FeatureForDatumTargetRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_FeatureForDatumTargetRelationship)& ent) const;
   
   //! Writes ShapeAspectRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_FeatureForDatumTargetRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_FeatureForDatumTargetRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_FeatureForDatumTargetRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_FeatureForDatumTargetRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cxx b/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cxx
index 85fdda6e0a..43fbf22ed1 100644
--- a/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cxx
@@ -13,7 +13,7 @@
 
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
-#include <RWStepRepr_RWFunctionallyDefinedTransformation.hxx>
+#include "RWStepRepr_RWFunctionallyDefinedTransformation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_FunctionallyDefinedTransformation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.hxx b/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.hxx
rename to src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.pxx
index cb421fc033..f6935d66d1 100644
--- a/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWFunctionallyDefinedTransformation();
+  Standard_HIDDEN RWStepRepr_RWFunctionallyDefinedTransformation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_FunctionallyDefinedTransformation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_FunctionallyDefinedTransformation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_FunctionallyDefinedTransformation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_FunctionallyDefinedTransformation)& ent) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.cxx b/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.cxx
index 8baea8ab77..5efd321c63 100644
--- a/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWGeometricAlignment.hxx>
+#include "RWStepRepr_RWGeometricAlignment.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.hxx b/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWGeometricAlignment.hxx
rename to src/RWStepRepr/RWStepRepr_RWGeometricAlignment.pxx
index 3992469576..66453643f9 100644
--- a/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWGeometricAlignment.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWGeometricAlignment();
+  Standard_HIDDEN RWStepRepr_RWGeometricAlignment();
   
   //! Reads GeometricAlignment
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_GeometricAlignment)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_GeometricAlignment)& ent)  const;
   
   //! Writes GeometricAlignment
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_GeometricAlignment)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_GeometricAlignment)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_GeometricAlignment)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_GeometricAlignment)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWGeometricAlignment_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cxx b/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cxx
index c871260a75..bfc4c116e5 100644
--- a/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx>
+#include "RWStepRepr_RWGlobalUncertaintyAssignedContext.pxx"
 #include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx b/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx
rename to src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.pxx
index 79d3e8063d..5ecf232d3e 100644
--- a/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWGlobalUncertaintyAssignedContext();
+  Standard_HIDDEN RWStepRepr_RWGlobalUncertaintyAssignedContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_GlobalUncertaintyAssignedContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_GlobalUncertaintyAssignedContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_GlobalUncertaintyAssignedContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_GlobalUncertaintyAssignedContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_GlobalUncertaintyAssignedContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_GlobalUncertaintyAssignedContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cxx b/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cxx
index b1a71745df..a2c465747d 100644
--- a/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWGlobalUnitAssignedContext.hxx>
+#include "RWStepRepr_RWGlobalUnitAssignedContext.pxx"
 #include <StepBasic_NamedUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.hxx b/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.hxx
rename to src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.pxx
index 6a634076fa..c3fbe15b00 100644
--- a/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWGlobalUnitAssignedContext();
+  Standard_HIDDEN RWStepRepr_RWGlobalUnitAssignedContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_GlobalUnitAssignedContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_GlobalUnitAssignedContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_GlobalUnitAssignedContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_GlobalUnitAssignedContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_GlobalUnitAssignedContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_GlobalUnitAssignedContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.cxx
index 0b74ed08c9..9c0907730f 100644
--- a/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepRepr_RWIntegerRepresentationItem.hxx>
+#include "RWStepRepr_RWIntegerRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.pxx
similarity index 88%
rename from src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.pxx
index c5639e7f26..af2bdc1fc3 100644
--- a/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWIntegerRepresentationItem.pxx
@@ -35,10 +35,10 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWIntegerRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWIntegerRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_IntegerRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_IntegerRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_IntegerRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_IntegerRepresentationItem)& ent) const;
 };
 #endif // _RWStepRepr_RWIntegerRepresentationItem_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cxx b/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cxx
index 0b65a83881..2348253cdb 100644
--- a/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWItemDefinedTransformation.hxx>
+#include "RWStepRepr_RWItemDefinedTransformation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.hxx b/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.hxx
rename to src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.pxx
index a36970790b..0fc04411c5 100644
--- a/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWItemDefinedTransformation();
+  Standard_HIDDEN RWStepRepr_RWItemDefinedTransformation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ItemDefinedTransformation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ItemDefinedTransformation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ItemDefinedTransformation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ItemDefinedTransformation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_ItemDefinedTransformation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ItemDefinedTransformation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx b/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx
index 785528b615..274882a43c 100644
--- a/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWMakeFromUsageOption.hxx>
+#include "RWStepRepr_RWMakeFromUsageOption.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.hxx b/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.hxx
rename to src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.pxx
index db3c5124d1..a3065d602d 100644
--- a/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWMakeFromUsageOption.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWMakeFromUsageOption();
+  Standard_HIDDEN RWStepRepr_RWMakeFromUsageOption();
   
   //! Reads MakeFromUsageOption
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MakeFromUsageOption)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MakeFromUsageOption)& ent) const;
   
   //! Writes MakeFromUsageOption
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MakeFromUsageOption)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MakeFromUsageOption)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_MakeFromUsageOption)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_MakeFromUsageOption)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMappedItem.cxx b/src/RWStepRepr/RWStepRepr_RWMappedItem.cxx
index ab11941420..745828078f 100644
--- a/src/RWStepRepr/RWStepRepr_RWMappedItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWMappedItem.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWMappedItem.hxx>
+#include "RWStepRepr_RWMappedItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_MappedItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWMappedItem.hxx b/src/RWStepRepr/RWStepRepr_RWMappedItem.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWMappedItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWMappedItem.pxx
index 11c866aa37..37b45598cf 100644
--- a/src/RWStepRepr/RWStepRepr_RWMappedItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWMappedItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWMappedItem();
+  Standard_HIDDEN RWStepRepr_RWMappedItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MappedItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MappedItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MappedItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MappedItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_MappedItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_MappedItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cxx b/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cxx
index eaf0eee1a8..5c9d30bbc7 100644
--- a/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWMaterialDesignation.hxx>
+#include "RWStepRepr_RWMaterialDesignation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_MaterialDesignation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.hxx b/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWMaterialDesignation.hxx
rename to src/RWStepRepr/RWStepRepr_RWMaterialDesignation.pxx
index 56066cea83..fa3d1b3771 100644
--- a/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWMaterialDesignation();
+  Standard_HIDDEN RWStepRepr_RWMaterialDesignation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MaterialDesignation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MaterialDesignation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MaterialDesignation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MaterialDesignation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_MaterialDesignation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_MaterialDesignation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMaterialProperty.cxx b/src/RWStepRepr/RWStepRepr_RWMaterialProperty.cxx
index 4aa2f6e4f6..2e56b9f51b 100644
--- a/src/RWStepRepr/RWStepRepr_RWMaterialProperty.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWMaterialProperty.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWMaterialProperty.hxx>
+#include "RWStepRepr_RWMaterialProperty.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_MaterialProperty.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWMaterialProperty.hxx b/src/RWStepRepr/RWStepRepr_RWMaterialProperty.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWMaterialProperty.hxx
rename to src/RWStepRepr/RWStepRepr_RWMaterialProperty.pxx
index a3b76d96d8..a1d8e78dbc 100644
--- a/src/RWStepRepr/RWStepRepr_RWMaterialProperty.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWMaterialProperty.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWMaterialProperty();
+  Standard_HIDDEN RWStepRepr_RWMaterialProperty();
   
   //! Reads MaterialProperty
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MaterialProperty)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MaterialProperty)& ent) const;
   
   //! Writes MaterialProperty
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MaterialProperty)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MaterialProperty)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_MaterialProperty)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_MaterialProperty)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.cxx b/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.cxx
index 679b80db46..86cc1e8224 100644
--- a/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWMaterialPropertyRepresentation.hxx>
+#include "RWStepRepr_RWMaterialPropertyRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_DataEnvironment.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.hxx b/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.hxx
rename to src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.pxx
index cc11be3339..f94bc236cf 100644
--- a/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWMaterialPropertyRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWMaterialPropertyRepresentation();
+  Standard_HIDDEN RWStepRepr_RWMaterialPropertyRepresentation();
   
   //! Reads MaterialPropertyRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MaterialPropertyRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MaterialPropertyRepresentation)& ent) const;
   
   //! Writes MaterialPropertyRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MaterialPropertyRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MaterialPropertyRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_MaterialPropertyRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_MaterialPropertyRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cxx
index 259339d422..88ccacd605 100644
--- a/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cxx
@@ -18,7 +18,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_MSG.hxx>
-#include <RWStepRepr_RWMeasureRepresentationItem.hxx>
+#include "RWStepRepr_RWMeasureRepresentationItem.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.pxx
index 95697b15d3..38c958d426 100644
--- a/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWMeasureRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWMeasureRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MeasureRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_MeasureRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MeasureRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_MeasureRepresentationItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_MeasureRepresentationItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_MeasureRepresentationItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.cxx b/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.cxx
index 44e8dc50ca..7a57404ee5 100644
--- a/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.cxx
@@ -13,7 +13,7 @@
 
 #include <Standard_Type.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx>
+#include "RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx b/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx
rename to src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.pxx
index e92bf2fba6..6b8a578141 100644
--- a/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.pxx
@@ -33,17 +33,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepRepr_RWMechanicalDesignAndDraughtingRelationship();
+  Standard_HIDDEN RWStepRepr_RWMechanicalDesignAndDraughtingRelationship();
   
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theAch,
                                 const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt) const;
   
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt) const;
   
-  Standard_EXPORT void Share(const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx b/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx
index dbcb6d5017..2c96005f55 100644
--- a/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWParallelOffset.hxx>
+#include "RWStepRepr_RWParallelOffset.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWParallelOffset.hxx b/src/RWStepRepr/RWStepRepr_RWParallelOffset.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWParallelOffset.hxx
rename to src/RWStepRepr/RWStepRepr_RWParallelOffset.pxx
index ec28b987f6..9bfe621a5e 100644
--- a/src/RWStepRepr/RWStepRepr_RWParallelOffset.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWParallelOffset.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWParallelOffset();
+  Standard_HIDDEN RWStepRepr_RWParallelOffset();
   
   //! Reads ParallelOffset
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ParallelOffset)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ParallelOffset)& ent)  const;
   
   //! Writes ParallelOffset
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ParallelOffset)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ParallelOffset)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_ParallelOffset)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_ParallelOffset)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWParallelOffset_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cxx b/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cxx
index 85505e0419..53256497e3 100644
--- a/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepRepr_RWParametricRepresentationContext.hxx>
+#include "RWStepRepr_RWParametricRepresentationContext.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ParametricRepresentationContext.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.hxx b/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.hxx
rename to src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.pxx
index 2eae2ca40b..799858d9dc 100644
--- a/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWParametricRepresentationContext();
+  Standard_HIDDEN RWStepRepr_RWParametricRepresentationContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ParametricRepresentationContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ParametricRepresentationContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ParametricRepresentationContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ParametricRepresentationContext)& ent) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.cxx b/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.cxx
index d0aaaf7c4d..42ec719b02 100644
--- a/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWPerpendicularTo.hxx>
+#include "RWStepRepr_RWPerpendicularTo.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.hxx b/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWPerpendicularTo.hxx
rename to src/RWStepRepr/RWStepRepr_RWPerpendicularTo.pxx
index 6b51ac520e..e74d461690 100644
--- a/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWPerpendicularTo.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWPerpendicularTo();
+  Standard_HIDDEN RWStepRepr_RWPerpendicularTo();
   
   //! Reads PerpendicularTo
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PerpendicularTo)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PerpendicularTo)& ent)  const;
   
   //! Writes PerpendicularTo
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PerpendicularTo)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PerpendicularTo)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_PerpendicularTo)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_PerpendicularTo)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWPerpendicularTo_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWProductConcept.cxx b/src/RWStepRepr/RWStepRepr_RWProductConcept.cxx
index e1e2d17e73..739b08203e 100644
--- a/src/RWStepRepr/RWStepRepr_RWProductConcept.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWProductConcept.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWProductConcept.hxx>
+#include "RWStepRepr_RWProductConcept.pxx"
 #include <StepBasic_ProductConceptContext.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWProductConcept.hxx b/src/RWStepRepr/RWStepRepr_RWProductConcept.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWProductConcept.hxx
rename to src/RWStepRepr/RWStepRepr_RWProductConcept.pxx
index 3d002c6c78..bb3533a83d 100644
--- a/src/RWStepRepr/RWStepRepr_RWProductConcept.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWProductConcept.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWProductConcept();
+  Standard_HIDDEN RWStepRepr_RWProductConcept();
   
   //! Reads ProductConcept
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ProductConcept)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ProductConcept)& ent) const;
   
   //! Writes ProductConcept
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ProductConcept)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ProductConcept)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ProductConcept)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ProductConcept)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.cxx b/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.cxx
index 1512f6317d..69659b813a 100644
--- a/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWProductDefinitionShape.hxx>
+#include "RWStepRepr_RWProductDefinitionShape.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.hxx b/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.hxx
rename to src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.pxx
index 1cc913aec7..f3ddcff014 100644
--- a/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWProductDefinitionShape.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWProductDefinitionShape();
+  Standard_HIDDEN RWStepRepr_RWProductDefinitionShape();
   
   //! Reads ProductDefinitionShape
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ProductDefinitionShape)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ProductDefinitionShape)& ent) const;
   
   //! Writes ProductDefinitionShape
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ProductDefinitionShape)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ProductDefinitionShape)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ProductDefinitionShape)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ProductDefinitionShape)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.cxx b/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.cxx
index b76d8aff0d..bbff8c2ef6 100644
--- a/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWPropertyDefinition.hxx>
+#include "RWStepRepr_RWPropertyDefinition.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.hxx b/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWPropertyDefinition.hxx
rename to src/RWStepRepr/RWStepRepr_RWPropertyDefinition.pxx
index 4fa46b4612..eba697ff86 100644
--- a/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWPropertyDefinition.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWPropertyDefinition();
+  Standard_HIDDEN RWStepRepr_RWPropertyDefinition();
   
   //! Reads PropertyDefinition
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PropertyDefinition)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PropertyDefinition)& ent) const;
   
   //! Writes PropertyDefinition
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PropertyDefinition)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PropertyDefinition)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_PropertyDefinition)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_PropertyDefinition)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.cxx b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.cxx
index 50d3a8b2a6..95a51a06c2 100644
--- a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWPropertyDefinitionRelationship.hxx>
+#include "RWStepRepr_RWPropertyDefinitionRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.hxx b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.hxx
rename to src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.pxx
index af23b0702f..35bc5dbd11 100644
--- a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWPropertyDefinitionRelationship();
+  Standard_HIDDEN RWStepRepr_RWPropertyDefinitionRelationship();
   
   //! Reads PropertyDefinitionRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PropertyDefinitionRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PropertyDefinitionRelationship)& ent) const;
   
   //! Writes PropertyDefinitionRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PropertyDefinitionRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PropertyDefinitionRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_PropertyDefinitionRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_PropertyDefinitionRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.cxx b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.cxx
index ae53b3ac00..3361a5901e 100644
--- a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWPropertyDefinitionRepresentation.hxx>
+#include "RWStepRepr_RWPropertyDefinitionRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_PropertyDefinitionRepresentation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.hxx b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.hxx
rename to src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.pxx
index 97506aeab2..e865b27f36 100644
--- a/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWPropertyDefinitionRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWPropertyDefinitionRepresentation();
+  Standard_HIDDEN RWStepRepr_RWPropertyDefinitionRepresentation();
   
   //! Reads PropertyDefinitionRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PropertyDefinitionRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_PropertyDefinitionRepresentation)& ent) const;
   
   //! Writes PropertyDefinitionRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PropertyDefinitionRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_PropertyDefinitionRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_PropertyDefinitionRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_PropertyDefinitionRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx b/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
index 9447518a4c..6b1c508715 100644
--- a/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx>
+#include "RWStepRepr_RWQuantifiedAssemblyComponentUsage.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx b/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx
rename to src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.pxx
index 436ad41aa2..f6beb53753 100644
--- a/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWQuantifiedAssemblyComponentUsage();
+  Standard_HIDDEN RWStepRepr_RWQuantifiedAssemblyComponentUsage();
   
   //! Reads QuantifiedAssemblyComponentUsage
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_QuantifiedAssemblyComponentUsage)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_QuantifiedAssemblyComponentUsage)& ent) const;
   
   //! Writes QuantifiedAssemblyComponentUsage
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_QuantifiedAssemblyComponentUsage)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_QuantifiedAssemblyComponentUsage)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_QuantifiedAssemblyComponentUsage)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_QuantifiedAssemblyComponentUsage)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx
index eb5a48f091..0b3c152351 100644
--- a/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepRepr_RWRealRepresentationItem.hxx>
+#include "RWStepRepr_RWRealRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RealRepresentationItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.pxx
index ad62774d6e..ac27906146 100644
--- a/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.pxx
@@ -33,14 +33,14 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWRealRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWRealRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData,
                                  const Standard_Integer theNum,
                                  Handle(Interface_Check)& theAch,
                                  const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW,
                                   const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
 };
 #endif // _RWStepRepr_RWRealRepresentationItem_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cxx
index 2895e1775a..800f259f6f 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_Check.hxx>
-#include <RWStepRepr_RWReprItemAndLengthMeasureWithUnit.hxx>
+#include "RWStepRepr_RWReprItemAndLengthMeasureWithUnit.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_Unit.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.hxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.hxx
rename to src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.pxx
index 65cacfad74..e5c0a7edb6 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.pxx
@@ -35,11 +35,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWReprItemAndLengthMeasureWithUnit();
+  Standard_HIDDEN RWStepRepr_RWReprItemAndLengthMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnit)& ent) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.cxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.cxx
index 2cf1e84e94..36d2839df0 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <Interface_Check.hxx>
-#include <RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.hxx>
+#include "RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_Unit.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.hxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.hxx
rename to src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.pxx
index 407214e21c..02ab8e78a4 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI.pxx
@@ -35,10 +35,10 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI();
+  Standard_HIDDEN RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)& ent) const;
 };
 #endif // _RWStepRepr_RWReprItemAndLengthMeasureWithUnitAndQRI_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.cxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.cxx
index 7285c11aee..b5d02a0102 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <Interface_Check.hxx>
-#include <RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.hxx>
+#include "RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_Unit.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.hxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.hxx
rename to src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.pxx
index 032bd6f933..fc34e6d221 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit.pxx
@@ -35,10 +35,10 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit();
+  Standard_HIDDEN RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit)& ent) const;
 };
 #endif // _RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnit_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx
index 5e87c616d1..c06aea3744 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <Interface_Check.hxx>
-#include <RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx>
+#include "RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_Unit.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx
rename to src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.pxx
index db2c10e00a..df9cbee4f9 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI.pxx
@@ -35,10 +35,10 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI();
+  Standard_HIDDEN RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)& ent) const;
 };
 #endif // _RWStepRepr_RWReprItemAndPlaneAngleMeasureWithUnitAndQRI_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentation.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentation.cxx
index 2b2ce59a80..517bf90727 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWRepresentation.hxx>
+#include "RWStepRepr_RWRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentation.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentation.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWRepresentation.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentation.pxx
index 9de4e4cdcc..3254679f96 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWRepresentation();
+  Standard_HIDDEN RWStepRepr_RWRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Representation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Representation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Representation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Representation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_Representation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_Representation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cxx
index 364d3ea5f6..652de9a6c8 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepRepr_RWRepresentationContext.hxx>
+#include "RWStepRepr_RWRepresentationContext.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationContext.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentationContext.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWRepresentationContext.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentationContext.pxx
index d354270f7a..abcb6f8f7c 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationContext.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationContext.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWRepresentationContext();
+  Standard_HIDDEN RWStepRepr_RWRepresentationContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationContext)& ent) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.cxx
index c30de07974..60524b338d 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWRepresentationContextReference.hxx>
+#include "RWStepRepr_RWRepresentationContextReference.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.pxx
index 5cb1bb4d18..f079becab8 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationContextReference.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepRepr_RWRepresentationContextReference();
+  Standard_HIDDEN RWStepRepr_RWRepresentationContextReference();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theAch, const Handle(StepRepr_RepresentationContextReference)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theAch, const Handle(StepRepr_RepresentationContextReference)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW, const Handle(StepRepr_RepresentationContextReference)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& SW, const Handle(StepRepr_RepresentationContextReference)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepRepr_RepresentationContextReference)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepRepr_RepresentationContextReference)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepRepr_RWRepresentationContextReference_HeaderFile_
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cxx
index c21e9b7354..b0de85f1bd 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepRepr_RWRepresentationItem.hxx>
+#include "RWStepRepr_RWRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationItem.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentationItem.pxx
similarity index 89%
rename from src/RWStepRepr/RWStepRepr_RWRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentationItem.pxx
index faf2883162..41bf2420fe 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationItem.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationItem)& ent) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cxx
index 16b30ff61e..05b12474db 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWRepresentationMap.hxx>
+#include "RWStepRepr_RWRepresentationMap.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationMap.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentationMap.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWRepresentationMap.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentationMap.pxx
index 18bd305ecb..d3bdb8a76b 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationMap.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationMap.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWRepresentationMap();
+  Standard_HIDDEN RWStepRepr_RWRepresentationMap();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationMap)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationMap)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationMap)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationMap)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_RepresentationMap)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_RepresentationMap)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationReference.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentationReference.cxx
index 680db6227d..eb207c40b6 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationReference.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationReference.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWRepresentationReference.hxx>
+#include "RWStepRepr_RWRepresentationReference.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationReference.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentationReference.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWRepresentationReference.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentationReference.pxx
index 633b92dd15..f0f4c619c7 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationReference.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationReference.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepRepr_RWRepresentationReference();
+  Standard_HIDDEN RWStepRepr_RWRepresentationReference();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theAch, const Handle(StepRepr_RepresentationReference)& theEnt) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData, const Standard_Integer theNum, Handle(Interface_Check)& theAch, const Handle(StepRepr_RepresentationReference)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW, const Handle(StepRepr_RepresentationReference)& theEnt) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& SW, const Handle(StepRepr_RepresentationReference)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepRepr_RepresentationReference)& theEnt, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepRepr_RepresentationReference)& theEnt, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepRepr_RWRepresentationReference_HeaderFile_
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cxx
index 4bd9a9e57b..bbc070bdb2 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWRepresentationRelationship.hxx>
+#include "RWStepRepr_RWRepresentationRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.pxx
index fb16862241..00a43bf370 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWRepresentationRelationship();
+  Standard_HIDDEN RWStepRepr_RWRepresentationRelationship();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationRelationship)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationRelationship)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_RepresentationRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_RepresentationRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cxx b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cxx
index 378df1f317..bd93278cee 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWRepresentationRelationshipWithTransformation.hxx>
+#include "RWStepRepr_RWRepresentationRelationshipWithTransformation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.hxx b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.hxx
rename to src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.pxx
index 8a1fa090e9..2249cbaaea 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWRepresentationRelationshipWithTransformation();
+  Standard_HIDDEN RWStepRepr_RWRepresentationRelationshipWithTransformation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationRelationshipWithTransformation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_RepresentationRelationshipWithTransformation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationRelationshipWithTransformation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_RepresentationRelationshipWithTransformation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_RepresentationRelationshipWithTransformation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_RepresentationRelationshipWithTransformation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspect.cxx b/src/RWStepRepr/RWStepRepr_RWShapeAspect.cxx
index e77786bebe..4af87c549f 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspect.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspect.cxx
@@ -14,7 +14,7 @@
 //gka 05.03.99 S4134 upgrade from CD to DIS
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWShapeAspect.hxx>
+#include "RWStepRepr_RWShapeAspect.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspect.hxx b/src/RWStepRepr/RWStepRepr_RWShapeAspect.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWShapeAspect.hxx
rename to src/RWStepRepr/RWStepRepr_RWShapeAspect.pxx
index 55696dd551..ce33bbf12a 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspect.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspect.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWShapeAspect();
+  Standard_HIDDEN RWStepRepr_RWShapeAspect();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspect)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspect)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspect)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspect)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_ShapeAspect)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ShapeAspect)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.cxx b/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.cxx
index 78d61ccff1..b8b0f8e4a5 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWShapeAspectDerivingRelationship.hxx>
+#include "RWStepRepr_RWShapeAspectDerivingRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.hxx b/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.hxx
rename to src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.pxx
index a566a32588..af350358fe 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspectDerivingRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWShapeAspectDerivingRelationship();
+  Standard_HIDDEN RWStepRepr_RWShapeAspectDerivingRelationship();
   
   //! Reads ShapeAspectDerivingRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspectDerivingRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspectDerivingRelationship)& ent) const;
   
   //! Writes ShapeAspectDerivingRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspectDerivingRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspectDerivingRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ShapeAspectDerivingRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ShapeAspectDerivingRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.cxx b/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.cxx
index 5056a0fed9..1fdbb46e5f 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWShapeAspectRelationship.hxx>
+#include "RWStepRepr_RWShapeAspectRelationship.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.hxx b/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.hxx
rename to src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.pxx
index 3c361e777c..0387e5d474 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspectRelationship.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWShapeAspectRelationship();
+  Standard_HIDDEN RWStepRepr_RWShapeAspectRelationship();
   
   //! Reads ShapeAspectRelationship
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspectRelationship)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspectRelationship)& ent) const;
   
   //! Writes ShapeAspectRelationship
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspectRelationship)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspectRelationship)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ShapeAspectRelationship)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ShapeAspectRelationship)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.cxx b/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.cxx
index b74e75408d..2a97ab9f16 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWShapeAspectTransition.hxx>
+#include "RWStepRepr_RWShapeAspectTransition.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.hxx b/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.hxx
rename to src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.pxx
index 02e8fd255b..e469ff22b5 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspectTransition.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWShapeAspectTransition();
+  Standard_HIDDEN RWStepRepr_RWShapeAspectTransition();
   
   //! Reads ShapeAspectTransition
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspectTransition)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeAspectTransition)& ent) const;
   
   //! Writes ShapeAspectTransition
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspectTransition)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeAspectTransition)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_ShapeAspectTransition)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ShapeAspectTransition)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cxx b/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cxx
index 65cc15fe7d..8b1298922c 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.hxx>
+#include "RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.hxx b/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.pxx
similarity index 88%
rename from src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.hxx
rename to src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.pxx
index 8cb1ee4c73..29b9a03d19 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWShapeRepresentationRelationshipWithTransformation();
+  Standard_HIDDEN RWStepRepr_RWShapeRepresentationRelationshipWithTransformation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeRepresentationRelationshipWithTransformation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ShapeRepresentationRelationshipWithTransformation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeRepresentationRelationshipWithTransformation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ShapeRepresentationRelationshipWithTransformation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepRepr_ShapeRepresentationRelationshipWithTransformation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_ShapeRepresentationRelationshipWithTransformation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.cxx b/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.cxx
index 8751868972..96d0d906de 100644
--- a/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWSpecifiedHigherUsageOccurrence.hxx>
+#include "RWStepRepr_RWSpecifiedHigherUsageOccurrence.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.hxx b/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.hxx
rename to src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.pxx
index 939d6e4663..d4575ad078 100644
--- a/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWSpecifiedHigherUsageOccurrence.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWSpecifiedHigherUsageOccurrence();
+  Standard_HIDDEN RWStepRepr_RWSpecifiedHigherUsageOccurrence();
   
   //! Reads SpecifiedHigherUsageOccurrence
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_SpecifiedHigherUsageOccurrence)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_SpecifiedHigherUsageOccurrence)& ent) const;
   
   //! Writes SpecifiedHigherUsageOccurrence
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_SpecifiedHigherUsageOccurrence)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_SpecifiedHigherUsageOccurrence)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_SpecifiedHigherUsageOccurrence)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_SpecifiedHigherUsageOccurrence)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.cxx b/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.cxx
index a21f77fa1d..3093fd8f64 100644
--- a/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWStructuralResponseProperty.hxx>
+#include "RWStepRepr_RWStructuralResponseProperty.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_StructuralResponseProperty.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.hxx b/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.pxx
similarity index 87%
rename from src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.hxx
rename to src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.pxx
index 76d63ef1cd..cecb9f9489 100644
--- a/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWStructuralResponseProperty.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWStructuralResponseProperty();
+  Standard_HIDDEN RWStepRepr_RWStructuralResponseProperty();
   
   //! Reads StructuralResponseProperty
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_StructuralResponseProperty)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_StructuralResponseProperty)& ent) const;
   
   //! Writes StructuralResponseProperty
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_StructuralResponseProperty)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_StructuralResponseProperty)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_StructuralResponseProperty)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_StructuralResponseProperty)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.cxx b/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.cxx
index 7f0bf9edbc..70d4b7043f 100644
--- a/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.hxx>
+#include "RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.hxx b/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.pxx
similarity index 88%
rename from src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.hxx
rename to src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.pxx
index a82eb12312..39d6309e0e 100644
--- a/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation();
+  Standard_HIDDEN RWStepRepr_RWStructuralResponsePropertyDefinitionRepresentation();
   
   //! Reads StructuralResponsePropertyDefinitionRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_StructuralResponsePropertyDefinitionRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_StructuralResponsePropertyDefinitionRepresentation)& ent) const;
   
   //! Writes StructuralResponsePropertyDefinitionRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_StructuralResponsePropertyDefinitionRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_StructuralResponsePropertyDefinitionRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepRepr_StructuralResponsePropertyDefinitionRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepRepr_StructuralResponsePropertyDefinitionRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepRepr/RWStepRepr_RWTangent.cxx b/src/RWStepRepr/RWStepRepr_RWTangent.cxx
index 94c5e7e282..488845cc65 100644
--- a/src/RWStepRepr/RWStepRepr_RWTangent.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWTangent.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepRepr_RWTangent.hxx>
+#include "RWStepRepr_RWTangent.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWTangent.hxx b/src/RWStepRepr/RWStepRepr_RWTangent.pxx
similarity index 86%
rename from src/RWStepRepr/RWStepRepr_RWTangent.hxx
rename to src/RWStepRepr/RWStepRepr_RWTangent.pxx
index 4121d38d91..1bdfd7b27d 100644
--- a/src/RWStepRepr/RWStepRepr_RWTangent.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWTangent.pxx
@@ -38,15 +38,15 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepRepr_RWTangent();
+  Standard_HIDDEN RWStepRepr_RWTangent();
   
   //! Reads Tangent
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Tangent)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_Tangent)& ent)  const;
   
   //! Writes Tangent
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Tangent)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_Tangent)& ent)  const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT   void Share (const Handle(StepRepr_Tangent)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN   void Share (const Handle(StepRepr_Tangent)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepRepr_RWTangent_HeaderFile
diff --git a/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.cxx b/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.cxx
index b3de696736..d530640df0 100644
--- a/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.cxx
@@ -15,7 +15,7 @@
 
 
 #include <Interface_Check.hxx>
-#include <RWStepRepr_RWValueRepresentationItem.hxx>
+#include "RWStepRepr_RWValueRepresentationItem.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.hxx b/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.pxx
similarity index 88%
rename from src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.hxx
rename to src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.pxx
index 920f0fa048..6971555fc5 100644
--- a/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.hxx
+++ b/src/RWStepRepr/RWStepRepr_RWValueRepresentationItem.pxx
@@ -35,10 +35,10 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepRepr_RWValueRepresentationItem();
+  Standard_HIDDEN RWStepRepr_RWValueRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ValueRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepRepr_ValueRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ValueRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepRepr_ValueRepresentationItem)& ent) const;
 };
 #endif // _RWStepRepr_RWValueRepresentationItem_HeaderFile
diff --git a/src/RWStepShape/FILES b/src/RWStepShape/FILES
index b36081e5ff..50ac547a54 100755
--- a/src/RWStepShape/FILES
+++ b/src/RWStepShape/FILES
@@ -1,182 +1,182 @@
 RWStepShape_RWAdvancedBrepShapeRepresentation.cxx
-RWStepShape_RWAdvancedBrepShapeRepresentation.hxx
+RWStepShape_RWAdvancedBrepShapeRepresentation.pxx
 RWStepShape_RWAdvancedFace.cxx
-RWStepShape_RWAdvancedFace.hxx
+RWStepShape_RWAdvancedFace.pxx
 RWStepShape_RWAngularLocation.cxx
-RWStepShape_RWAngularLocation.hxx
+RWStepShape_RWAngularLocation.pxx
 RWStepShape_RWAngularSize.cxx
-RWStepShape_RWAngularSize.hxx
+RWStepShape_RWAngularSize.pxx
 RWStepShape_RWBlock.cxx
-RWStepShape_RWBlock.hxx
+RWStepShape_RWBlock.pxx
 RWStepShape_RWBooleanResult.cxx
-RWStepShape_RWBooleanResult.hxx
+RWStepShape_RWBooleanResult.pxx
 RWStepShape_RWBoxDomain.cxx
-RWStepShape_RWBoxDomain.hxx
+RWStepShape_RWBoxDomain.pxx
 RWStepShape_RWBoxedHalfSpace.cxx
-RWStepShape_RWBoxedHalfSpace.hxx
+RWStepShape_RWBoxedHalfSpace.pxx
 RWStepShape_RWBrepWithVoids.cxx
-RWStepShape_RWBrepWithVoids.hxx
+RWStepShape_RWBrepWithVoids.pxx
 RWStepShape_RWClosedShell.cxx
-RWStepShape_RWClosedShell.hxx
+RWStepShape_RWClosedShell.pxx
 RWStepShape_RWCompoundShapeRepresentation.cxx
-RWStepShape_RWCompoundShapeRepresentation.hxx
+RWStepShape_RWCompoundShapeRepresentation.pxx
 RWStepShape_RWConnectedEdgeSet.cxx
-RWStepShape_RWConnectedEdgeSet.hxx
+RWStepShape_RWConnectedEdgeSet.pxx
 RWStepShape_RWConnectedFaceSet.cxx
-RWStepShape_RWConnectedFaceSet.hxx
+RWStepShape_RWConnectedFaceSet.pxx
 RWStepShape_RWConnectedFaceShapeRepresentation.cxx
-RWStepShape_RWConnectedFaceShapeRepresentation.hxx
+RWStepShape_RWConnectedFaceShapeRepresentation.pxx
 RWStepShape_RWConnectedFaceSubSet.cxx
-RWStepShape_RWConnectedFaceSubSet.hxx
+RWStepShape_RWConnectedFaceSubSet.pxx
 RWStepShape_RWContextDependentShapeRepresentation.cxx
-RWStepShape_RWContextDependentShapeRepresentation.hxx
+RWStepShape_RWContextDependentShapeRepresentation.pxx
 RWStepShape_RWCsgShapeRepresentation.cxx
-RWStepShape_RWCsgShapeRepresentation.hxx
+RWStepShape_RWCsgShapeRepresentation.pxx
 RWStepShape_RWCsgSolid.cxx
-RWStepShape_RWCsgSolid.hxx
+RWStepShape_RWCsgSolid.pxx
 RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cxx
-RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.hxx
+RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.pxx
 RWStepShape_RWDimensionalCharacteristicRepresentation.cxx
-RWStepShape_RWDimensionalCharacteristicRepresentation.hxx
+RWStepShape_RWDimensionalCharacteristicRepresentation.pxx
 RWStepShape_RWDimensionalLocation.cxx
-RWStepShape_RWDimensionalLocation.hxx
+RWStepShape_RWDimensionalLocation.pxx
 RWStepShape_RWDimensionalLocationWithPath.cxx
-RWStepShape_RWDimensionalLocationWithPath.hxx
+RWStepShape_RWDimensionalLocationWithPath.pxx
 RWStepShape_RWDimensionalSize.cxx
-RWStepShape_RWDimensionalSize.hxx
+RWStepShape_RWDimensionalSize.pxx
 RWStepShape_RWDimensionalSizeWithPath.cxx
-RWStepShape_RWDimensionalSizeWithPath.hxx
+RWStepShape_RWDimensionalSizeWithPath.pxx
 RWStepShape_RWEdge.cxx
-RWStepShape_RWEdge.hxx
+RWStepShape_RWEdge.pxx
 RWStepShape_RWEdgeBasedWireframeModel.cxx
-RWStepShape_RWEdgeBasedWireframeModel.hxx
+RWStepShape_RWEdgeBasedWireframeModel.pxx
 RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx
-RWStepShape_RWEdgeBasedWireframeShapeRepresentation.hxx
+RWStepShape_RWEdgeBasedWireframeShapeRepresentation.pxx
 RWStepShape_RWEdgeCurve.cxx
-RWStepShape_RWEdgeCurve.hxx
+RWStepShape_RWEdgeCurve.pxx
 RWStepShape_RWEdgeLoop.cxx
-RWStepShape_RWEdgeLoop.hxx
+RWStepShape_RWEdgeLoop.pxx
 RWStepShape_RWExtrudedAreaSolid.cxx
-RWStepShape_RWExtrudedAreaSolid.hxx
+RWStepShape_RWExtrudedAreaSolid.pxx
 RWStepShape_RWExtrudedFaceSolid.cxx
-RWStepShape_RWExtrudedFaceSolid.hxx
+RWStepShape_RWExtrudedFaceSolid.pxx
 RWStepShape_RWFace.cxx
-RWStepShape_RWFace.hxx
+RWStepShape_RWFace.pxx
 RWStepShape_RWFaceBasedSurfaceModel.cxx
-RWStepShape_RWFaceBasedSurfaceModel.hxx
+RWStepShape_RWFaceBasedSurfaceModel.pxx
 RWStepShape_RWFaceBound.cxx
-RWStepShape_RWFaceBound.hxx
+RWStepShape_RWFaceBound.pxx
 RWStepShape_RWFaceOuterBound.cxx
-RWStepShape_RWFaceOuterBound.hxx
+RWStepShape_RWFaceOuterBound.pxx
 RWStepShape_RWFaceSurface.cxx
-RWStepShape_RWFaceSurface.hxx
+RWStepShape_RWFaceSurface.pxx
 RWStepShape_RWFacetedBrep.cxx
-RWStepShape_RWFacetedBrep.hxx
+RWStepShape_RWFacetedBrep.pxx
 RWStepShape_RWFacetedBrepAndBrepWithVoids.cxx
-RWStepShape_RWFacetedBrepAndBrepWithVoids.hxx
+RWStepShape_RWFacetedBrepAndBrepWithVoids.pxx
 RWStepShape_RWFacetedBrepShapeRepresentation.cxx
-RWStepShape_RWFacetedBrepShapeRepresentation.hxx
+RWStepShape_RWFacetedBrepShapeRepresentation.pxx
 RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cxx
-RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.hxx
+RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.pxx
 RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cxx
-RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx
+RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.pxx
 RWStepShape_RWGeometricCurveSet.cxx
-RWStepShape_RWGeometricCurveSet.hxx
+RWStepShape_RWGeometricCurveSet.pxx
 RWStepShape_RWGeometricSet.cxx
-RWStepShape_RWGeometricSet.hxx
+RWStepShape_RWGeometricSet.pxx
 RWStepShape_RWHalfSpaceSolid.cxx
-RWStepShape_RWHalfSpaceSolid.hxx
+RWStepShape_RWHalfSpaceSolid.pxx
 RWStepShape_RWLimitsAndFits.cxx
-RWStepShape_RWLimitsAndFits.hxx
+RWStepShape_RWLimitsAndFits.pxx
 RWStepShape_RWLoop.cxx
-RWStepShape_RWLoop.hxx
+RWStepShape_RWLoop.pxx
 RWStepShape_RWLoopAndPath.cxx
-RWStepShape_RWLoopAndPath.hxx
+RWStepShape_RWLoopAndPath.pxx
 RWStepShape_RWManifoldSolidBrep.cxx
-RWStepShape_RWManifoldSolidBrep.hxx
+RWStepShape_RWManifoldSolidBrep.pxx
 RWStepShape_RWManifoldSurfaceShapeRepresentation.cxx
-RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx
+RWStepShape_RWManifoldSurfaceShapeRepresentation.pxx
 RWStepShape_RWMeasureQualification.cxx
-RWStepShape_RWMeasureQualification.hxx
+RWStepShape_RWMeasureQualification.pxx
 RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cxx
-RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.hxx
+RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.pxx
 RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx
-RWStepShape_RWNonManifoldSurfaceShapeRepresentation.hxx
+RWStepShape_RWNonManifoldSurfaceShapeRepresentation.pxx
 RWStepShape_RWOpenShell.cxx
-RWStepShape_RWOpenShell.hxx
+RWStepShape_RWOpenShell.pxx
 RWStepShape_RWOrientedClosedShell.cxx
-RWStepShape_RWOrientedClosedShell.hxx
+RWStepShape_RWOrientedClosedShell.pxx
 RWStepShape_RWOrientedEdge.cxx
-RWStepShape_RWOrientedEdge.hxx
+RWStepShape_RWOrientedEdge.pxx
 RWStepShape_RWOrientedFace.cxx
-RWStepShape_RWOrientedFace.hxx
+RWStepShape_RWOrientedFace.pxx
 RWStepShape_RWOrientedOpenShell.cxx
-RWStepShape_RWOrientedOpenShell.hxx
+RWStepShape_RWOrientedOpenShell.pxx
 RWStepShape_RWOrientedPath.cxx
-RWStepShape_RWOrientedPath.hxx
+RWStepShape_RWOrientedPath.pxx
 RWStepShape_RWPath.cxx
-RWStepShape_RWPath.hxx
+RWStepShape_RWPath.pxx
 RWStepShape_RWPlusMinusTolerance.cxx
-RWStepShape_RWPlusMinusTolerance.hxx
+RWStepShape_RWPlusMinusTolerance.pxx
 RWStepShape_RWPointRepresentation.cxx
-RWStepShape_RWPointRepresentation.hxx
+RWStepShape_RWPointRepresentation.pxx
 RWStepShape_RWPolyLoop.cxx
-RWStepShape_RWPolyLoop.hxx
+RWStepShape_RWPolyLoop.pxx
 RWStepShape_RWPrecisionQualifier.cxx
-RWStepShape_RWPrecisionQualifier.hxx
+RWStepShape_RWPrecisionQualifier.pxx
 RWStepShape_RWQualifiedRepresentationItem.cxx
-RWStepShape_RWQualifiedRepresentationItem.hxx
+RWStepShape_RWQualifiedRepresentationItem.pxx
 RWStepShape_RWRevolvedAreaSolid.cxx
-RWStepShape_RWRevolvedAreaSolid.hxx
+RWStepShape_RWRevolvedAreaSolid.pxx
 RWStepShape_RWRevolvedFaceSolid.cxx
-RWStepShape_RWRevolvedFaceSolid.hxx
+RWStepShape_RWRevolvedFaceSolid.pxx
 RWStepShape_RWRightAngularWedge.cxx
-RWStepShape_RWRightAngularWedge.hxx
+RWStepShape_RWRightAngularWedge.pxx
 RWStepShape_RWRightCircularCone.cxx
-RWStepShape_RWRightCircularCone.hxx
+RWStepShape_RWRightCircularCone.pxx
 RWStepShape_RWRightCircularCylinder.cxx
-RWStepShape_RWRightCircularCylinder.hxx
+RWStepShape_RWRightCircularCylinder.pxx
 RWStepShape_RWSeamEdge.cxx
-RWStepShape_RWSeamEdge.hxx
+RWStepShape_RWSeamEdge.pxx
 RWStepShape_RWShapeDefinitionRepresentation.cxx
-RWStepShape_RWShapeDefinitionRepresentation.hxx
+RWStepShape_RWShapeDefinitionRepresentation.pxx
 RWStepShape_RWShapeDimensionRepresentation.cxx
-RWStepShape_RWShapeDimensionRepresentation.hxx
+RWStepShape_RWShapeDimensionRepresentation.pxx
 RWStepShape_RWShapeRepresentation.cxx
-RWStepShape_RWShapeRepresentation.hxx
+RWStepShape_RWShapeRepresentation.pxx
 RWStepShape_RWShapeRepresentationWithParameters.cxx
-RWStepShape_RWShapeRepresentationWithParameters.hxx
+RWStepShape_RWShapeRepresentationWithParameters.pxx
 RWStepShape_RWShellBasedSurfaceModel.cxx
-RWStepShape_RWShellBasedSurfaceModel.hxx
+RWStepShape_RWShellBasedSurfaceModel.pxx
 RWStepShape_RWSolidModel.cxx
-RWStepShape_RWSolidModel.hxx
+RWStepShape_RWSolidModel.pxx
 RWStepShape_RWSolidReplica.cxx
-RWStepShape_RWSolidReplica.hxx
+RWStepShape_RWSolidReplica.pxx
 RWStepShape_RWSphere.cxx
-RWStepShape_RWSphere.hxx
+RWStepShape_RWSphere.pxx
 RWStepShape_RWSubedge.cxx
-RWStepShape_RWSubedge.hxx
+RWStepShape_RWSubedge.pxx
 RWStepShape_RWSubface.cxx
-RWStepShape_RWSubface.hxx
+RWStepShape_RWSubface.pxx
 RWStepShape_RWSweptAreaSolid.cxx
-RWStepShape_RWSweptAreaSolid.hxx
+RWStepShape_RWSweptAreaSolid.pxx
 RWStepShape_RWSweptFaceSolid.cxx
-RWStepShape_RWSweptFaceSolid.hxx
+RWStepShape_RWSweptFaceSolid.pxx
 RWStepShape_RWToleranceValue.cxx
-RWStepShape_RWToleranceValue.hxx
+RWStepShape_RWToleranceValue.pxx
 RWStepShape_RWTopologicalRepresentationItem.cxx
-RWStepShape_RWTopologicalRepresentationItem.hxx
+RWStepShape_RWTopologicalRepresentationItem.pxx
 RWStepShape_RWTorus.cxx
-RWStepShape_RWTorus.hxx
+RWStepShape_RWTorus.pxx
 RWStepShape_RWTransitionalShapeRepresentation.cxx
-RWStepShape_RWTransitionalShapeRepresentation.hxx
+RWStepShape_RWTransitionalShapeRepresentation.pxx
 RWStepShape_RWTypeQualifier.cxx
-RWStepShape_RWTypeQualifier.hxx
+RWStepShape_RWTypeQualifier.pxx
 RWStepShape_RWValueFormatTypeQualifier.cxx
-RWStepShape_RWValueFormatTypeQualifier.hxx
+RWStepShape_RWValueFormatTypeQualifier.pxx
 RWStepShape_RWVertex.cxx
-RWStepShape_RWVertex.hxx
+RWStepShape_RWVertex.pxx
 RWStepShape_RWVertexLoop.cxx
-RWStepShape_RWVertexLoop.hxx
+RWStepShape_RWVertexLoop.pxx
 RWStepShape_RWVertexPoint.cxx
-RWStepShape_RWVertexPoint.hxx
+RWStepShape_RWVertexPoint.pxx
diff --git a/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cxx
index 969bc1b640..cfa11405fc 100644
--- a/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWAdvancedBrepShapeRepresentation.hxx>
+#include "RWStepShape_RWAdvancedBrepShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.pxx
index 2039d75492..614e21aa38 100644
--- a/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWAdvancedBrepShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWAdvancedBrepShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AdvancedBrepShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AdvancedBrepShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AdvancedBrepShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AdvancedBrepShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_AdvancedBrepShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_AdvancedBrepShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWAdvancedFace.cxx b/src/RWStepShape/RWStepShape_RWAdvancedFace.cxx
index 0eac3d648a..b9edbbf855 100644
--- a/src/RWStepShape/RWStepShape_RWAdvancedFace.cxx
+++ b/src/RWStepShape/RWStepShape_RWAdvancedFace.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWAdvancedFace.hxx>
+#include "RWStepShape_RWAdvancedFace.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Surface.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWAdvancedFace.hxx b/src/RWStepShape/RWStepShape_RWAdvancedFace.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWAdvancedFace.hxx
rename to src/RWStepShape/RWStepShape_RWAdvancedFace.pxx
index a887c09a25..8ba511086b 100644
--- a/src/RWStepShape/RWStepShape_RWAdvancedFace.hxx
+++ b/src/RWStepShape/RWStepShape_RWAdvancedFace.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWAdvancedFace();
+  Standard_HIDDEN RWStepShape_RWAdvancedFace();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AdvancedFace)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AdvancedFace)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AdvancedFace)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AdvancedFace)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_AdvancedFace)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_AdvancedFace)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWAngularLocation.cxx b/src/RWStepShape/RWStepShape_RWAngularLocation.cxx
index c7f03672b6..e090b81a85 100644
--- a/src/RWStepShape/RWStepShape_RWAngularLocation.cxx
+++ b/src/RWStepShape/RWStepShape_RWAngularLocation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWAngularLocation.hxx>
+#include "RWStepShape_RWAngularLocation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWAngularLocation.hxx b/src/RWStepShape/RWStepShape_RWAngularLocation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWAngularLocation.hxx
rename to src/RWStepShape/RWStepShape_RWAngularLocation.pxx
index 034a31906b..d8f7918ded 100644
--- a/src/RWStepShape/RWStepShape_RWAngularLocation.hxx
+++ b/src/RWStepShape/RWStepShape_RWAngularLocation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWAngularLocation();
+  Standard_HIDDEN RWStepShape_RWAngularLocation();
   
   //! Reads AngularLocation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AngularLocation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AngularLocation)& ent) const;
   
   //! Writes AngularLocation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AngularLocation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AngularLocation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_AngularLocation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_AngularLocation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWAngularSize.cxx b/src/RWStepShape/RWStepShape_RWAngularSize.cxx
index 2286a7b0b8..60c4937b4c 100644
--- a/src/RWStepShape/RWStepShape_RWAngularSize.cxx
+++ b/src/RWStepShape/RWStepShape_RWAngularSize.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWAngularSize.hxx>
+#include "RWStepShape_RWAngularSize.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWAngularSize.hxx b/src/RWStepShape/RWStepShape_RWAngularSize.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWAngularSize.hxx
rename to src/RWStepShape/RWStepShape_RWAngularSize.pxx
index 9ffe82eccb..958f765c04 100644
--- a/src/RWStepShape/RWStepShape_RWAngularSize.hxx
+++ b/src/RWStepShape/RWStepShape_RWAngularSize.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWAngularSize();
+  Standard_HIDDEN RWStepShape_RWAngularSize();
   
   //! Reads AngularSize
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AngularSize)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_AngularSize)& ent) const;
   
   //! Writes AngularSize
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AngularSize)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_AngularSize)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_AngularSize)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_AngularSize)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWBlock.cxx b/src/RWStepShape/RWStepShape_RWBlock.cxx
index a90397a362..8ed5b6db4c 100644
--- a/src/RWStepShape/RWStepShape_RWBlock.cxx
+++ b/src/RWStepShape/RWStepShape_RWBlock.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWBlock.hxx>
+#include "RWStepShape_RWBlock.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWBlock.hxx b/src/RWStepShape/RWStepShape_RWBlock.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWBlock.hxx
rename to src/RWStepShape/RWStepShape_RWBlock.pxx
index 651511ec50..b488d431c5 100644
--- a/src/RWStepShape/RWStepShape_RWBlock.hxx
+++ b/src/RWStepShape/RWStepShape_RWBlock.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWBlock();
+  Standard_HIDDEN RWStepShape_RWBlock();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Block)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Block)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Block)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Block)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_Block)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Block)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWBooleanResult.cxx b/src/RWStepShape/RWStepShape_RWBooleanResult.cxx
index d120bfd87a..845612bd45 100644
--- a/src/RWStepShape/RWStepShape_RWBooleanResult.cxx
+++ b/src/RWStepShape/RWStepShape_RWBooleanResult.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWBooleanResult.hxx>
+#include "RWStepShape_RWBooleanResult.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_BooleanResult.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWBooleanResult.hxx b/src/RWStepShape/RWStepShape_RWBooleanResult.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWBooleanResult.hxx
rename to src/RWStepShape/RWStepShape_RWBooleanResult.pxx
index f7c3ac07d6..8341237fd0 100644
--- a/src/RWStepShape/RWStepShape_RWBooleanResult.hxx
+++ b/src/RWStepShape/RWStepShape_RWBooleanResult.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWBooleanResult();
+  Standard_HIDDEN RWStepShape_RWBooleanResult();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BooleanResult)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BooleanResult)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BooleanResult)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BooleanResult)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_BooleanResult)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_BooleanResult)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWBoxDomain.cxx b/src/RWStepShape/RWStepShape_RWBoxDomain.cxx
index 0e8d7aa521..34d4477be8 100644
--- a/src/RWStepShape/RWStepShape_RWBoxDomain.cxx
+++ b/src/RWStepShape/RWStepShape_RWBoxDomain.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWBoxDomain.hxx>
+#include "RWStepShape_RWBoxDomain.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWBoxDomain.hxx b/src/RWStepShape/RWStepShape_RWBoxDomain.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWBoxDomain.hxx
rename to src/RWStepShape/RWStepShape_RWBoxDomain.pxx
index 98073be60e..37c78c8543 100644
--- a/src/RWStepShape/RWStepShape_RWBoxDomain.hxx
+++ b/src/RWStepShape/RWStepShape_RWBoxDomain.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWBoxDomain();
+  Standard_HIDDEN RWStepShape_RWBoxDomain();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BoxDomain)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BoxDomain)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BoxDomain)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BoxDomain)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_BoxDomain)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_BoxDomain)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cxx b/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cxx
index e855d6b082..026642414f 100644
--- a/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cxx
+++ b/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWBoxedHalfSpace.hxx>
+#include "RWStepShape_RWBoxedHalfSpace.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Surface.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.hxx b/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWBoxedHalfSpace.hxx
rename to src/RWStepShape/RWStepShape_RWBoxedHalfSpace.pxx
index 1ac333beab..59bbce060c 100644
--- a/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.hxx
+++ b/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWBoxedHalfSpace();
+  Standard_HIDDEN RWStepShape_RWBoxedHalfSpace();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BoxedHalfSpace)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BoxedHalfSpace)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BoxedHalfSpace)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BoxedHalfSpace)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_BoxedHalfSpace)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_BoxedHalfSpace)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWBrepWithVoids.cxx b/src/RWStepShape/RWStepShape_RWBrepWithVoids.cxx
index 2dc7fd0dcd..cfef5be504 100644
--- a/src/RWStepShape/RWStepShape_RWBrepWithVoids.cxx
+++ b/src/RWStepShape/RWStepShape_RWBrepWithVoids.cxx
@@ -16,7 +16,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepShape_RWBrepWithVoids.hxx>
+#include "RWStepShape_RWBrepWithVoids.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_BrepWithVoids.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWBrepWithVoids.hxx b/src/RWStepShape/RWStepShape_RWBrepWithVoids.pxx
similarity index 84%
rename from src/RWStepShape/RWStepShape_RWBrepWithVoids.hxx
rename to src/RWStepShape/RWStepShape_RWBrepWithVoids.pxx
index 1d932f07bc..20cabc90b1 100644
--- a/src/RWStepShape/RWStepShape_RWBrepWithVoids.hxx
+++ b/src/RWStepShape/RWStepShape_RWBrepWithVoids.pxx
@@ -38,15 +38,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWBrepWithVoids();
+  Standard_HIDDEN RWStepShape_RWBrepWithVoids();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BrepWithVoids)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_BrepWithVoids)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BrepWithVoids)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_BrepWithVoids)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_BrepWithVoids)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_BrepWithVoids)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepShape_BrepWithVoids)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepShape_BrepWithVoids)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWClosedShell.cxx b/src/RWStepShape/RWStepShape_RWClosedShell.cxx
index 11311f6ffa..3304cfe07e 100644
--- a/src/RWStepShape/RWStepShape_RWClosedShell.cxx
+++ b/src/RWStepShape/RWStepShape_RWClosedShell.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWClosedShell.hxx>
+#include "RWStepShape_RWClosedShell.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ClosedShell.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWClosedShell.hxx b/src/RWStepShape/RWStepShape_RWClosedShell.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWClosedShell.hxx
rename to src/RWStepShape/RWStepShape_RWClosedShell.pxx
index df3ea6764c..40e110c09f 100644
--- a/src/RWStepShape/RWStepShape_RWClosedShell.hxx
+++ b/src/RWStepShape/RWStepShape_RWClosedShell.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWClosedShell();
+  Standard_HIDDEN RWStepShape_RWClosedShell();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ClosedShell)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ClosedShell)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ClosedShell)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ClosedShell)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ClosedShell)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ClosedShell)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx
index 6416ccf2a6..fd3648c002 100644
--- a/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWCompoundShapeRepresentation.hxx>
+#include "RWStepShape_RWCompoundShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.pxx
index 5f7d41bf66..0758c5e9ba 100644
--- a/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWCompoundShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWCompoundShapeRepresentation();
   
   //! Reads CompoundShapeRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_CompoundShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_CompoundShapeRepresentation)& ent) const;
   
   //! Writes CompoundShapeRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_CompoundShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_CompoundShapeRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_CompoundShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_CompoundShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.cxx b/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.cxx
index 8ad5178d44..5a9eda66f9 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.cxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWConnectedEdgeSet.hxx>
+#include "RWStepShape_RWConnectedEdgeSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ConnectedEdgeSet.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.hxx b/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWConnectedEdgeSet.hxx
rename to src/RWStepShape/RWStepShape_RWConnectedEdgeSet.pxx
index 923a9f1348..dea5232e22 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.hxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedEdgeSet.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWConnectedEdgeSet();
+  Standard_HIDDEN RWStepShape_RWConnectedEdgeSet();
   
   //! Reads ConnectedEdgeSet
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedEdgeSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedEdgeSet)& ent) const;
   
   //! Writes ConnectedEdgeSet
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedEdgeSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedEdgeSet)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_ConnectedEdgeSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ConnectedEdgeSet)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cxx b/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cxx
index 142105f2af..1f360a6e18 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWConnectedFaceSet.hxx>
+#include "RWStepShape_RWConnectedFaceSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ConnectedFaceSet.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceSet.hxx b/src/RWStepShape/RWStepShape_RWConnectedFaceSet.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWConnectedFaceSet.hxx
rename to src/RWStepShape/RWStepShape_RWConnectedFaceSet.pxx
index e5ef46d819..971ccd219e 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceSet.hxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceSet.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWConnectedFaceSet();
+  Standard_HIDDEN RWStepShape_RWConnectedFaceSet();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedFaceSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedFaceSet)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedFaceSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedFaceSet)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ConnectedFaceSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ConnectedFaceSet)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx
index b5adf8dc08..4bf453b43f 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWConnectedFaceShapeRepresentation.hxx>
+#include "RWStepShape_RWConnectedFaceShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.pxx
index 91f8c049c7..ccb608fc2e 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWConnectedFaceShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWConnectedFaceShapeRepresentation();
   
   //! Reads ConnectedFaceShapeRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedFaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedFaceShapeRepresentation)& ent) const;
   
   //! Writes ConnectedFaceShapeRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedFaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedFaceShapeRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_ConnectedFaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ConnectedFaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.cxx b/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.cxx
index 3b9d2b94cf..ad8d59a6e6 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.cxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWConnectedFaceSubSet.hxx>
+#include "RWStepShape_RWConnectedFaceSubSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ConnectedFaceSubSet.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.hxx b/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.hxx
rename to src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.pxx
index 07bf6dcf50..343133ff52 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.hxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceSubSet.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWConnectedFaceSubSet();
+  Standard_HIDDEN RWStepShape_RWConnectedFaceSubSet();
   
   //! Reads ConnectedFaceSubSet
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedFaceSubSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ConnectedFaceSubSet)& ent) const;
   
   //! Writes ConnectedFaceSubSet
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedFaceSubSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ConnectedFaceSubSet)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_ConnectedFaceSubSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ConnectedFaceSubSet)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cxx
index f3c47cf1fc..c412ea1d93 100644
--- a/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWContextDependentShapeRepresentation.hxx>
+#include "RWStepShape_RWContextDependentShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.pxx
index 18cac91d6e..e17d19d4a5 100644
--- a/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWContextDependentShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWContextDependentShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ContextDependentShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ContextDependentShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ContextDependentShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ContextDependentShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ContextDependentShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ContextDependentShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cxx
index b3bd8a11cf..b9d668fb00 100644
--- a/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWCsgShapeRepresentation.hxx>
+#include "RWStepShape_RWCsgShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.pxx
index 8587096008..4e8a8337cf 100644
--- a/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWCsgShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWCsgShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_CsgShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_CsgShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_CsgShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_CsgShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_CsgShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_CsgShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWCsgSolid.cxx b/src/RWStepShape/RWStepShape_RWCsgSolid.cxx
index f707dd1ced..5814d4cf58 100644
--- a/src/RWStepShape/RWStepShape_RWCsgSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWCsgSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWCsgSolid.hxx>
+#include "RWStepShape_RWCsgSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_BooleanResult.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWCsgSolid.hxx b/src/RWStepShape/RWStepShape_RWCsgSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWCsgSolid.hxx
rename to src/RWStepShape/RWStepShape_RWCsgSolid.pxx
index 5cd62e6c7b..8b66894407 100644
--- a/src/RWStepShape/RWStepShape_RWCsgSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWCsgSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWCsgSolid();
+  Standard_HIDDEN RWStepShape_RWCsgSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_CsgSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_CsgSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_CsgSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_CsgSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_CsgSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_CsgSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cxx
index 5a80f4be98..59907dea20 100644
--- a/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.hxx>
+#include "RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.pxx
index cc49a22f2c..9e465d250c 100644
--- a/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.pxx
@@ -36,13 +36,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DefinitionalRepresentationAndShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DefinitionalRepresentationAndShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DefinitionalRepresentationAndShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DefinitionalRepresentationAndShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_DefinitionalRepresentationAndShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_DefinitionalRepresentationAndShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.cxx b/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.cxx
index 3ddc07a284..bfda51bba7 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWDimensionalCharacteristicRepresentation.hxx>
+#include "RWStepShape_RWDimensionalCharacteristicRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_DimensionalCharacteristicRepresentation.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.hxx b/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.pxx
similarity index 88%
rename from src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.pxx
index 237e2b4da9..5fcc759ca2 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalCharacteristicRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWDimensionalCharacteristicRepresentation();
+  Standard_HIDDEN RWStepShape_RWDimensionalCharacteristicRepresentation();
   
   //! Reads DimensionalCharacteristicRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalCharacteristicRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalCharacteristicRepresentation)& ent) const;
   
   //! Writes DimensionalCharacteristicRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalCharacteristicRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalCharacteristicRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_DimensionalCharacteristicRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_DimensionalCharacteristicRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalLocation.cxx b/src/RWStepShape/RWStepShape_RWDimensionalLocation.cxx
index b17e0a4f7c..134775e04a 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalLocation.cxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalLocation.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWDimensionalLocation.hxx>
+#include "RWStepShape_RWDimensionalLocation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalLocation.hxx b/src/RWStepShape/RWStepShape_RWDimensionalLocation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWDimensionalLocation.hxx
rename to src/RWStepShape/RWStepShape_RWDimensionalLocation.pxx
index fdbc638242..4e243f9796 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalLocation.hxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalLocation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWDimensionalLocation();
+  Standard_HIDDEN RWStepShape_RWDimensionalLocation();
   
   //! Reads DimensionalLocation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalLocation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalLocation)& ent) const;
   
   //! Writes DimensionalLocation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalLocation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalLocation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_DimensionalLocation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_DimensionalLocation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.cxx b/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.cxx
index 30efa38978..836429c21d 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.cxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWDimensionalLocationWithPath.hxx>
+#include "RWStepShape_RWDimensionalLocationWithPath.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.hxx b/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.hxx
rename to src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.pxx
index 22c28ccfd2..b5138fd2bc 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.hxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalLocationWithPath.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWDimensionalLocationWithPath();
+  Standard_HIDDEN RWStepShape_RWDimensionalLocationWithPath();
   
   //! Reads DimensionalLocationWithPath
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalLocationWithPath)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalLocationWithPath)& ent) const;
   
   //! Writes DimensionalLocationWithPath
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalLocationWithPath)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalLocationWithPath)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_DimensionalLocationWithPath)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_DimensionalLocationWithPath)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalSize.cxx b/src/RWStepShape/RWStepShape_RWDimensionalSize.cxx
index 67e11df59b..f314f6a821 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalSize.cxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalSize.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWDimensionalSize.hxx>
+#include "RWStepShape_RWDimensionalSize.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalSize.hxx b/src/RWStepShape/RWStepShape_RWDimensionalSize.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWDimensionalSize.hxx
rename to src/RWStepShape/RWStepShape_RWDimensionalSize.pxx
index d58b7a2aee..d93f6cb789 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalSize.hxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalSize.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWDimensionalSize();
+  Standard_HIDDEN RWStepShape_RWDimensionalSize();
   
   //! Reads DimensionalSize
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalSize)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalSize)& ent) const;
   
   //! Writes DimensionalSize
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalSize)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalSize)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_DimensionalSize)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_DimensionalSize)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.cxx b/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.cxx
index 7ad8941cf4..66a0583d12 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.cxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWDimensionalSizeWithPath.hxx>
+#include "RWStepShape_RWDimensionalSizeWithPath.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.hxx b/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.hxx
rename to src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.pxx
index 3c4db7ea44..8d9b5bb342 100644
--- a/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.hxx
+++ b/src/RWStepShape/RWStepShape_RWDimensionalSizeWithPath.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWDimensionalSizeWithPath();
+  Standard_HIDDEN RWStepShape_RWDimensionalSizeWithPath();
   
   //! Reads DimensionalSizeWithPath
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalSizeWithPath)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_DimensionalSizeWithPath)& ent) const;
   
   //! Writes DimensionalSizeWithPath
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalSizeWithPath)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_DimensionalSizeWithPath)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_DimensionalSizeWithPath)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_DimensionalSizeWithPath)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWEdge.cxx b/src/RWStepShape/RWStepShape_RWEdge.cxx
index a6f988cc58..756e4953b6 100644
--- a/src/RWStepShape/RWStepShape_RWEdge.cxx
+++ b/src/RWStepShape/RWStepShape_RWEdge.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWEdge.hxx>
+#include "RWStepShape_RWEdge.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_Edge.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWEdge.hxx b/src/RWStepShape/RWStepShape_RWEdge.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWEdge.hxx
rename to src/RWStepShape/RWStepShape_RWEdge.pxx
index ba40c3701f..30c30bb7f3 100644
--- a/src/RWStepShape/RWStepShape_RWEdge.hxx
+++ b/src/RWStepShape/RWStepShape_RWEdge.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWEdge();
+  Standard_HIDDEN RWStepShape_RWEdge();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Edge)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Edge)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Edge)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Edge)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_Edge)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Edge)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.cxx b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.cxx
index 63a6f2b5b1..db4d1f33bf 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.cxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWEdgeBasedWireframeModel.hxx>
+#include "RWStepShape_RWEdgeBasedWireframeModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_EdgeBasedWireframeModel.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.hxx b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.hxx
rename to src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.pxx
index 4f9091f653..77f210c6fb 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.hxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeModel.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWEdgeBasedWireframeModel();
+  Standard_HIDDEN RWStepShape_RWEdgeBasedWireframeModel();
   
   //! Reads EdgeBasedWireframeModel
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_EdgeBasedWireframeModel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_EdgeBasedWireframeModel)& ent) const;
   
   //! Writes EdgeBasedWireframeModel
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_EdgeBasedWireframeModel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_EdgeBasedWireframeModel)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_EdgeBasedWireframeModel)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_EdgeBasedWireframeModel)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx
index 814e5ed8e5..0631aacf99 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWEdgeBasedWireframeShapeRepresentation.hxx>
+#include "RWStepShape_RWEdgeBasedWireframeShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.pxx
similarity index 88%
rename from src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.pxx
index 6d3312ea7d..a303bb25c1 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWEdgeBasedWireframeShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWEdgeBasedWireframeShapeRepresentation();
   
   //! Reads EdgeBasedWireframeShapeRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_EdgeBasedWireframeShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_EdgeBasedWireframeShapeRepresentation)& ent) const;
   
   //! Writes EdgeBasedWireframeShapeRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_EdgeBasedWireframeShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_EdgeBasedWireframeShapeRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_EdgeBasedWireframeShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_EdgeBasedWireframeShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWEdgeCurve.cxx b/src/RWStepShape/RWStepShape_RWEdgeCurve.cxx
index d5614afd03..d8eef3b455 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeCurve.cxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeCurve.cxx
@@ -11,7 +11,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepShape_RWEdgeCurve.hxx>
+#include "RWStepShape_RWEdgeCurve.pxx"
 
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWEdgeCurve.hxx b/src/RWStepShape/RWStepShape_RWEdgeCurve.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWEdgeCurve.hxx
rename to src/RWStepShape/RWStepShape_RWEdgeCurve.pxx
index 6cd8e32430..29603995bf 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeCurve.hxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeCurve.pxx
@@ -39,18 +39,18 @@ public:
 public:
   RWStepShape_RWEdgeCurve() = default;
 
-  Standard_EXPORT void ReadStep (const Handle (StepData_StepReaderData)& theStepData,
+  Standard_HIDDEN void ReadStep (const Handle (StepData_StepReaderData)& theStepData,
                                  const Standard_Integer                  theRecordID,
                                  Handle (Interface_Check)&               theMessageTool,
                                  const Handle (StepShape_EdgeCurve)&     theEdgeCurve) const;
 
-  Standard_EXPORT void WriteStep (StepData_StepWriter&                theStepWriter,
+  Standard_HIDDEN void WriteStep (StepData_StepWriter&                theStepWriter,
                                   const Handle (StepShape_EdgeCurve)& theEdgeCurve) const;
 
-  Standard_EXPORT void Share (const Handle (StepShape_EdgeCurve)& theEdgeCurve,
+  Standard_HIDDEN void Share (const Handle (StepShape_EdgeCurve)& theEdgeCurve,
                               Interface_EntityIterator&           theSharedEntitiesIt) const;
 
-  Standard_EXPORT void Check (const Handle (StepShape_EdgeCurve)& theEdgeCurve,
+  Standard_HIDDEN void Check (const Handle (StepShape_EdgeCurve)& theEdgeCurve,
                               const Interface_ShareTool&          theShareTool,
                               Handle (Interface_Check)&           theMessageTool) const;
 };
diff --git a/src/RWStepShape/RWStepShape_RWEdgeLoop.cxx b/src/RWStepShape/RWStepShape_RWEdgeLoop.cxx
index f6cc79a34f..99b93a06fa 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeLoop.cxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeLoop.cxx
@@ -15,7 +15,7 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepShape_RWEdgeLoop.hxx>
+#include "RWStepShape_RWEdgeLoop.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_EdgeLoop.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWEdgeLoop.hxx b/src/RWStepShape/RWStepShape_RWEdgeLoop.pxx
similarity index 84%
rename from src/RWStepShape/RWStepShape_RWEdgeLoop.hxx
rename to src/RWStepShape/RWStepShape_RWEdgeLoop.pxx
index 156fe44823..f99cd86902 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeLoop.hxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeLoop.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWEdgeLoop();
+  Standard_HIDDEN RWStepShape_RWEdgeLoop();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_EdgeLoop)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_EdgeLoop)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_EdgeLoop)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_EdgeLoop)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_EdgeLoop)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_EdgeLoop)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepShape_EdgeLoop)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepShape_EdgeLoop)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cxx b/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cxx
index cfbd4d6b0b..d9d0a03894 100644
--- a/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWExtrudedAreaSolid.hxx>
+#include "RWStepShape_RWExtrudedAreaSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.hxx b/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.hxx
rename to src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.pxx
index 1c3be94476..ef24352977 100644
--- a/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWExtrudedAreaSolid();
+  Standard_HIDDEN RWStepShape_RWExtrudedAreaSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ExtrudedAreaSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ExtrudedAreaSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ExtrudedAreaSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ExtrudedAreaSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ExtrudedAreaSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ExtrudedAreaSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cxx b/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cxx
index 39a56f257b..2c00a46374 100644
--- a/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWExtrudedFaceSolid.hxx>
+#include "RWStepShape_RWExtrudedFaceSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.hxx b/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.hxx
rename to src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.pxx
index 6888206f29..c14997fe43 100644
--- a/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWExtrudedFaceSolid();
+  Standard_HIDDEN RWStepShape_RWExtrudedFaceSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ExtrudedFaceSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ExtrudedFaceSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ExtrudedFaceSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ExtrudedFaceSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ExtrudedFaceSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ExtrudedFaceSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFace.cxx b/src/RWStepShape/RWStepShape_RWFace.cxx
index b12537fa1a..e29b50c255 100644
--- a/src/RWStepShape/RWStepShape_RWFace.cxx
+++ b/src/RWStepShape/RWStepShape_RWFace.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWFace.hxx>
+#include "RWStepShape_RWFace.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_Face.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFace.hxx b/src/RWStepShape/RWStepShape_RWFace.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWFace.hxx
rename to src/RWStepShape/RWStepShape_RWFace.pxx
index 99a7a8eca7..a4ae0dc7a4 100644
--- a/src/RWStepShape/RWStepShape_RWFace.hxx
+++ b/src/RWStepShape/RWStepShape_RWFace.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWFace();
+  Standard_HIDDEN RWStepShape_RWFace();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Face)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Face)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Face)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Face)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_Face)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Face)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.cxx b/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.cxx
index 2af9ef6e91..8a36324656 100644
--- a/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.cxx
+++ b/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWFaceBasedSurfaceModel.hxx>
+#include "RWStepShape_RWFaceBasedSurfaceModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_FaceBasedSurfaceModel.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.hxx b/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.hxx
rename to src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.pxx
index ca691f6fb2..5032cfec2a 100644
--- a/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.hxx
+++ b/src/RWStepShape/RWStepShape_RWFaceBasedSurfaceModel.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWFaceBasedSurfaceModel();
+  Standard_HIDDEN RWStepShape_RWFaceBasedSurfaceModel();
   
   //! Reads FaceBasedSurfaceModel
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceBasedSurfaceModel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceBasedSurfaceModel)& ent) const;
   
   //! Writes FaceBasedSurfaceModel
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceBasedSurfaceModel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceBasedSurfaceModel)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_FaceBasedSurfaceModel)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_FaceBasedSurfaceModel)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceBound.cxx b/src/RWStepShape/RWStepShape_RWFaceBound.cxx
index 4eb51377dc..28bf9f4090 100644
--- a/src/RWStepShape/RWStepShape_RWFaceBound.cxx
+++ b/src/RWStepShape/RWStepShape_RWFaceBound.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <Interface_ShareTool.hxx>
-#include <RWStepShape_RWFaceBound.hxx>
+#include "RWStepShape_RWFaceBound.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_EdgeLoop.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFaceBound.hxx b/src/RWStepShape/RWStepShape_RWFaceBound.pxx
similarity index 84%
rename from src/RWStepShape/RWStepShape_RWFaceBound.hxx
rename to src/RWStepShape/RWStepShape_RWFaceBound.pxx
index 885ec95088..33ead8242e 100644
--- a/src/RWStepShape/RWStepShape_RWFaceBound.hxx
+++ b/src/RWStepShape/RWStepShape_RWFaceBound.pxx
@@ -39,15 +39,15 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWFaceBound();
+  Standard_HIDDEN RWStepShape_RWFaceBound();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceBound)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceBound)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceBound)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceBound)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_FaceBound)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_FaceBound)& ent, Interface_EntityIterator& iter) const;
   
-  Standard_EXPORT void Check (const Handle(StepShape_FaceBound)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
+  Standard_HIDDEN void Check (const Handle(StepShape_FaceBound)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceOuterBound.cxx b/src/RWStepShape/RWStepShape_RWFaceOuterBound.cxx
index e7fbb2f1a5..7de846fee3 100644
--- a/src/RWStepShape/RWStepShape_RWFaceOuterBound.cxx
+++ b/src/RWStepShape/RWStepShape_RWFaceOuterBound.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWFaceOuterBound.hxx>
+#include "RWStepShape_RWFaceOuterBound.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_FaceOuterBound.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFaceOuterBound.hxx b/src/RWStepShape/RWStepShape_RWFaceOuterBound.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWFaceOuterBound.hxx
rename to src/RWStepShape/RWStepShape_RWFaceOuterBound.pxx
index 3fa4b98209..383395c4a7 100644
--- a/src/RWStepShape/RWStepShape_RWFaceOuterBound.hxx
+++ b/src/RWStepShape/RWStepShape_RWFaceOuterBound.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWFaceOuterBound();
+  Standard_HIDDEN RWStepShape_RWFaceOuterBound();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceOuterBound)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceOuterBound)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceOuterBound)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceOuterBound)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_FaceOuterBound)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_FaceOuterBound)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceSurface.cxx b/src/RWStepShape/RWStepShape_RWFaceSurface.cxx
index 7fc0e162d8..bd5fc969d4 100644
--- a/src/RWStepShape/RWStepShape_RWFaceSurface.cxx
+++ b/src/RWStepShape/RWStepShape_RWFaceSurface.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWFaceSurface.hxx>
+#include "RWStepShape_RWFaceSurface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Surface.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFaceSurface.hxx b/src/RWStepShape/RWStepShape_RWFaceSurface.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWFaceSurface.hxx
rename to src/RWStepShape/RWStepShape_RWFaceSurface.pxx
index e519376e83..7a8ef9dd49 100644
--- a/src/RWStepShape/RWStepShape_RWFaceSurface.hxx
+++ b/src/RWStepShape/RWStepShape_RWFaceSurface.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWFaceSurface();
+  Standard_HIDDEN RWStepShape_RWFaceSurface();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceSurface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FaceSurface)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceSurface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FaceSurface)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_FaceSurface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_FaceSurface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrep.cxx b/src/RWStepShape/RWStepShape_RWFacetedBrep.cxx
index d785856418..41c833142d 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrep.cxx
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrep.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWFacetedBrep.hxx>
+#include "RWStepShape_RWFacetedBrep.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ClosedShell.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrep.hxx b/src/RWStepShape/RWStepShape_RWFacetedBrep.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWFacetedBrep.hxx
rename to src/RWStepShape/RWStepShape_RWFacetedBrep.pxx
index c9ba53d420..c15543e8a6 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrep.hxx
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrep.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWFacetedBrep();
+  Standard_HIDDEN RWStepShape_RWFacetedBrep();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FacetedBrep)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FacetedBrep)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FacetedBrep)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FacetedBrep)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_FacetedBrep)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_FacetedBrep)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cxx b/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cxx
index 7afda07613..67e5e81efc 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cxx
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWFacetedBrepAndBrepWithVoids.hxx>
+#include "RWStepShape_RWFacetedBrepAndBrepWithVoids.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ClosedShell.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.hxx b/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.hxx
rename to src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.pxx
index 29ec817935..e9a2631fdc 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.hxx
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWFacetedBrepAndBrepWithVoids();
+  Standard_HIDDEN RWStepShape_RWFacetedBrepAndBrepWithVoids();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FacetedBrepAndBrepWithVoids)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FacetedBrepAndBrepWithVoids)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FacetedBrepAndBrepWithVoids)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FacetedBrepAndBrepWithVoids)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_FacetedBrepAndBrepWithVoids)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_FacetedBrepAndBrepWithVoids)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cxx
index a3c2e5a92f..01bdb31388 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWFacetedBrepShapeRepresentation.hxx>
+#include "RWStepShape_RWFacetedBrepShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.pxx
index 26a5365def..797a34fc9f 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWFacetedBrepShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWFacetedBrepShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FacetedBrepShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_FacetedBrepShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FacetedBrepShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_FacetedBrepShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_FacetedBrepShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_FacetedBrepShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cxx b/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cxx
index e406789586..ba268c8f5e 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWGeometricCurveSet.hxx>
+#include "RWStepShape_RWGeometricCurveSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_GeometricCurveSet.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWGeometricCurveSet.hxx b/src/RWStepShape/RWStepShape_RWGeometricCurveSet.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWGeometricCurveSet.hxx
rename to src/RWStepShape/RWStepShape_RWGeometricCurveSet.pxx
index 1893319ba0..96b6f9244d 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricCurveSet.hxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricCurveSet.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWGeometricCurveSet();
+  Standard_HIDDEN RWStepShape_RWGeometricCurveSet();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricCurveSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricCurveSet)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricCurveSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricCurveSet)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_GeometricCurveSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_GeometricCurveSet)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricSet.cxx b/src/RWStepShape/RWStepShape_RWGeometricSet.cxx
index 2bca9aa09f..26130db88d 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricSet.cxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricSet.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWGeometricSet.hxx>
+#include "RWStepShape_RWGeometricSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_GeometricSet.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWGeometricSet.hxx b/src/RWStepShape/RWStepShape_RWGeometricSet.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWGeometricSet.hxx
rename to src/RWStepShape/RWStepShape_RWGeometricSet.pxx
index f952c75790..321bcaa93a 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricSet.hxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricSet.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWGeometricSet();
+  Standard_HIDDEN RWStepShape_RWGeometricSet();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricSet)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricSet)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_GeometricSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_GeometricSet)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cxx
index b713e844cf..c88b6e62c5 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.hxx>
+#include "RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.pxx
index 1fb590b7c1..33ca874507 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricallyBoundedSurfaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricallyBoundedSurfaceShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricallyBoundedSurfaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricallyBoundedSurfaceShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_GeometricallyBoundedSurfaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_GeometricallyBoundedSurfaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cxx
index f1f0193755..37c432b395 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx>
+#include "RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.pxx
similarity index 88%
rename from src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.pxx
index c9ff63e912..753f9a1a86 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricallyBoundedWireframeShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_GeometricallyBoundedWireframeShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricallyBoundedWireframeShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_GeometricallyBoundedWireframeShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_GeometricallyBoundedWireframeShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_GeometricallyBoundedWireframeShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cxx b/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cxx
index d272a98bd8..e572dca6a3 100644
--- a/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWHalfSpaceSolid.hxx>
+#include "RWStepShape_RWHalfSpaceSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Surface.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.hxx b/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWHalfSpaceSolid.hxx
rename to src/RWStepShape/RWStepShape_RWHalfSpaceSolid.pxx
index 3f07f2c5e8..9972c2677a 100644
--- a/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWHalfSpaceSolid();
+  Standard_HIDDEN RWStepShape_RWHalfSpaceSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_HalfSpaceSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_HalfSpaceSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_HalfSpaceSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_HalfSpaceSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_HalfSpaceSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_HalfSpaceSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWLimitsAndFits.cxx b/src/RWStepShape/RWStepShape_RWLimitsAndFits.cxx
index fc16cf3a3b..332b2af949 100644
--- a/src/RWStepShape/RWStepShape_RWLimitsAndFits.cxx
+++ b/src/RWStepShape/RWStepShape_RWLimitsAndFits.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepShape_RWLimitsAndFits.hxx>
+#include "RWStepShape_RWLimitsAndFits.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_LimitsAndFits.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWLimitsAndFits.hxx b/src/RWStepShape/RWStepShape_RWLimitsAndFits.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWLimitsAndFits.hxx
rename to src/RWStepShape/RWStepShape_RWLimitsAndFits.pxx
index ddfa14b808..1c4ff397ac 100644
--- a/src/RWStepShape/RWStepShape_RWLimitsAndFits.hxx
+++ b/src/RWStepShape/RWStepShape_RWLimitsAndFits.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWLimitsAndFits();
+  Standard_HIDDEN RWStepShape_RWLimitsAndFits();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_LimitsAndFits)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_LimitsAndFits)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_LimitsAndFits)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_LimitsAndFits)& ent) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWLoop.cxx b/src/RWStepShape/RWStepShape_RWLoop.cxx
index eb6dabe8c5..a75635f01c 100644
--- a/src/RWStepShape/RWStepShape_RWLoop.cxx
+++ b/src/RWStepShape/RWStepShape_RWLoop.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepShape_RWLoop.hxx>
+#include "RWStepShape_RWLoop.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_Loop.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWLoop.hxx b/src/RWStepShape/RWStepShape_RWLoop.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWLoop.hxx
rename to src/RWStepShape/RWStepShape_RWLoop.pxx
index 1800431531..800ab70a1c 100644
--- a/src/RWStepShape/RWStepShape_RWLoop.hxx
+++ b/src/RWStepShape/RWStepShape_RWLoop.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWLoop();
+  Standard_HIDDEN RWStepShape_RWLoop();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Loop)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Loop)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Loop)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Loop)& ent) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWLoopAndPath.cxx b/src/RWStepShape/RWStepShape_RWLoopAndPath.cxx
index f7d36fdef8..b8297a838f 100644
--- a/src/RWStepShape/RWStepShape_RWLoopAndPath.cxx
+++ b/src/RWStepShape/RWStepShape_RWLoopAndPath.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWLoopAndPath.hxx>
+#include "RWStepShape_RWLoopAndPath.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_LoopAndPath.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWLoopAndPath.hxx b/src/RWStepShape/RWStepShape_RWLoopAndPath.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWLoopAndPath.hxx
rename to src/RWStepShape/RWStepShape_RWLoopAndPath.pxx
index 7e54f2ed75..4f0f7c2b60 100644
--- a/src/RWStepShape/RWStepShape_RWLoopAndPath.hxx
+++ b/src/RWStepShape/RWStepShape_RWLoopAndPath.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWLoopAndPath();
+  Standard_HIDDEN RWStepShape_RWLoopAndPath();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_LoopAndPath)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_LoopAndPath)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_LoopAndPath)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_LoopAndPath)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_LoopAndPath)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_LoopAndPath)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cxx b/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cxx
index 3a52faab33..a4ae1fcd76 100644
--- a/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cxx
+++ b/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWManifoldSolidBrep.hxx>
+#include "RWStepShape_RWManifoldSolidBrep.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ConnectedFaceSet.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.hxx b/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWManifoldSolidBrep.hxx
rename to src/RWStepShape/RWStepShape_RWManifoldSolidBrep.pxx
index c11d91e517..5cb2f9cff3 100644
--- a/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.hxx
+++ b/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWManifoldSolidBrep();
+  Standard_HIDDEN RWStepShape_RWManifoldSolidBrep();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ManifoldSolidBrep)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ManifoldSolidBrep)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ManifoldSolidBrep)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ManifoldSolidBrep)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ManifoldSolidBrep)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ManifoldSolidBrep)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cxx
index 0d6dda1bad..1e807fbb2f 100644
--- a/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx>
+#include "RWStepShape_RWManifoldSurfaceShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.pxx
index b21f3c946e..bd8f533ae3 100644
--- a/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWManifoldSurfaceShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWManifoldSurfaceShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ManifoldSurfaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ManifoldSurfaceShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ManifoldSurfaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ManifoldSurfaceShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ManifoldSurfaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ManifoldSurfaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx b/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx
index 63555f2275..3dd50f063a 100644
--- a/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx
+++ b/src/RWStepShape/RWStepShape_RWMeasureQualification.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWMeasureQualification.hxx>
+#include "RWStepShape_RWMeasureQualification.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWMeasureQualification.hxx b/src/RWStepShape/RWStepShape_RWMeasureQualification.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWMeasureQualification.hxx
rename to src/RWStepShape/RWStepShape_RWMeasureQualification.pxx
index 44e2696e42..d88704cbca 100644
--- a/src/RWStepShape/RWStepShape_RWMeasureQualification.hxx
+++ b/src/RWStepShape/RWStepShape_RWMeasureQualification.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWMeasureQualification();
+  Standard_HIDDEN RWStepShape_RWMeasureQualification();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_MeasureQualification)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_MeasureQualification)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_MeasureQualification)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_MeasureQualification)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_MeasureQualification)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_MeasureQualification)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cxx b/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cxx
index e5365ede65..268fd215e1 100644
--- a/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cxx
+++ b/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.hxx>
+#include "RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.pxx"
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_Unit.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.hxx b/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.pxx
similarity index 88%
rename from src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.hxx
rename to src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.pxx
index ec318f9694..5113a20d62 100644
--- a/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.hxx
+++ b/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem();
+  Standard_HIDDEN RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx
index 816fd3dd7b..a49be44f4c 100644
--- a/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWNonManifoldSurfaceShapeRepresentation.hxx>
+#include "RWStepShape_RWNonManifoldSurfaceShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.pxx
similarity index 88%
rename from src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.pxx
index 965149d873..6858f65081 100644
--- a/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWNonManifoldSurfaceShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWNonManifoldSurfaceShapeRepresentation();
   
   //! Reads NonManifoldSurfaceShapeRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_NonManifoldSurfaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_NonManifoldSurfaceShapeRepresentation)& ent) const;
   
   //! Writes NonManifoldSurfaceShapeRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_NonManifoldSurfaceShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_NonManifoldSurfaceShapeRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_NonManifoldSurfaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_NonManifoldSurfaceShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWOpenShell.cxx b/src/RWStepShape/RWStepShape_RWOpenShell.cxx
index 0b68bc6106..0de3fe6f72 100644
--- a/src/RWStepShape/RWStepShape_RWOpenShell.cxx
+++ b/src/RWStepShape/RWStepShape_RWOpenShell.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWOpenShell.hxx>
+#include "RWStepShape_RWOpenShell.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_OpenShell.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWOpenShell.hxx b/src/RWStepShape/RWStepShape_RWOpenShell.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWOpenShell.hxx
rename to src/RWStepShape/RWStepShape_RWOpenShell.pxx
index 33b74ebec7..0f16f5d0cc 100644
--- a/src/RWStepShape/RWStepShape_RWOpenShell.hxx
+++ b/src/RWStepShape/RWStepShape_RWOpenShell.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWOpenShell();
+  Standard_HIDDEN RWStepShape_RWOpenShell();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OpenShell)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OpenShell)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OpenShell)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OpenShell)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_OpenShell)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_OpenShell)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cxx b/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cxx
index 029d9a07c7..e26abd9858 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWOrientedClosedShell.hxx>
+#include "RWStepShape_RWOrientedClosedShell.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_OrientedClosedShell.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWOrientedClosedShell.hxx b/src/RWStepShape/RWStepShape_RWOrientedClosedShell.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWOrientedClosedShell.hxx
rename to src/RWStepShape/RWStepShape_RWOrientedClosedShell.pxx
index fbcb3e1aa0..6d8ec20fd7 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedClosedShell.hxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedClosedShell.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWOrientedClosedShell();
+  Standard_HIDDEN RWStepShape_RWOrientedClosedShell();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedClosedShell)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedClosedShell)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedClosedShell)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedClosedShell)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_OrientedClosedShell)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_OrientedClosedShell)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedEdge.cxx b/src/RWStepShape/RWStepShape_RWOrientedEdge.cxx
index c3624fad17..46248f8743 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedEdge.cxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedEdge.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWOrientedEdge.hxx>
+#include "RWStepShape_RWOrientedEdge.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_OrientedEdge.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWOrientedEdge.hxx b/src/RWStepShape/RWStepShape_RWOrientedEdge.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWOrientedEdge.hxx
rename to src/RWStepShape/RWStepShape_RWOrientedEdge.pxx
index f2ea2177cc..8f9f1a81aa 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedEdge.hxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedEdge.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWOrientedEdge();
+  Standard_HIDDEN RWStepShape_RWOrientedEdge();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedEdge)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedEdge)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedEdge)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedEdge)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_OrientedEdge)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_OrientedEdge)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedFace.cxx b/src/RWStepShape/RWStepShape_RWOrientedFace.cxx
index d601b084db..c7d05fc24a 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedFace.cxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedFace.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWOrientedFace.hxx>
+#include "RWStepShape_RWOrientedFace.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_OrientedFace.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWOrientedFace.hxx b/src/RWStepShape/RWStepShape_RWOrientedFace.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWOrientedFace.hxx
rename to src/RWStepShape/RWStepShape_RWOrientedFace.pxx
index d55cf36339..8a939b8c0c 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedFace.hxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedFace.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWOrientedFace();
+  Standard_HIDDEN RWStepShape_RWOrientedFace();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedFace)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedFace)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedFace)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedFace)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_OrientedFace)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_OrientedFace)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cxx b/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cxx
index c4d41e3529..77207742ef 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWOrientedOpenShell.hxx>
+#include "RWStepShape_RWOrientedOpenShell.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_OrientedOpenShell.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWOrientedOpenShell.hxx b/src/RWStepShape/RWStepShape_RWOrientedOpenShell.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWOrientedOpenShell.hxx
rename to src/RWStepShape/RWStepShape_RWOrientedOpenShell.pxx
index bbe80614ce..9d40876168 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedOpenShell.hxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedOpenShell.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWOrientedOpenShell();
+  Standard_HIDDEN RWStepShape_RWOrientedOpenShell();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedOpenShell)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedOpenShell)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedOpenShell)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedOpenShell)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_OrientedOpenShell)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_OrientedOpenShell)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedPath.cxx b/src/RWStepShape/RWStepShape_RWOrientedPath.cxx
index 0096f4aab0..0e26486c15 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedPath.cxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedPath.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWOrientedPath.hxx>
+#include "RWStepShape_RWOrientedPath.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_EdgeLoop.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWOrientedPath.hxx b/src/RWStepShape/RWStepShape_RWOrientedPath.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWOrientedPath.hxx
rename to src/RWStepShape/RWStepShape_RWOrientedPath.pxx
index 2ee1d24aaa..d078622f3c 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedPath.hxx
+++ b/src/RWStepShape/RWStepShape_RWOrientedPath.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWOrientedPath();
+  Standard_HIDDEN RWStepShape_RWOrientedPath();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedPath)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_OrientedPath)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedPath)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_OrientedPath)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_OrientedPath)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_OrientedPath)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWPath.cxx b/src/RWStepShape/RWStepShape_RWPath.cxx
index c824f3a78b..bfe739a2a0 100644
--- a/src/RWStepShape/RWStepShape_RWPath.cxx
+++ b/src/RWStepShape/RWStepShape_RWPath.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWPath.hxx>
+#include "RWStepShape_RWPath.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_OrientedEdge.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWPath.hxx b/src/RWStepShape/RWStepShape_RWPath.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWPath.hxx
rename to src/RWStepShape/RWStepShape_RWPath.pxx
index 4300fbce74..f69eb4af53 100644
--- a/src/RWStepShape/RWStepShape_RWPath.hxx
+++ b/src/RWStepShape/RWStepShape_RWPath.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWPath();
+  Standard_HIDDEN RWStepShape_RWPath();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Path)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Path)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Path)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Path)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_Path)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Path)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cxx b/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cxx
index ff413adfbb..a374410a4d 100644
--- a/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cxx
+++ b/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWPlusMinusTolerance.hxx>
+#include "RWStepShape_RWPlusMinusTolerance.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_PlusMinusTolerance.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.hxx b/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWPlusMinusTolerance.hxx
rename to src/RWStepShape/RWStepShape_RWPlusMinusTolerance.pxx
index 6a5d35f58a..9fa2e24605 100644
--- a/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.hxx
+++ b/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWPlusMinusTolerance();
+  Standard_HIDDEN RWStepShape_RWPlusMinusTolerance();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PlusMinusTolerance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PlusMinusTolerance)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PlusMinusTolerance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PlusMinusTolerance)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_PlusMinusTolerance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_PlusMinusTolerance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx b/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx
index 7f6e3070bb..84ac6c5f3d 100644
--- a/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWPointRepresentation.hxx>
+#include "RWStepShape_RWPointRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWPointRepresentation.hxx b/src/RWStepShape/RWStepShape_RWPointRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWPointRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWPointRepresentation.pxx
index 1585478c8e..6054db7ba4 100644
--- a/src/RWStepShape/RWStepShape_RWPointRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWPointRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWPointRepresentation();
+  Standard_HIDDEN RWStepShape_RWPointRepresentation();
   
   //! Reads PointRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PointRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PointRepresentation)& ent) const;
   
   //! Writes PointRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PointRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PointRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_PointRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_PointRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWPolyLoop.cxx b/src/RWStepShape/RWStepShape_RWPolyLoop.cxx
index b04199ff28..f741ef2443 100644
--- a/src/RWStepShape/RWStepShape_RWPolyLoop.cxx
+++ b/src/RWStepShape/RWStepShape_RWPolyLoop.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWPolyLoop.hxx>
+#include "RWStepShape_RWPolyLoop.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_PolyLoop.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWPolyLoop.hxx b/src/RWStepShape/RWStepShape_RWPolyLoop.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWPolyLoop.hxx
rename to src/RWStepShape/RWStepShape_RWPolyLoop.pxx
index 8f009e5d92..66c2964fa5 100644
--- a/src/RWStepShape/RWStepShape_RWPolyLoop.hxx
+++ b/src/RWStepShape/RWStepShape_RWPolyLoop.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWPolyLoop();
+  Standard_HIDDEN RWStepShape_RWPolyLoop();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PolyLoop)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PolyLoop)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PolyLoop)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PolyLoop)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_PolyLoop)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_PolyLoop)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cxx b/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cxx
index 88f821bd72..fedc14178c 100644
--- a/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cxx
+++ b/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepShape_RWPrecisionQualifier.hxx>
+#include "RWStepShape_RWPrecisionQualifier.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_PrecisionQualifier.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWPrecisionQualifier.hxx b/src/RWStepShape/RWStepShape_RWPrecisionQualifier.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWPrecisionQualifier.hxx
rename to src/RWStepShape/RWStepShape_RWPrecisionQualifier.pxx
index 54cf40d98a..fd08c67e50 100644
--- a/src/RWStepShape/RWStepShape_RWPrecisionQualifier.hxx
+++ b/src/RWStepShape/RWStepShape_RWPrecisionQualifier.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWPrecisionQualifier();
+  Standard_HIDDEN RWStepShape_RWPrecisionQualifier();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PrecisionQualifier)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_PrecisionQualifier)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PrecisionQualifier)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_PrecisionQualifier)& ent) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cxx b/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cxx
index c7ceec34a0..82dc789c2a 100644
--- a/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cxx
+++ b/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWQualifiedRepresentationItem.hxx>
+#include "RWStepShape_RWQualifiedRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_QualifiedRepresentationItem.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.hxx b/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.hxx
rename to src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.pxx
index c73f270bcb..0943d0a225 100644
--- a/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.hxx
+++ b/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWQualifiedRepresentationItem();
+  Standard_HIDDEN RWStepShape_RWQualifiedRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_QualifiedRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_QualifiedRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_QualifiedRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_QualifiedRepresentationItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_QualifiedRepresentationItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_QualifiedRepresentationItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cxx b/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cxx
index 81bd0f95f2..d0d25081de 100644
--- a/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWRevolvedAreaSolid.hxx>
+#include "RWStepShape_RWRevolvedAreaSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis1Placement.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.hxx b/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.hxx
rename to src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.pxx
index 48f76f129b..08b6c49708 100644
--- a/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWRevolvedAreaSolid();
+  Standard_HIDDEN RWStepShape_RWRevolvedAreaSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RevolvedAreaSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RevolvedAreaSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RevolvedAreaSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RevolvedAreaSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_RevolvedAreaSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_RevolvedAreaSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cxx b/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cxx
index 9cbde9edb6..1a386c574f 100644
--- a/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWRevolvedFaceSolid.hxx>
+#include "RWStepShape_RWRevolvedFaceSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis1Placement.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.hxx b/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.hxx
rename to src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.pxx
index aaa71004ce..817fcd5805 100644
--- a/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWRevolvedFaceSolid();
+  Standard_HIDDEN RWStepShape_RWRevolvedFaceSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RevolvedFaceSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RevolvedFaceSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RevolvedFaceSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RevolvedFaceSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_RevolvedFaceSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_RevolvedFaceSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWRightAngularWedge.cxx b/src/RWStepShape/RWStepShape_RWRightAngularWedge.cxx
index 1547e3f209..d82b996a7b 100644
--- a/src/RWStepShape/RWStepShape_RWRightAngularWedge.cxx
+++ b/src/RWStepShape/RWStepShape_RWRightAngularWedge.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWRightAngularWedge.hxx>
+#include "RWStepShape_RWRightAngularWedge.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWRightAngularWedge.hxx b/src/RWStepShape/RWStepShape_RWRightAngularWedge.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWRightAngularWedge.hxx
rename to src/RWStepShape/RWStepShape_RWRightAngularWedge.pxx
index 356e696615..e421938bd5 100644
--- a/src/RWStepShape/RWStepShape_RWRightAngularWedge.hxx
+++ b/src/RWStepShape/RWStepShape_RWRightAngularWedge.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWRightAngularWedge();
+  Standard_HIDDEN RWStepShape_RWRightAngularWedge();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RightAngularWedge)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RightAngularWedge)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RightAngularWedge)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RightAngularWedge)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_RightAngularWedge)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_RightAngularWedge)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWRightCircularCone.cxx b/src/RWStepShape/RWStepShape_RWRightCircularCone.cxx
index bbfb9d79b9..a131186f6c 100644
--- a/src/RWStepShape/RWStepShape_RWRightCircularCone.cxx
+++ b/src/RWStepShape/RWStepShape_RWRightCircularCone.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWRightCircularCone.hxx>
+#include "RWStepShape_RWRightCircularCone.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis1Placement.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWRightCircularCone.hxx b/src/RWStepShape/RWStepShape_RWRightCircularCone.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWRightCircularCone.hxx
rename to src/RWStepShape/RWStepShape_RWRightCircularCone.pxx
index 13d79ab896..9106471d9e 100644
--- a/src/RWStepShape/RWStepShape_RWRightCircularCone.hxx
+++ b/src/RWStepShape/RWStepShape_RWRightCircularCone.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWRightCircularCone();
+  Standard_HIDDEN RWStepShape_RWRightCircularCone();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RightCircularCone)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RightCircularCone)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RightCircularCone)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RightCircularCone)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_RightCircularCone)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_RightCircularCone)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cxx b/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cxx
index 12e315ad00..4e4db1b462 100644
--- a/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cxx
+++ b/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWRightCircularCylinder.hxx>
+#include "RWStepShape_RWRightCircularCylinder.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis1Placement.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWRightCircularCylinder.hxx b/src/RWStepShape/RWStepShape_RWRightCircularCylinder.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWRightCircularCylinder.hxx
rename to src/RWStepShape/RWStepShape_RWRightCircularCylinder.pxx
index 6ab819a35b..31956baa5e 100644
--- a/src/RWStepShape/RWStepShape_RWRightCircularCylinder.hxx
+++ b/src/RWStepShape/RWStepShape_RWRightCircularCylinder.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWRightCircularCylinder();
+  Standard_HIDDEN RWStepShape_RWRightCircularCylinder();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RightCircularCylinder)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_RightCircularCylinder)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RightCircularCylinder)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_RightCircularCylinder)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_RightCircularCylinder)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_RightCircularCylinder)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSeamEdge.cxx b/src/RWStepShape/RWStepShape_RWSeamEdge.cxx
index 086dbc1c6d..5155f94427 100644
--- a/src/RWStepShape/RWStepShape_RWSeamEdge.cxx
+++ b/src/RWStepShape/RWStepShape_RWSeamEdge.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWSeamEdge.hxx>
+#include "RWStepShape_RWSeamEdge.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Pcurve.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSeamEdge.hxx b/src/RWStepShape/RWStepShape_RWSeamEdge.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWSeamEdge.hxx
rename to src/RWStepShape/RWStepShape_RWSeamEdge.pxx
index 1411cf9b0f..6a8656386c 100644
--- a/src/RWStepShape/RWStepShape_RWSeamEdge.hxx
+++ b/src/RWStepShape/RWStepShape_RWSeamEdge.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWSeamEdge();
+  Standard_HIDDEN RWStepShape_RWSeamEdge();
   
   //! Reads SeamEdge
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SeamEdge)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SeamEdge)& ent) const;
   
   //! Writes SeamEdge
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SeamEdge)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SeamEdge)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_SeamEdge)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_SeamEdge)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.cxx b/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.cxx
index e105e49063..49fab042fe 100644
--- a/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.cxx
@@ -17,7 +17,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWShapeDefinitionRepresentation.hxx>
+#include "RWStepShape_RWShapeDefinitionRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.hxx b/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.pxx
index 0e6b5e6d8f..c1f6451235 100644
--- a/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWShapeDefinitionRepresentation.pxx
@@ -38,16 +38,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWShapeDefinitionRepresentation();
+  Standard_HIDDEN RWStepShape_RWShapeDefinitionRepresentation();
   
   //! Reads ShapeDefinitionRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeDefinitionRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeDefinitionRepresentation)& ent) const;
   
   //! Writes ShapeDefinitionRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeDefinitionRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeDefinitionRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_ShapeDefinitionRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ShapeDefinitionRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx b/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx
index ae42046f4f..ee9fffd79e 100644
--- a/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWShapeDimensionRepresentation.hxx>
+#include "RWStepShape_RWShapeDimensionRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.hxx b/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.pxx
index eeaab72e9e..055c67b857 100644
--- a/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWShapeDimensionRepresentation();
+  Standard_HIDDEN RWStepShape_RWShapeDimensionRepresentation();
   
   //! Reads ShapeDimensionRepresentation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeDimensionRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeDimensionRepresentation)& ent) const;
   
   //! Writes ShapeDimensionRepresentation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeDimensionRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeDimensionRepresentation)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_ShapeDimensionRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ShapeDimensionRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWShapeRepresentation.cxx
index 496402c784..6993121d9f 100644
--- a/src/RWStepShape/RWStepShape_RWShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWShapeRepresentation.hxx>
+#include "RWStepShape_RWShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWShapeRepresentation.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWShapeRepresentation.pxx
index bd6e5760fa..3587ec4744 100644
--- a/src/RWStepShape/RWStepShape_RWShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx b/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx
index ee35cbc3fd..2eba55f42e 100644
--- a/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx
+++ b/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWShapeRepresentationWithParameters.hxx>
+#include "RWStepShape_RWShapeRepresentationWithParameters.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.hxx b/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.hxx
rename to src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.pxx
index 2478398335..960f427b7a 100644
--- a/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.hxx
+++ b/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWShapeRepresentationWithParameters();
+  Standard_HIDDEN RWStepShape_RWShapeRepresentationWithParameters();
   
   //! Reads ShapeRepresentationWithParameters
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeRepresentationWithParameters)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShapeRepresentationWithParameters)& ent) const;
   
   //! Writes ShapeRepresentationWithParameters
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeRepresentationWithParameters)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShapeRepresentationWithParameters)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_ShapeRepresentationWithParameters)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ShapeRepresentationWithParameters)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cxx b/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cxx
index 2857e203a5..ed8a86a6f0 100644
--- a/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cxx
+++ b/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWShellBasedSurfaceModel.hxx>
+#include "RWStepShape_RWShellBasedSurfaceModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_Shell.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.hxx b/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.hxx
rename to src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.pxx
index db25cf2ab7..fa2cdf3e27 100644
--- a/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.hxx
+++ b/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWShellBasedSurfaceModel();
+  Standard_HIDDEN RWStepShape_RWShellBasedSurfaceModel();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShellBasedSurfaceModel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ShellBasedSurfaceModel)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShellBasedSurfaceModel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ShellBasedSurfaceModel)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ShellBasedSurfaceModel)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ShellBasedSurfaceModel)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSolidModel.cxx b/src/RWStepShape/RWStepShape_RWSolidModel.cxx
index 31dede06ed..a6088aae6d 100644
--- a/src/RWStepShape/RWStepShape_RWSolidModel.cxx
+++ b/src/RWStepShape/RWStepShape_RWSolidModel.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepShape_RWSolidModel.hxx>
+#include "RWStepShape_RWSolidModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_SolidModel.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSolidModel.hxx b/src/RWStepShape/RWStepShape_RWSolidModel.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWSolidModel.hxx
rename to src/RWStepShape/RWStepShape_RWSolidModel.pxx
index ff7ef7c2e9..cda8e82e2b 100644
--- a/src/RWStepShape/RWStepShape_RWSolidModel.hxx
+++ b/src/RWStepShape/RWStepShape_RWSolidModel.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWSolidModel();
+  Standard_HIDDEN RWStepShape_RWSolidModel();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SolidModel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SolidModel)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SolidModel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SolidModel)& ent) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSolidReplica.cxx b/src/RWStepShape/RWStepShape_RWSolidReplica.cxx
index 922417f0b7..10d4f6abc6 100644
--- a/src/RWStepShape/RWStepShape_RWSolidReplica.cxx
+++ b/src/RWStepShape/RWStepShape_RWSolidReplica.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWSolidReplica.hxx>
+#include "RWStepShape_RWSolidReplica.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianTransformationOperator3d.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSolidReplica.hxx b/src/RWStepShape/RWStepShape_RWSolidReplica.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWSolidReplica.hxx
rename to src/RWStepShape/RWStepShape_RWSolidReplica.pxx
index 3a2dc3ca74..d05eb0d915 100644
--- a/src/RWStepShape/RWStepShape_RWSolidReplica.hxx
+++ b/src/RWStepShape/RWStepShape_RWSolidReplica.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWSolidReplica();
+  Standard_HIDDEN RWStepShape_RWSolidReplica();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SolidReplica)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SolidReplica)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SolidReplica)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SolidReplica)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_SolidReplica)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_SolidReplica)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSphere.cxx b/src/RWStepShape/RWStepShape_RWSphere.cxx
index a2b6ea9646..c65853851e 100644
--- a/src/RWStepShape/RWStepShape_RWSphere.cxx
+++ b/src/RWStepShape/RWStepShape_RWSphere.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWSphere.hxx>
+#include "RWStepShape_RWSphere.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Point.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSphere.hxx b/src/RWStepShape/RWStepShape_RWSphere.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWSphere.hxx
rename to src/RWStepShape/RWStepShape_RWSphere.pxx
index 38841c564f..6989f47b9d 100644
--- a/src/RWStepShape/RWStepShape_RWSphere.hxx
+++ b/src/RWStepShape/RWStepShape_RWSphere.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWSphere();
+  Standard_HIDDEN RWStepShape_RWSphere();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Sphere)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Sphere)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Sphere)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Sphere)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_Sphere)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Sphere)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSubedge.cxx b/src/RWStepShape/RWStepShape_RWSubedge.cxx
index 907734335f..fada71f85b 100644
--- a/src/RWStepShape/RWStepShape_RWSubedge.cxx
+++ b/src/RWStepShape/RWStepShape_RWSubedge.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWSubedge.hxx>
+#include "RWStepShape_RWSubedge.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_Subedge.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSubedge.hxx b/src/RWStepShape/RWStepShape_RWSubedge.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWSubedge.hxx
rename to src/RWStepShape/RWStepShape_RWSubedge.pxx
index 30f1cb62a2..327ef577df 100644
--- a/src/RWStepShape/RWStepShape_RWSubedge.hxx
+++ b/src/RWStepShape/RWStepShape_RWSubedge.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWSubedge();
+  Standard_HIDDEN RWStepShape_RWSubedge();
   
   //! Reads Subedge
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Subedge)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Subedge)& ent) const;
   
   //! Writes Subedge
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Subedge)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Subedge)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_Subedge)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Subedge)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSubface.cxx b/src/RWStepShape/RWStepShape_RWSubface.cxx
index a5ad373f9a..70ac7e39b9 100644
--- a/src/RWStepShape/RWStepShape_RWSubface.cxx
+++ b/src/RWStepShape/RWStepShape_RWSubface.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWSubface.hxx>
+#include "RWStepShape_RWSubface.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_FaceBound.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSubface.hxx b/src/RWStepShape/RWStepShape_RWSubface.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWSubface.hxx
rename to src/RWStepShape/RWStepShape_RWSubface.pxx
index 93c77e4c2b..4f9cc26082 100644
--- a/src/RWStepShape/RWStepShape_RWSubface.hxx
+++ b/src/RWStepShape/RWStepShape_RWSubface.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWSubface();
+  Standard_HIDDEN RWStepShape_RWSubface();
   
   //! Reads Subface
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Subface)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Subface)& ent) const;
   
   //! Writes Subface
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Subface)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Subface)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepShape_Subface)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Subface)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cxx b/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cxx
index 966dfb6dad..9d1d07b5be 100644
--- a/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWSweptAreaSolid.hxx>
+#include "RWStepShape_RWSweptAreaSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSweptAreaSolid.hxx b/src/RWStepShape/RWStepShape_RWSweptAreaSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWSweptAreaSolid.hxx
rename to src/RWStepShape/RWStepShape_RWSweptAreaSolid.pxx
index 5f01313bc7..f6e0dc8d67 100644
--- a/src/RWStepShape/RWStepShape_RWSweptAreaSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWSweptAreaSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWSweptAreaSolid();
+  Standard_HIDDEN RWStepShape_RWSweptAreaSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SweptAreaSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SweptAreaSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SweptAreaSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SweptAreaSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_SweptAreaSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_SweptAreaSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cxx b/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cxx
index 7ab7e25e3a..5226b95cf1 100644
--- a/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cxx
+++ b/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWSweptFaceSolid.hxx>
+#include "RWStepShape_RWSweptFaceSolid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_FaceSurface.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWSweptFaceSolid.hxx b/src/RWStepShape/RWStepShape_RWSweptFaceSolid.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWSweptFaceSolid.hxx
rename to src/RWStepShape/RWStepShape_RWSweptFaceSolid.pxx
index 86daf18b48..a10f8ac8ae 100644
--- a/src/RWStepShape/RWStepShape_RWSweptFaceSolid.hxx
+++ b/src/RWStepShape/RWStepShape_RWSweptFaceSolid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWSweptFaceSolid();
+  Standard_HIDDEN RWStepShape_RWSweptFaceSolid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SweptFaceSolid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_SweptFaceSolid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SweptFaceSolid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_SweptFaceSolid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_SweptFaceSolid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_SweptFaceSolid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWToleranceValue.cxx b/src/RWStepShape/RWStepShape_RWToleranceValue.cxx
index 5d0d0d9cd2..1049be0e3a 100644
--- a/src/RWStepShape/RWStepShape_RWToleranceValue.cxx
+++ b/src/RWStepShape/RWStepShape_RWToleranceValue.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWToleranceValue.hxx>
+#include "RWStepShape_RWToleranceValue.pxx"
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWToleranceValue.hxx b/src/RWStepShape/RWStepShape_RWToleranceValue.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWToleranceValue.hxx
rename to src/RWStepShape/RWStepShape_RWToleranceValue.pxx
index 888051b2b6..3cdeb4bfeb 100644
--- a/src/RWStepShape/RWStepShape_RWToleranceValue.hxx
+++ b/src/RWStepShape/RWStepShape_RWToleranceValue.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWToleranceValue();
+  Standard_HIDDEN RWStepShape_RWToleranceValue();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ToleranceValue)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ToleranceValue)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ToleranceValue)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ToleranceValue)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_ToleranceValue)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_ToleranceValue)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cxx b/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cxx
index 63a8698be4..8da7b4bc9b 100644
--- a/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cxx
+++ b/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepShape_RWTopologicalRepresentationItem.hxx>
+#include "RWStepShape_RWTopologicalRepresentationItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_TopologicalRepresentationItem.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.hxx b/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.hxx
rename to src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.pxx
index a8b3986540..89c4fed962 100644
--- a/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.hxx
+++ b/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWTopologicalRepresentationItem();
+  Standard_HIDDEN RWStepShape_RWTopologicalRepresentationItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_TopologicalRepresentationItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_TopologicalRepresentationItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_TopologicalRepresentationItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_TopologicalRepresentationItem)& ent) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWTorus.cxx b/src/RWStepShape/RWStepShape_RWTorus.cxx
index 70192469d3..b40a60827b 100644
--- a/src/RWStepShape/RWStepShape_RWTorus.cxx
+++ b/src/RWStepShape/RWStepShape_RWTorus.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWTorus.hxx>
+#include "RWStepShape_RWTorus.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis1Placement.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWTorus.hxx b/src/RWStepShape/RWStepShape_RWTorus.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWTorus.hxx
rename to src/RWStepShape/RWStepShape_RWTorus.pxx
index da4fc1ed08..d21f5d99c8 100644
--- a/src/RWStepShape/RWStepShape_RWTorus.hxx
+++ b/src/RWStepShape/RWStepShape_RWTorus.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWTorus();
+  Standard_HIDDEN RWStepShape_RWTorus();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Torus)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Torus)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Torus)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Torus)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_Torus)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_Torus)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cxx
index 5467d28bfd..00cc342248 100644
--- a/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWTransitionalShapeRepresentation.hxx>
+#include "RWStepShape_RWTransitionalShapeRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.hxx b/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.hxx
rename to src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.pxx
index b45d215a26..cf9e8e8b9e 100644
--- a/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.hxx
+++ b/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWTransitionalShapeRepresentation();
+  Standard_HIDDEN RWStepShape_RWTransitionalShapeRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_TransitionalShapeRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_TransitionalShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_TransitionalShapeRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_TransitionalShapeRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_TransitionalShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_TransitionalShapeRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWTypeQualifier.cxx b/src/RWStepShape/RWStepShape_RWTypeQualifier.cxx
index b1702f78bf..3df3c826f0 100644
--- a/src/RWStepShape/RWStepShape_RWTypeQualifier.cxx
+++ b/src/RWStepShape/RWStepShape_RWTypeQualifier.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepShape_RWTypeQualifier.hxx>
+#include "RWStepShape_RWTypeQualifier.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_TypeQualifier.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWTypeQualifier.hxx b/src/RWStepShape/RWStepShape_RWTypeQualifier.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWTypeQualifier.hxx
rename to src/RWStepShape/RWStepShape_RWTypeQualifier.pxx
index 5edb1ac931..6dd2a91200 100644
--- a/src/RWStepShape/RWStepShape_RWTypeQualifier.hxx
+++ b/src/RWStepShape/RWStepShape_RWTypeQualifier.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWTypeQualifier();
+  Standard_HIDDEN RWStepShape_RWTypeQualifier();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_TypeQualifier)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_TypeQualifier)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_TypeQualifier)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_TypeQualifier)& ent) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.cxx b/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.cxx
index 7f2dd78ba0..30514d9bd0 100644
--- a/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.cxx
+++ b/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepShape_RWValueFormatTypeQualifier.hxx>
+#include "RWStepShape_RWValueFormatTypeQualifier.pxx"
 
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.hxx b/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.hxx
rename to src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.pxx
index 37dbd183a9..0e5e3ae1a5 100644
--- a/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.hxx
+++ b/src/RWStepShape/RWStepShape_RWValueFormatTypeQualifier.pxx
@@ -36,13 +36,13 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepShape_RWValueFormatTypeQualifier();
+  Standard_HIDDEN RWStepShape_RWValueFormatTypeQualifier();
   
   //! Reads ValueFormatTypeQualifier
-  Standard_EXPORT   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ValueFormatTypeQualifier)& ent)  const;
+  Standard_HIDDEN   void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_ValueFormatTypeQualifier)& ent)  const;
   
   //! Writes ValueFormatTypeQualifier
-  Standard_EXPORT   void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ValueFormatTypeQualifier)& ent)  const;
+  Standard_HIDDEN   void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_ValueFormatTypeQualifier)& ent)  const;
   
 };
 #endif // _RWStepShape_RWValueFormatTypeQualifier_HeaderFile
diff --git a/src/RWStepShape/RWStepShape_RWVertex.cxx b/src/RWStepShape/RWStepShape_RWVertex.cxx
index b371a8eb4f..1fd829fed7 100644
--- a/src/RWStepShape/RWStepShape_RWVertex.cxx
+++ b/src/RWStepShape/RWStepShape_RWVertex.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepShape_RWVertex.hxx>
+#include "RWStepShape_RWVertex.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_Vertex.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWVertex.hxx b/src/RWStepShape/RWStepShape_RWVertex.pxx
similarity index 89%
rename from src/RWStepShape/RWStepShape_RWVertex.hxx
rename to src/RWStepShape/RWStepShape_RWVertex.pxx
index e5fdf404d8..4c0a73dc10 100644
--- a/src/RWStepShape/RWStepShape_RWVertex.hxx
+++ b/src/RWStepShape/RWStepShape_RWVertex.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWVertex();
+  Standard_HIDDEN RWStepShape_RWVertex();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Vertex)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_Vertex)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Vertex)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_Vertex)& ent) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWVertexLoop.cxx b/src/RWStepShape/RWStepShape_RWVertexLoop.cxx
index baf2d4df39..9651df0220 100644
--- a/src/RWStepShape/RWStepShape_RWVertexLoop.cxx
+++ b/src/RWStepShape/RWStepShape_RWVertexLoop.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWVertexLoop.hxx>
+#include "RWStepShape_RWVertexLoop.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_Vertex.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWVertexLoop.hxx b/src/RWStepShape/RWStepShape_RWVertexLoop.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWVertexLoop.hxx
rename to src/RWStepShape/RWStepShape_RWVertexLoop.pxx
index 9494afcaeb..f63f7987f0 100644
--- a/src/RWStepShape/RWStepShape_RWVertexLoop.hxx
+++ b/src/RWStepShape/RWStepShape_RWVertexLoop.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWVertexLoop();
+  Standard_HIDDEN RWStepShape_RWVertexLoop();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_VertexLoop)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_VertexLoop)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_VertexLoop)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_VertexLoop)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_VertexLoop)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_VertexLoop)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepShape/RWStepShape_RWVertexPoint.cxx b/src/RWStepShape/RWStepShape_RWVertexPoint.cxx
index d3371ec5e0..719b5048d2 100644
--- a/src/RWStepShape/RWStepShape_RWVertexPoint.cxx
+++ b/src/RWStepShape/RWStepShape_RWVertexPoint.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepShape_RWVertexPoint.hxx>
+#include "RWStepShape_RWVertexPoint.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Point.hxx>
diff --git a/src/RWStepShape/RWStepShape_RWVertexPoint.hxx b/src/RWStepShape/RWStepShape_RWVertexPoint.pxx
similarity index 86%
rename from src/RWStepShape/RWStepShape_RWVertexPoint.hxx
rename to src/RWStepShape/RWStepShape_RWVertexPoint.pxx
index b4e9240bce..3f5325ab1c 100644
--- a/src/RWStepShape/RWStepShape_RWVertexPoint.hxx
+++ b/src/RWStepShape/RWStepShape_RWVertexPoint.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepShape_RWVertexPoint();
+  Standard_HIDDEN RWStepShape_RWVertexPoint();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_VertexPoint)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepShape_VertexPoint)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_VertexPoint)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepShape_VertexPoint)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepShape_VertexPoint)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepShape_VertexPoint)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/FILES b/src/RWStepVisual/FILES
index e80c78bcdf..4dec6de163 100644
--- a/src/RWStepVisual/FILES
+++ b/src/RWStepVisual/FILES
@@ -1,194 +1,194 @@
 RWStepVisual_RWAnnotationCurveOccurrence.cxx
-RWStepVisual_RWAnnotationCurveOccurrence.hxx
+RWStepVisual_RWAnnotationCurveOccurrence.pxx
 RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx
-RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx
+RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.pxx
 RWStepVisual_RWAnnotationFillArea.cxx
-RWStepVisual_RWAnnotationFillArea.hxx
+RWStepVisual_RWAnnotationFillArea.pxx
 RWStepVisual_RWAnnotationFillAreaOccurrence.cxx
-RWStepVisual_RWAnnotationFillAreaOccurrence.hxx
+RWStepVisual_RWAnnotationFillAreaOccurrence.pxx
 RWStepVisual_RWAnnotationOccurrence.cxx
-RWStepVisual_RWAnnotationOccurrence.hxx
+RWStepVisual_RWAnnotationOccurrence.pxx
 RWStepVisual_RWAnnotationPlane.cxx
-RWStepVisual_RWAnnotationPlane.hxx
+RWStepVisual_RWAnnotationPlane.pxx
 RWStepVisual_RWAreaInSet.cxx
-RWStepVisual_RWAreaInSet.hxx
+RWStepVisual_RWAreaInSet.pxx
 RWStepVisual_RWBackgroundColour.cxx
-RWStepVisual_RWBackgroundColour.hxx
+RWStepVisual_RWBackgroundColour.pxx
 RWStepVisual_RWCameraImage.cxx
-RWStepVisual_RWCameraImage.hxx
+RWStepVisual_RWCameraImage.pxx
 RWStepVisual_RWCameraModel.cxx
-RWStepVisual_RWCameraModel.hxx
+RWStepVisual_RWCameraModel.pxx
 RWStepVisual_RWCameraModelD2.cxx
-RWStepVisual_RWCameraModelD2.hxx
+RWStepVisual_RWCameraModelD2.pxx
 RWStepVisual_RWCameraModelD3.cxx
-RWStepVisual_RWCameraModelD3.hxx
+RWStepVisual_RWCameraModelD3.pxx
 RWStepVisual_RWCameraModelD3MultiClipping.cxx
-RWStepVisual_RWCameraModelD3MultiClipping.hxx
+RWStepVisual_RWCameraModelD3MultiClipping.pxx
 RWStepVisual_RWCameraModelD3MultiClippingIntersection.cxx
-RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx
+RWStepVisual_RWCameraModelD3MultiClippingIntersection.pxx
 RWStepVisual_RWCameraModelD3MultiClippingUnion.cxx
-RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx
+RWStepVisual_RWCameraModelD3MultiClippingUnion.pxx
 RWStepVisual_RWCameraUsage.cxx
-RWStepVisual_RWCameraUsage.hxx
+RWStepVisual_RWCameraUsage.pxx
 RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx
-RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx
+RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.pxx
 RWStepVisual_RWColour.cxx
-RWStepVisual_RWColour.hxx
+RWStepVisual_RWColour.pxx
 RWStepVisual_RWColourRgb.cxx
-RWStepVisual_RWColourRgb.hxx
+RWStepVisual_RWColourRgb.pxx
 RWStepVisual_RWColourSpecification.cxx
-RWStepVisual_RWColourSpecification.hxx
+RWStepVisual_RWColourSpecification.pxx
 RWStepVisual_RWCompositeText.cxx
-RWStepVisual_RWCompositeText.hxx
+RWStepVisual_RWCompositeText.pxx
 RWStepVisual_RWCompositeTextWithExtent.cxx
-RWStepVisual_RWCompositeTextWithExtent.hxx
+RWStepVisual_RWCompositeTextWithExtent.pxx
 RWStepVisual_RWContextDependentInvisibility.cxx
-RWStepVisual_RWContextDependentInvisibility.hxx
+RWStepVisual_RWContextDependentInvisibility.pxx
 RWStepVisual_RWContextDependentOverRidingStyledItem.cxx
-RWStepVisual_RWContextDependentOverRidingStyledItem.hxx
+RWStepVisual_RWContextDependentOverRidingStyledItem.pxx
 RWStepVisual_RWCurveStyle.cxx
-RWStepVisual_RWCurveStyle.hxx
+RWStepVisual_RWCurveStyle.pxx
 RWStepVisual_RWCurveStyleFont.cxx
-RWStepVisual_RWCurveStyleFont.hxx
+RWStepVisual_RWCurveStyleFont.pxx
 RWStepVisual_RWCurveStyleFontPattern.cxx
-RWStepVisual_RWCurveStyleFontPattern.hxx
+RWStepVisual_RWCurveStyleFontPattern.pxx
 RWStepVisual_RWDraughtingCallout.cxx
-RWStepVisual_RWDraughtingCallout.hxx
+RWStepVisual_RWDraughtingCallout.pxx
 RWStepVisual_RWDraughtingModel.cxx
-RWStepVisual_RWDraughtingModel.hxx
+RWStepVisual_RWDraughtingModel.pxx
 RWStepVisual_RWDraughtingPreDefinedColour.cxx
-RWStepVisual_RWDraughtingPreDefinedColour.hxx
+RWStepVisual_RWDraughtingPreDefinedColour.pxx
 RWStepVisual_RWDraughtingPreDefinedCurveFont.cxx
-RWStepVisual_RWDraughtingPreDefinedCurveFont.hxx
+RWStepVisual_RWDraughtingPreDefinedCurveFont.pxx
 RWStepVisual_RWExternallyDefinedCurveFont.cxx
-RWStepVisual_RWExternallyDefinedCurveFont.hxx
+RWStepVisual_RWExternallyDefinedCurveFont.pxx
 RWStepVisual_RWFillAreaStyle.cxx
-RWStepVisual_RWFillAreaStyle.hxx
+RWStepVisual_RWFillAreaStyle.pxx
 RWStepVisual_RWFillAreaStyleColour.cxx
-RWStepVisual_RWFillAreaStyleColour.hxx
+RWStepVisual_RWFillAreaStyleColour.pxx
 RWStepVisual_RWInvisibility.cxx
-RWStepVisual_RWInvisibility.hxx
+RWStepVisual_RWInvisibility.pxx
 RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cxx
-RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx
+RWStepVisual_RWMechanicalDesignGeometricPresentationArea.pxx
 RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cxx
-RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx
+RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.pxx
 RWStepVisual_RWOverRidingStyledItem.cxx
-RWStepVisual_RWOverRidingStyledItem.hxx
+RWStepVisual_RWOverRidingStyledItem.pxx
 RWStepVisual_RWPlanarBox.cxx
-RWStepVisual_RWPlanarBox.hxx
+RWStepVisual_RWPlanarBox.pxx
 RWStepVisual_RWPlanarExtent.cxx
-RWStepVisual_RWPlanarExtent.hxx
+RWStepVisual_RWPlanarExtent.pxx
 RWStepVisual_RWPointStyle.cxx
-RWStepVisual_RWPointStyle.hxx
+RWStepVisual_RWPointStyle.pxx
 RWStepVisual_RWPreDefinedColour.cxx
-RWStepVisual_RWPreDefinedColour.hxx
+RWStepVisual_RWPreDefinedColour.pxx
 RWStepVisual_RWPreDefinedCurveFont.cxx
-RWStepVisual_RWPreDefinedCurveFont.hxx
+RWStepVisual_RWPreDefinedCurveFont.pxx
 RWStepVisual_RWPreDefinedItem.cxx
-RWStepVisual_RWPreDefinedItem.hxx
+RWStepVisual_RWPreDefinedItem.pxx
 RWStepVisual_RWPresentationArea.cxx
-RWStepVisual_RWPresentationArea.hxx
+RWStepVisual_RWPresentationArea.pxx
 RWStepVisual_RWPresentationLayerAssignment.cxx
-RWStepVisual_RWPresentationLayerAssignment.hxx
+RWStepVisual_RWPresentationLayerAssignment.pxx
 RWStepVisual_RWPresentationLayerUsage.cxx
-RWStepVisual_RWPresentationLayerUsage.hxx
+RWStepVisual_RWPresentationLayerUsage.pxx
 RWStepVisual_RWPresentationRepresentation.cxx
-RWStepVisual_RWPresentationRepresentation.hxx
+RWStepVisual_RWPresentationRepresentation.pxx
 RWStepVisual_RWPresentationSet.cxx
-RWStepVisual_RWPresentationSet.hxx
+RWStepVisual_RWPresentationSet.pxx
 RWStepVisual_RWPresentationSize.cxx
-RWStepVisual_RWPresentationSize.hxx
+RWStepVisual_RWPresentationSize.pxx
 RWStepVisual_RWPresentationStyleAssignment.cxx
-RWStepVisual_RWPresentationStyleAssignment.hxx
+RWStepVisual_RWPresentationStyleAssignment.pxx
 RWStepVisual_RWPresentationStyleByContext.cxx
-RWStepVisual_RWPresentationStyleByContext.hxx
+RWStepVisual_RWPresentationStyleByContext.pxx
 RWStepVisual_RWPresentationView.cxx
-RWStepVisual_RWPresentationView.hxx
+RWStepVisual_RWPresentationView.pxx
 RWStepVisual_RWPresentedItemRepresentation.cxx
-RWStepVisual_RWPresentedItemRepresentation.hxx
+RWStepVisual_RWPresentedItemRepresentation.pxx
 RWStepVisual_RWRepositionedTessellatedGeometricSet.cxx
-RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx
+RWStepVisual_RWRepositionedTessellatedGeometricSet.pxx
 RWStepVisual_RWRepositionedTessellatedItem.cxx
-RWStepVisual_RWRepositionedTessellatedItem.hxx
+RWStepVisual_RWRepositionedTessellatedItem.pxx
 RWStepVisual_RWStyledItem.cxx
-RWStepVisual_RWStyledItem.hxx
+RWStepVisual_RWStyledItem.pxx
 RWStepVisual_RWSurfaceSideStyle.cxx
-RWStepVisual_RWSurfaceSideStyle.hxx
+RWStepVisual_RWSurfaceSideStyle.pxx
 RWStepVisual_RWSurfaceStyleBoundary.cxx
-RWStepVisual_RWSurfaceStyleBoundary.hxx
+RWStepVisual_RWSurfaceStyleBoundary.pxx
 RWStepVisual_RWSurfaceStyleControlGrid.cxx
-RWStepVisual_RWSurfaceStyleControlGrid.hxx
+RWStepVisual_RWSurfaceStyleControlGrid.pxx
 RWStepVisual_RWSurfaceStyleFillArea.cxx
-RWStepVisual_RWSurfaceStyleFillArea.hxx
+RWStepVisual_RWSurfaceStyleFillArea.pxx
 RWStepVisual_RWSurfaceStyleParameterLine.cxx
-RWStepVisual_RWSurfaceStyleParameterLine.hxx
+RWStepVisual_RWSurfaceStyleParameterLine.pxx
 RWStepVisual_RWSurfaceStyleReflectanceAmbient.cxx
-RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx
+RWStepVisual_RWSurfaceStyleReflectanceAmbient.pxx
 RWStepVisual_RWSurfaceStyleRendering.cxx
-RWStepVisual_RWSurfaceStyleRendering.hxx
+RWStepVisual_RWSurfaceStyleRendering.pxx
 RWStepVisual_RWSurfaceStyleRenderingWithProperties.cxx
-RWStepVisual_RWSurfaceStyleRenderingWithProperties.hxx
+RWStepVisual_RWSurfaceStyleRenderingWithProperties.pxx
 RWStepVisual_RWSurfaceStyleSegmentationCurve.cxx
-RWStepVisual_RWSurfaceStyleSegmentationCurve.hxx
+RWStepVisual_RWSurfaceStyleSegmentationCurve.pxx
 RWStepVisual_RWSurfaceStyleSilhouette.cxx
-RWStepVisual_RWSurfaceStyleSilhouette.hxx
+RWStepVisual_RWSurfaceStyleSilhouette.pxx
 RWStepVisual_RWSurfaceStyleTransparent.cxx
-RWStepVisual_RWSurfaceStyleTransparent.hxx
+RWStepVisual_RWSurfaceStyleTransparent.pxx
 RWStepVisual_RWSurfaceStyleUsage.cxx
-RWStepVisual_RWSurfaceStyleUsage.hxx
+RWStepVisual_RWSurfaceStyleUsage.pxx
 RWStepVisual_RWTemplate.cxx
-RWStepVisual_RWTemplate.hxx
+RWStepVisual_RWTemplate.pxx
 RWStepVisual_RWTemplateInstance.cxx
-RWStepVisual_RWTemplateInstance.hxx
+RWStepVisual_RWTemplateInstance.pxx
 RWStepVisual_RWTextLiteral.cxx
-RWStepVisual_RWTextLiteral.hxx
+RWStepVisual_RWTextLiteral.pxx
 RWStepVisual_RWTextStyle.cxx
-RWStepVisual_RWTextStyle.hxx
+RWStepVisual_RWTextStyle.pxx
 RWStepVisual_RWTextStyleForDefinedFont.cxx
-RWStepVisual_RWTextStyleForDefinedFont.hxx
+RWStepVisual_RWTextStyleForDefinedFont.pxx
 RWStepVisual_RWTextStyleWithBoxCharacteristics.cxx
-RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx
+RWStepVisual_RWTextStyleWithBoxCharacteristics.pxx
 RWStepVisual_RWViewVolume.cxx
-RWStepVisual_RWViewVolume.hxx
-RWStepVisual_RWTessellatedItem.hxx
+RWStepVisual_RWViewVolume.pxx
+RWStepVisual_RWTessellatedItem.pxx
 RWStepVisual_RWTessellatedItem.cxx
-RWStepVisual_RWTessellatedAnnotationOccurrence.hxx
+RWStepVisual_RWTessellatedAnnotationOccurrence.pxx
 RWStepVisual_RWTessellatedAnnotationOccurrence.cxx
-RWStepVisual_RWTessellatedGeometricSet.hxx
+RWStepVisual_RWTessellatedGeometricSet.pxx
 RWStepVisual_RWTessellatedGeometricSet.cxx
-RWStepVisual_RWCoordinatesList.hxx
+RWStepVisual_RWCoordinatesList.pxx
 RWStepVisual_RWCoordinatesList.cxx
-RWStepVisual_RWTessellatedCurveSet.hxx
+RWStepVisual_RWTessellatedCurveSet.pxx
 RWStepVisual_RWTessellatedCurveSet.cxx
 RWStepVisual_RWComplexTriangulatedFace.cxx
-RWStepVisual_RWComplexTriangulatedFace.hxx
+RWStepVisual_RWComplexTriangulatedFace.pxx
 RWStepVisual_RWComplexTriangulatedSurfaceSet.cxx
-RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx
+RWStepVisual_RWComplexTriangulatedSurfaceSet.pxx
 RWStepVisual_RWCubicBezierTessellatedEdge.cxx
-RWStepVisual_RWCubicBezierTessellatedEdge.hxx
+RWStepVisual_RWCubicBezierTessellatedEdge.pxx
 RWStepVisual_RWCubicBezierTriangulatedFace.cxx
-RWStepVisual_RWCubicBezierTriangulatedFace.hxx
+RWStepVisual_RWCubicBezierTriangulatedFace.pxx
 RWStepVisual_RWTessellatedConnectingEdge.cxx
-RWStepVisual_RWTessellatedConnectingEdge.hxx
+RWStepVisual_RWTessellatedConnectingEdge.pxx
 RWStepVisual_RWTessellatedEdge.cxx
-RWStepVisual_RWTessellatedEdge.hxx
+RWStepVisual_RWTessellatedEdge.pxx
 RWStepVisual_RWTessellatedPointSet.cxx
-RWStepVisual_RWTessellatedPointSet.hxx
+RWStepVisual_RWTessellatedPointSet.pxx
 RWStepVisual_RWTessellatedShapeRepresentation.cxx
-RWStepVisual_RWTessellatedShapeRepresentation.hxx
+RWStepVisual_RWTessellatedShapeRepresentation.pxx
 RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.cxx
-RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx
+RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.pxx
 RWStepVisual_RWTessellatedShell.cxx
-RWStepVisual_RWTessellatedShell.hxx
+RWStepVisual_RWTessellatedShell.pxx
 RWStepVisual_RWTessellatedSolid.cxx
-RWStepVisual_RWTessellatedSolid.hxx
+RWStepVisual_RWTessellatedSolid.pxx
 RWStepVisual_RWTessellatedStructuredItem.cxx
-RWStepVisual_RWTessellatedStructuredItem.hxx
+RWStepVisual_RWTessellatedStructuredItem.pxx
 RWStepVisual_RWTessellatedVertex.cxx
-RWStepVisual_RWTessellatedVertex.hxx
+RWStepVisual_RWTessellatedVertex.pxx
 RWStepVisual_RWTessellatedWire.cxx
-RWStepVisual_RWTessellatedWire.hxx
+RWStepVisual_RWTessellatedWire.pxx
 RWStepVisual_RWTriangulatedFace.cxx
-RWStepVisual_RWTriangulatedFace.hxx
+RWStepVisual_RWTriangulatedFace.pxx
 RWStepVisual_RWTriangulatedSurfaceSet.cxx
-RWStepVisual_RWTriangulatedSurfaceSet.hxx
+RWStepVisual_RWTriangulatedSurfaceSet.pxx
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.cxx
index b61aa4bcce..1cc96d8ed4 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrence.hxx>
+#include "RWStepVisual_RWAnnotationCurveOccurrence.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_AnnotationCurveOccurrence.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.hxx
rename to src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.pxx
index d246c7770a..5b33e975f2 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrence.pxx
@@ -34,12 +34,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWAnnotationCurveOccurrence();
+  Standard_HIDDEN RWStepVisual_RWAnnotationCurveOccurrence();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationCurveOccurrence)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationCurveOccurrence)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationCurveOccurrence)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationCurveOccurrence)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_AnnotationCurveOccurrence)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_AnnotationCurveOccurrence)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWAnnotationCurveOccurrence_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx
index 4babfa7e98..03f959c308 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx>
+#include "RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.pxx
index 581d89e6e6..d3c3c347fc 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.pxx
@@ -34,12 +34,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem();
+  Standard_HIDDEN RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_AnnotationCurveOccurrenceAndGeomReprItem)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.cxx
index fb85f8cf5a..27d1a0cb0f 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWAnnotationFillArea.hxx>
+#include "RWStepVisual_RWAnnotationFillArea.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_AnnotationFillArea.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.pxx
similarity index 85%
rename from src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.hxx
rename to src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.pxx
index d360bea4a4..673c09a256 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationFillArea.pxx
@@ -36,13 +36,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWAnnotationFillArea();
+  Standard_HIDDEN RWStepVisual_RWAnnotationFillArea();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationFillArea)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationFillArea)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationFillArea)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationFillArea)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_AnnotationFillArea)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_AnnotationFillArea)& ent, Interface_EntityIterator& iter) const;
 
 };
 
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.cxx
index ea27e61076..874602a5e6 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWAnnotationFillAreaOccurrence.hxx>
+#include "RWStepVisual_RWAnnotationFillAreaOccurrence.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.hxx
rename to src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.pxx
index 50c20df195..2e7b60fa0a 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationFillAreaOccurrence.pxx
@@ -34,12 +34,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWAnnotationFillAreaOccurrence();
+  Standard_HIDDEN RWStepVisual_RWAnnotationFillAreaOccurrence();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationFillAreaOccurrence)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationFillAreaOccurrence)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationFillAreaOccurrence)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationFillAreaOccurrence)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_AnnotationFillAreaOccurrence)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_AnnotationFillAreaOccurrence)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWAnnotationFillAreaOccurrence_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.cxx
index 43836de8b3..164a4c80ab 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWAnnotationOccurrence.hxx>
+#include "RWStepVisual_RWAnnotationOccurrence.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_AnnotationOccurrence.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.pxx
similarity index 85%
rename from src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.hxx
rename to src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.pxx
index ca452c52a7..019e8cb799 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationOccurrence.pxx
@@ -34,12 +34,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWAnnotationOccurrence();
+  Standard_HIDDEN RWStepVisual_RWAnnotationOccurrence();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationOccurrence)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationOccurrence)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationOccurrence)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationOccurrence)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_AnnotationOccurrence)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_AnnotationOccurrence)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWAnnotationOccurrence_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.cxx
index f1556bbf83..f1678991e2 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWAnnotationPlane.hxx>
+#include "RWStepVisual_RWAnnotationPlane.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_AnnotationPlane.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.pxx
similarity index 85%
rename from src/RWStepVisual/RWStepVisual_RWAnnotationPlane.hxx
rename to src/RWStepVisual/RWStepVisual_RWAnnotationPlane.pxx
index 224e375866..90f97443f0 100644
--- a/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationPlane.pxx
@@ -34,12 +34,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWAnnotationPlane();
+  Standard_HIDDEN RWStepVisual_RWAnnotationPlane();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationPlane)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationPlane)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationPlane)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationPlane)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_AnnotationPlane)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_AnnotationPlane)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWAnnotationPlane_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWAreaInSet.cxx b/src/RWStepVisual/RWStepVisual_RWAreaInSet.cxx
index a237c6628b..9771035572 100644
--- a/src/RWStepVisual/RWStepVisual_RWAreaInSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWAreaInSet.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWAreaInSet.hxx>
+#include "RWStepVisual_RWAreaInSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_AreaInSet.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWAreaInSet.hxx b/src/RWStepVisual/RWStepVisual_RWAreaInSet.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWAreaInSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWAreaInSet.pxx
index fa7550360a..1069763f4d 100644
--- a/src/RWStepVisual/RWStepVisual_RWAreaInSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWAreaInSet.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWAreaInSet();
+  Standard_HIDDEN RWStepVisual_RWAreaInSet();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AreaInSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AreaInSet)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AreaInSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AreaInSet)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_AreaInSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_AreaInSet)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cxx b/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cxx
index 72f6eecc4b..9691873a58 100644
--- a/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWBackgroundColour.hxx>
+#include "RWStepVisual_RWBackgroundColour.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_BackgroundColour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWBackgroundColour.hxx b/src/RWStepVisual/RWStepVisual_RWBackgroundColour.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWBackgroundColour.hxx
rename to src/RWStepVisual/RWStepVisual_RWBackgroundColour.pxx
index 8db1285150..d8200bb8c4 100644
--- a/src/RWStepVisual/RWStepVisual_RWBackgroundColour.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWBackgroundColour.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWBackgroundColour();
+  Standard_HIDDEN RWStepVisual_RWBackgroundColour();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_BackgroundColour)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_BackgroundColour)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_BackgroundColour)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_BackgroundColour)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_BackgroundColour)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_BackgroundColour)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraImage.cxx b/src/RWStepVisual/RWStepVisual_RWCameraImage.cxx
index 6b8cc1faef..aef3f538d7 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraImage.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraImage.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCameraImage.hxx>
+#include "RWStepVisual_RWCameraImage.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationMap.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraImage.hxx b/src/RWStepVisual/RWStepVisual_RWCameraImage.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCameraImage.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraImage.pxx
index 21329cb99d..67261bbe36 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraImage.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraImage.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCameraImage();
+  Standard_HIDDEN RWStepVisual_RWCameraImage();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraImage)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraImage)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraImage)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraImage)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CameraImage)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CameraImage)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModel.cxx b/src/RWStepVisual/RWStepVisual_RWCameraModel.cxx
index 79e0ecc992..9ae538b131 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModel.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModel.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWCameraModel.hxx>
+#include "RWStepVisual_RWCameraModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CameraModel.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModel.hxx b/src/RWStepVisual/RWStepVisual_RWCameraModel.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWCameraModel.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraModel.pxx
index f0bbaca838..88545eb401 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModel.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModel.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCameraModel();
+  Standard_HIDDEN RWStepVisual_RWCameraModel();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraModel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraModel)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModel)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cxx
index a60a16efd9..40b644873f 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCameraModelD2.hxx>
+#include "RWStepVisual_RWCameraModelD2.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CameraModelD2.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD2.hxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD2.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCameraModelD2.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraModelD2.pxx
index 94b65a2d80..9990e6eaac 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD2.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD2.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCameraModelD2();
+  Standard_HIDDEN RWStepVisual_RWCameraModelD2();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraModelD2)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraModelD2)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD2)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD2)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CameraModelD2)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CameraModelD2)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cxx
index 0c4b27eaf8..7df04e88bb 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCameraModelD3.hxx>
+#include "RWStepVisual_RWCameraModelD3.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3.hxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCameraModelD3.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraModelD3.pxx
index 5e4332cc36..57d2ebf463 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCameraModelD3();
+  Standard_HIDDEN RWStepVisual_RWCameraModelD3();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraModelD3)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraModelD3)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CameraModelD3)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CameraModelD3)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.cxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.cxx
index 697936572a..69e59233f4 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClipping.hxx>
+#include "RWStepVisual_RWCameraModelD3MultiClipping.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.hxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.pxx
index 725d83089b..0d6b21a522 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClipping.pxx
@@ -34,15 +34,15 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWCameraModelD3MultiClipping();
+  Standard_HIDDEN RWStepVisual_RWCameraModelD3MultiClipping();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data,
                                  const Standard_Integer num,
                                  Handle(Interface_Check)& ach,
                                  const Handle(StepVisual_CameraModelD3MultiClipping)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3MultiClipping)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3MultiClipping)& ent) const;
   
-  Standard_EXPORT void Share(const Handle(StepVisual_CameraModelD3MultiClipping)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepVisual_CameraModelD3MultiClipping)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWCameraModelD3MultiClipping_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.cxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.cxx
index 75cb3fe307..753244cfe3 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx>
+#include "RWStepVisual_RWCameraModelD3MultiClippingIntersection.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CameraModelD3MultiClippingIntersection.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.pxx
index bc35496763..06d66e03a5 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingIntersection.pxx
@@ -34,15 +34,15 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWCameraModelD3MultiClippingIntersection();
+  Standard_HIDDEN RWStepVisual_RWCameraModelD3MultiClippingIntersection();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data,
                                  const Standard_Integer num,
                                  Handle(Interface_Check)& ach,
                                  const Handle(StepVisual_CameraModelD3MultiClippingIntersection)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3MultiClippingIntersection)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3MultiClippingIntersection)& ent) const;
   
-  Standard_EXPORT void Share(const Handle(StepVisual_CameraModelD3MultiClippingIntersection)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepVisual_CameraModelD3MultiClippingIntersection)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWCameraModelD3MultiClippingIntersection_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.cxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.cxx
index c6e41e2eab..e8d802b1f0 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx>
+#include "RWStepVisual_RWCameraModelD3MultiClippingUnion.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CameraModelD3MultiClippingUnion.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.pxx
index d62fc19887..80ad375cb5 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3MultiClippingUnion.pxx
@@ -34,15 +34,15 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWCameraModelD3MultiClippingUnion();
+  Standard_HIDDEN RWStepVisual_RWCameraModelD3MultiClippingUnion();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data,
                                  const Standard_Integer num,
                                  Handle(Interface_Check)& ach,
                                  const Handle(StepVisual_CameraModelD3MultiClippingUnion)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3MultiClippingUnion)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraModelD3MultiClippingUnion)& ent) const;
   
-  Standard_EXPORT void Share(const Handle(StepVisual_CameraModelD3MultiClippingUnion)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepVisual_CameraModelD3MultiClippingUnion)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWCameraModelD3MultiClippingUnion_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraUsage.cxx b/src/RWStepVisual/RWStepVisual_RWCameraUsage.cxx
index 18d3baa66e..e646e906e0 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraUsage.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraUsage.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCameraUsage.hxx>
+#include "RWStepVisual_RWCameraUsage.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraUsage.hxx b/src/RWStepVisual/RWStepVisual_RWCameraUsage.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCameraUsage.hxx
rename to src/RWStepVisual/RWStepVisual_RWCameraUsage.pxx
index a16ae33a1f..132d42d025 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraUsage.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCameraUsage.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCameraUsage();
+  Standard_HIDDEN RWStepVisual_RWCameraUsage();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraUsage)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CameraUsage)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraUsage)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CameraUsage)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CameraUsage)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CameraUsage)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx
index c0b99640be..4ff101e4eb 100644
--- a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx>
+#include "RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.pxx
similarity index 88%
rename from src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx
rename to src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.pxx
index 8b654d88df..8cc69fdcf4 100644
--- a/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel.pxx
@@ -36,16 +36,16 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-    Standard_EXPORT RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel();
+    Standard_HIDDEN RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel();
   
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& data,
                                 const Standard_Integer num, Handle(Interface_Check)& ach,
                                 const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent) const;
   
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& SW,
                                  const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent) const;
   
-  Standard_EXPORT void Share(const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent,
+  Standard_HIDDEN void Share(const Handle(StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel)& ent,
                              Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtingModel_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWColour.cxx b/src/RWStepVisual/RWStepVisual_RWColour.cxx
index 4eec0a4858..fba60b0aea 100644
--- a/src/RWStepVisual/RWStepVisual_RWColour.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWColour.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWColour.hxx>
+#include "RWStepVisual_RWColour.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_Colour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWColour.hxx b/src/RWStepVisual/RWStepVisual_RWColour.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWColour.hxx
rename to src/RWStepVisual/RWStepVisual_RWColour.pxx
index 2c667b3d16..6af7785565 100644
--- a/src/RWStepVisual/RWStepVisual_RWColour.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWColour.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWColour();
+  Standard_HIDDEN RWStepVisual_RWColour();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_Colour)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_Colour)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_Colour)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_Colour)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWColourRgb.cxx b/src/RWStepVisual/RWStepVisual_RWColourRgb.cxx
index 3e29593f93..786611eb6c 100644
--- a/src/RWStepVisual/RWStepVisual_RWColourRgb.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWColourRgb.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWColourRgb.hxx>
+#include "RWStepVisual_RWColourRgb.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_ColourRgb.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWColourRgb.hxx b/src/RWStepVisual/RWStepVisual_RWColourRgb.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWColourRgb.hxx
rename to src/RWStepVisual/RWStepVisual_RWColourRgb.pxx
index e996385dbc..ba86477e3c 100644
--- a/src/RWStepVisual/RWStepVisual_RWColourRgb.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWColourRgb.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWColourRgb();
+  Standard_HIDDEN RWStepVisual_RWColourRgb();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ColourRgb)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ColourRgb)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ColourRgb)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ColourRgb)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWColourSpecification.cxx b/src/RWStepVisual/RWStepVisual_RWColourSpecification.cxx
index f735d31248..d11ceda00c 100644
--- a/src/RWStepVisual/RWStepVisual_RWColourSpecification.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWColourSpecification.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWColourSpecification.hxx>
+#include "RWStepVisual_RWColourSpecification.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_ColourSpecification.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWColourSpecification.hxx b/src/RWStepVisual/RWStepVisual_RWColourSpecification.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWColourSpecification.hxx
rename to src/RWStepVisual/RWStepVisual_RWColourSpecification.pxx
index 3cf508e640..0b58d55b4a 100644
--- a/src/RWStepVisual/RWStepVisual_RWColourSpecification.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWColourSpecification.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWColourSpecification();
+  Standard_HIDDEN RWStepVisual_RWColourSpecification();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ColourSpecification)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ColourSpecification)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ColourSpecification)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ColourSpecification)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.cxx b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.cxx
index 7ae9ded12a..778b8de4e7 100644
--- a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWComplexTriangulatedFace.hxx>
+#include "RWStepVisual_RWComplexTriangulatedFace.pxx"
 #include <StepVisual_ComplexTriangulatedFace.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.hxx b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.hxx
rename to src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.pxx
index d87a02ccb9..418ed1677c 100644
--- a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWComplexTriangulatedFace();
+  Standard_HIDDEN RWStepVisual_RWComplexTriangulatedFace();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_ComplexTriangulatedFace)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_ComplexTriangulatedFace)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_ComplexTriangulatedFace)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_ComplexTriangulatedFace)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.cxx b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.cxx
index ddf7af7495..d506150641 100644
--- a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx>
+#include "RWStepVisual_RWComplexTriangulatedSurfaceSet.pxx"
 #include <StepVisual_ComplexTriangulatedSurfaceSet.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.pxx
index 2564dee6b4..34541e72a7 100644
--- a/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWComplexTriangulatedSurfaceSet.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWComplexTriangulatedSurfaceSet();
+  Standard_HIDDEN RWStepVisual_RWComplexTriangulatedSurfaceSet();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_ComplexTriangulatedSurfaceSet)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_ComplexTriangulatedSurfaceSet)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_ComplexTriangulatedSurfaceSet)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_ComplexTriangulatedSurfaceSet)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWCompositeText.cxx b/src/RWStepVisual/RWStepVisual_RWCompositeText.cxx
index 7991ebd7fe..3b46320164 100644
--- a/src/RWStepVisual/RWStepVisual_RWCompositeText.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCompositeText.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCompositeText.hxx>
+#include "RWStepVisual_RWCompositeText.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CompositeText.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCompositeText.hxx b/src/RWStepVisual/RWStepVisual_RWCompositeText.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCompositeText.hxx
rename to src/RWStepVisual/RWStepVisual_RWCompositeText.pxx
index 56d96c9860..c15f89ab66 100644
--- a/src/RWStepVisual/RWStepVisual_RWCompositeText.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCompositeText.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCompositeText();
+  Standard_HIDDEN RWStepVisual_RWCompositeText();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CompositeText)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CompositeText)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CompositeText)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CompositeText)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CompositeText)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CompositeText)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cxx b/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cxx
index d2711983dc..6c74dd726d 100644
--- a/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCompositeTextWithExtent.hxx>
+#include "RWStepVisual_RWCompositeTextWithExtent.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CompositeTextWithExtent.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.hxx b/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.hxx
rename to src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.pxx
index 10ab213c4d..6d0686859d 100644
--- a/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCompositeTextWithExtent();
+  Standard_HIDDEN RWStepVisual_RWCompositeTextWithExtent();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CompositeTextWithExtent)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CompositeTextWithExtent)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CompositeTextWithExtent)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CompositeTextWithExtent)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CompositeTextWithExtent)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CompositeTextWithExtent)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cxx b/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cxx
index 1cfed084d1..9334218cec 100644
--- a/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWContextDependentInvisibility.hxx>
+#include "RWStepVisual_RWContextDependentInvisibility.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_ContextDependentInvisibility.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.hxx b/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.hxx
rename to src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.pxx
index 896b10aa9d..0f427157ae 100644
--- a/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWContextDependentInvisibility();
+  Standard_HIDDEN RWStepVisual_RWContextDependentInvisibility();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ContextDependentInvisibility)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ContextDependentInvisibility)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ContextDependentInvisibility)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ContextDependentInvisibility)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_ContextDependentInvisibility)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_ContextDependentInvisibility)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cxx b/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cxx
index bf19ce3f67..4eedaa46ec 100644
--- a/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWContextDependentOverRidingStyledItem.hxx>
+#include "RWStepVisual_RWContextDependentOverRidingStyledItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_ContextDependentOverRidingStyledItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.hxx b/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.pxx
index fab5b005c9..63e5e171ea 100644
--- a/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWContextDependentOverRidingStyledItem();
+  Standard_HIDDEN RWStepVisual_RWContextDependentOverRidingStyledItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ContextDependentOverRidingStyledItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ContextDependentOverRidingStyledItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ContextDependentOverRidingStyledItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ContextDependentOverRidingStyledItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_ContextDependentOverRidingStyledItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_ContextDependentOverRidingStyledItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCoordinatesList.cxx b/src/RWStepVisual/RWStepVisual_RWCoordinatesList.cxx
index 206101e4ee..702159fee1 100644
--- a/src/RWStepVisual/RWStepVisual_RWCoordinatesList.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCoordinatesList.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCoordinatesList.hxx>
+#include "RWStepVisual_RWCoordinatesList.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CoordinatesList.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCoordinatesList.hxx b/src/RWStepVisual/RWStepVisual_RWCoordinatesList.pxx
similarity index 88%
rename from src/RWStepVisual/RWStepVisual_RWCoordinatesList.hxx
rename to src/RWStepVisual/RWStepVisual_RWCoordinatesList.pxx
index 791a4facfd..2eb6929b84 100644
--- a/src/RWStepVisual/RWStepVisual_RWCoordinatesList.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCoordinatesList.pxx
@@ -33,13 +33,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWCoordinatesList();
+  Standard_HIDDEN RWStepVisual_RWCoordinatesList();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data,
 	 const Standard_Integer num,
 	 Handle(Interface_Check)& ach,
 	 const Handle(StepVisual_CoordinatesList)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_CoordinatesList)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_CoordinatesList)& ent) const;
 };
 #endif // _RWStepVisual_RWCoordinatesList_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.cxx b/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.cxx
index b7a18ac584..876791034f 100644
--- a/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWCubicBezierTessellatedEdge.hxx>
+#include "RWStepVisual_RWCubicBezierTessellatedEdge.pxx"
 #include <StepVisual_CubicBezierTessellatedEdge.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.hxx b/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.hxx
rename to src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.pxx
index 20d41bd22d..3a04f7a349 100644
--- a/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCubicBezierTessellatedEdge.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWCubicBezierTessellatedEdge();
+  Standard_HIDDEN RWStepVisual_RWCubicBezierTessellatedEdge();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_CubicBezierTessellatedEdge)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_CubicBezierTessellatedEdge)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_CubicBezierTessellatedEdge)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_CubicBezierTessellatedEdge)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.cxx b/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.cxx
index 4cd7be5f92..acab57e0de 100644
--- a/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWCubicBezierTriangulatedFace.hxx>
+#include "RWStepVisual_RWCubicBezierTriangulatedFace.pxx"
 #include <StepVisual_CubicBezierTriangulatedFace.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.hxx b/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.hxx
rename to src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.pxx
index 8825c1c905..c6f8fe16b5 100644
--- a/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCubicBezierTriangulatedFace.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWCubicBezierTriangulatedFace();
+  Standard_HIDDEN RWStepVisual_RWCubicBezierTriangulatedFace();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_CubicBezierTriangulatedFace)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_CubicBezierTriangulatedFace)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_CubicBezierTriangulatedFace)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_CubicBezierTriangulatedFace)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyle.cxx b/src/RWStepVisual/RWStepVisual_RWCurveStyle.cxx
index 532c665e20..074942d6e3 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyle.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyle.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCurveStyle.hxx>
+#include "RWStepVisual_RWCurveStyle.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_Colour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyle.hxx b/src/RWStepVisual/RWStepVisual_RWCurveStyle.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCurveStyle.hxx
rename to src/RWStepVisual/RWStepVisual_RWCurveStyle.pxx
index cdbb0b7468..dade807203 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyle.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyle.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCurveStyle();
+  Standard_HIDDEN RWStepVisual_RWCurveStyle();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CurveStyle)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CurveStyle)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CurveStyle)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CurveStyle)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CurveStyle)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CurveStyle)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cxx b/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cxx
index 65bb30dd30..9126a8b602 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWCurveStyleFont.hxx>
+#include "RWStepVisual_RWCurveStyleFont.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CurveStyleFont.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.hxx b/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWCurveStyleFont.hxx
rename to src/RWStepVisual/RWStepVisual_RWCurveStyleFont.pxx
index 41880bef4b..de93720a03 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCurveStyleFont();
+  Standard_HIDDEN RWStepVisual_RWCurveStyleFont();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CurveStyleFont)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CurveStyleFont)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CurveStyleFont)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CurveStyleFont)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_CurveStyleFont)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_CurveStyleFont)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cxx b/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cxx
index f8a42c9049..bd8bb0168c 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWCurveStyleFontPattern.hxx>
+#include "RWStepVisual_RWCurveStyleFontPattern.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CurveStyleFontPattern.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.hxx b/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.hxx
rename to src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.pxx
index 8ddbee6e41..dcdfe2bc7c 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWCurveStyleFontPattern();
+  Standard_HIDDEN RWStepVisual_RWCurveStyleFontPattern();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CurveStyleFontPattern)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_CurveStyleFontPattern)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CurveStyleFontPattern)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_CurveStyleFontPattern)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.cxx b/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.cxx
index a5ebadd6d3..3bd166f6c5 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWDraughtingCallout.hxx>
+#include "RWStepVisual_RWDraughtingCallout.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_DraughtingCallout.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.hxx b/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.pxx
similarity index 85%
rename from src/RWStepVisual/RWStepVisual_RWDraughtingCallout.hxx
rename to src/RWStepVisual/RWStepVisual_RWDraughtingCallout.pxx
index 9d561357d2..5fb508498b 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingCallout.pxx
@@ -34,12 +34,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWDraughtingCallout();
+  Standard_HIDDEN RWStepVisual_RWDraughtingCallout();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingCallout)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingCallout)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingCallout)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingCallout)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_DraughtingCallout)& ent, Interface_EntityIterator& iter)  const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_DraughtingCallout)& ent, Interface_EntityIterator& iter)  const;
 };
 #endif // _RWStepVisual_RWDraughtingCallout_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx b/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx
index 4cbd1572d6..050558d4fd 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWDraughtingModel.hxx>
+#include "RWStepVisual_RWDraughtingModel.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingModel.hxx b/src/RWStepVisual/RWStepVisual_RWDraughtingModel.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWDraughtingModel.hxx
rename to src/RWStepVisual/RWStepVisual_RWDraughtingModel.pxx
index cb32f2f2c3..5c1d9457f7 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingModel.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingModel.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepVisual_RWDraughtingModel();
+  Standard_HIDDEN RWStepVisual_RWDraughtingModel();
   
   //! Reads DraughtingModel
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingModel)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingModel)& ent) const;
   
   //! Writes DraughtingModel
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingModel)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingModel)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepVisual_DraughtingModel)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_DraughtingModel)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cxx b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cxx
index ead86c14b6..7a9be608f3 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cxx
@@ -13,7 +13,7 @@
 
 //:S4134: abv 03.03.99: implementation of DraughtingPreDefinedColour modified
 
-#include <RWStepVisual_RWDraughtingPreDefinedColour.hxx>
+#include "RWStepVisual_RWDraughtingPreDefinedColour.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_DraughtingPreDefinedColour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.hxx b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.hxx
rename to src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.pxx
index 8f8ee4385d..5a08705c0e 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWDraughtingPreDefinedColour();
+  Standard_HIDDEN RWStepVisual_RWDraughtingPreDefinedColour();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingPreDefinedColour)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingPreDefinedColour)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingPreDefinedColour)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingPreDefinedColour)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cxx b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cxx
index 0ad42338f7..58baadf4d1 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWDraughtingPreDefinedCurveFont.hxx>
+#include "RWStepVisual_RWDraughtingPreDefinedCurveFont.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_DraughtingPreDefinedCurveFont.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.hxx b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.hxx
rename to src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.pxx
index c48dd82b10..fda624298b 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWDraughtingPreDefinedCurveFont();
+  Standard_HIDDEN RWStepVisual_RWDraughtingPreDefinedCurveFont();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingPreDefinedCurveFont)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_DraughtingPreDefinedCurveFont)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingPreDefinedCurveFont)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_DraughtingPreDefinedCurveFont)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.cxx b/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.cxx
index 9ac8de4951..dcd7adbe92 100644
--- a/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.cxx
@@ -16,7 +16,7 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWExternallyDefinedCurveFont.hxx>
+#include "RWStepVisual_RWExternallyDefinedCurveFont.pxx"
 #include <StepBasic_ExternalSource.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.hxx b/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.hxx
rename to src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.pxx
index 69a2c8bcb6..4ea16a4dfd 100644
--- a/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWExternallyDefinedCurveFont.pxx
@@ -37,16 +37,16 @@ public:
 
   
   //! Empty constructor
-  Standard_EXPORT RWStepVisual_RWExternallyDefinedCurveFont();
+  Standard_HIDDEN RWStepVisual_RWExternallyDefinedCurveFont();
   
   //! Reads ExternallyDefinedCurveFont
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ExternallyDefinedCurveFont)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ExternallyDefinedCurveFont)& ent) const;
   
   //! Writes ExternallyDefinedCurveFont
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ExternallyDefinedCurveFont)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ExternallyDefinedCurveFont)& ent) const;
   
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepVisual_ExternallyDefinedCurveFont)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_ExternallyDefinedCurveFont)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cxx b/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cxx
index d324b8387e..5b6881161f 100644
--- a/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWFillAreaStyle.hxx>
+#include "RWStepVisual_RWFillAreaStyle.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_FillAreaStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.hxx b/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWFillAreaStyle.hxx
rename to src/RWStepVisual/RWStepVisual_RWFillAreaStyle.pxx
index b05e1f0652..620434613a 100644
--- a/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWFillAreaStyle();
+  Standard_HIDDEN RWStepVisual_RWFillAreaStyle();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_FillAreaStyle)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_FillAreaStyle)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_FillAreaStyle)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_FillAreaStyle)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_FillAreaStyle)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_FillAreaStyle)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cxx b/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cxx
index 53f9ef869b..e9a3e4923c 100644
--- a/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWFillAreaStyleColour.hxx>
+#include "RWStepVisual_RWFillAreaStyleColour.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_Colour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.hxx b/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.hxx
rename to src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.pxx
index 99dad286b0..3ee4147ea0 100644
--- a/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWFillAreaStyleColour();
+  Standard_HIDDEN RWStepVisual_RWFillAreaStyleColour();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_FillAreaStyleColour)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_FillAreaStyleColour)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_FillAreaStyleColour)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_FillAreaStyleColour)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_FillAreaStyleColour)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_FillAreaStyleColour)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWInvisibility.cxx b/src/RWStepVisual/RWStepVisual_RWInvisibility.cxx
index 9fb550cc4d..27493debb9 100644
--- a/src/RWStepVisual/RWStepVisual_RWInvisibility.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWInvisibility.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWInvisibility.hxx>
+#include "RWStepVisual_RWInvisibility.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_Invisibility.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWInvisibility.hxx b/src/RWStepVisual/RWStepVisual_RWInvisibility.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWInvisibility.hxx
rename to src/RWStepVisual/RWStepVisual_RWInvisibility.pxx
index 7a9abdf89d..d05809eca6 100644
--- a/src/RWStepVisual/RWStepVisual_RWInvisibility.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWInvisibility.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWInvisibility();
+  Standard_HIDDEN RWStepVisual_RWInvisibility();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_Invisibility)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_Invisibility)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_Invisibility)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_Invisibility)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_Invisibility)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_Invisibility)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cxx b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cxx
index 149a819e9a..758327a6e1 100644
--- a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx>
+#include "RWStepVisual_RWMechanicalDesignGeometricPresentationArea.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx
rename to src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.pxx
index 52c341e8ae..aeba8316f3 100644
--- a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWMechanicalDesignGeometricPresentationArea();
+  Standard_HIDDEN RWStepVisual_RWMechanicalDesignGeometricPresentationArea();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_MechanicalDesignGeometricPresentationArea)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_MechanicalDesignGeometricPresentationArea)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_MechanicalDesignGeometricPresentationArea)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_MechanicalDesignGeometricPresentationArea)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_MechanicalDesignGeometricPresentationArea)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_MechanicalDesignGeometricPresentationArea)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cxx b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cxx
index 57c695f590..5e169e07f0 100644
--- a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx>
+#include "RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.pxx
similarity index 88%
rename from src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx
rename to src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.pxx
index 5113cf8796..fde2ff9e68 100644
--- a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation();
+  Standard_HIDDEN RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cxx b/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cxx
index 0d64196943..105a0aa667 100644
--- a/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWOverRidingStyledItem.hxx>
+#include "RWStepVisual_RWOverRidingStyledItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_OverRidingStyledItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.hxx b/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.pxx
index cbbc9fea20..f3a7f4f17d 100644
--- a/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWOverRidingStyledItem();
+  Standard_HIDDEN RWStepVisual_RWOverRidingStyledItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_OverRidingStyledItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_OverRidingStyledItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_OverRidingStyledItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_OverRidingStyledItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_OverRidingStyledItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_OverRidingStyledItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPlanarBox.cxx b/src/RWStepVisual/RWStepVisual_RWPlanarBox.cxx
index 0893646eac..36187e2ce6 100644
--- a/src/RWStepVisual/RWStepVisual_RWPlanarBox.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPlanarBox.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPlanarBox.hxx>
+#include "RWStepVisual_RWPlanarBox.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PlanarBox.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPlanarBox.hxx b/src/RWStepVisual/RWStepVisual_RWPlanarBox.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPlanarBox.hxx
rename to src/RWStepVisual/RWStepVisual_RWPlanarBox.pxx
index 8d846ee1a7..6329524535 100644
--- a/src/RWStepVisual/RWStepVisual_RWPlanarBox.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPlanarBox.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPlanarBox();
+  Standard_HIDDEN RWStepVisual_RWPlanarBox();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PlanarBox)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PlanarBox)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PlanarBox)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PlanarBox)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PlanarBox)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PlanarBox)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cxx b/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cxx
index 4304d2feed..8d4279b85d 100644
--- a/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWPlanarExtent.hxx>
+#include "RWStepVisual_RWPlanarExtent.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PlanarExtent.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPlanarExtent.hxx b/src/RWStepVisual/RWStepVisual_RWPlanarExtent.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWPlanarExtent.hxx
rename to src/RWStepVisual/RWStepVisual_RWPlanarExtent.pxx
index 5792d5deeb..4e30a68734 100644
--- a/src/RWStepVisual/RWStepVisual_RWPlanarExtent.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPlanarExtent.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPlanarExtent();
+  Standard_HIDDEN RWStepVisual_RWPlanarExtent();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PlanarExtent)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PlanarExtent)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PlanarExtent)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PlanarExtent)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPointStyle.cxx b/src/RWStepVisual/RWStepVisual_RWPointStyle.cxx
index 5d99719943..a557fd0637 100644
--- a/src/RWStepVisual/RWStepVisual_RWPointStyle.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPointStyle.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPointStyle.hxx>
+#include "RWStepVisual_RWPointStyle.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_Colour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPointStyle.hxx b/src/RWStepVisual/RWStepVisual_RWPointStyle.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPointStyle.hxx
rename to src/RWStepVisual/RWStepVisual_RWPointStyle.pxx
index 2de0a220df..ac8401fcb1 100644
--- a/src/RWStepVisual/RWStepVisual_RWPointStyle.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPointStyle.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPointStyle();
+  Standard_HIDDEN RWStepVisual_RWPointStyle();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PointStyle)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PointStyle)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PointStyle)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PointStyle)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PointStyle)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PointStyle)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cxx b/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cxx
index a2f6a74cdc..25b7fa6497 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cxx
@@ -13,7 +13,7 @@
 
 //:S4134: abv 03.03.99: implementation of PreDefinedColour modified
 
-#include <RWStepVisual_RWPreDefinedColour.hxx>
+#include "RWStepVisual_RWPreDefinedColour.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PreDefinedColour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.hxx b/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWPreDefinedColour.hxx
rename to src/RWStepVisual/RWStepVisual_RWPreDefinedColour.pxx
index 4a71ee45a2..ac893adca0 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPreDefinedColour();
+  Standard_HIDDEN RWStepVisual_RWPreDefinedColour();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PreDefinedColour)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PreDefinedColour)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PreDefinedColour)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PreDefinedColour)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cxx b/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cxx
index 1757a1812b..fb029c80b8 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWPreDefinedCurveFont.hxx>
+#include "RWStepVisual_RWPreDefinedCurveFont.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PreDefinedCurveFont.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.hxx b/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.hxx
rename to src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.pxx
index 8447eda7ef..8175f96f9c 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPreDefinedCurveFont();
+  Standard_HIDDEN RWStepVisual_RWPreDefinedCurveFont();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PreDefinedCurveFont)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PreDefinedCurveFont)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PreDefinedCurveFont)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PreDefinedCurveFont)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cxx b/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cxx
index f0ab18d127..ffd1b6a1d0 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWPreDefinedItem.hxx>
+#include "RWStepVisual_RWPreDefinedItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PreDefinedItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.hxx b/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWPreDefinedItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWPreDefinedItem.pxx
index cad3ff9679..ddd7d5044e 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPreDefinedItem();
+  Standard_HIDDEN RWStepVisual_RWPreDefinedItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PreDefinedItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PreDefinedItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PreDefinedItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PreDefinedItem)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationArea.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationArea.cxx
index 7b873799e7..a60ba66a3d 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationArea.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationArea.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationArea.hxx>
+#include "RWStepVisual_RWPresentationArea.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationArea.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationArea.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationArea.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationArea.pxx
index 7fd95e073a..adfdd437a6 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationArea.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationArea.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationArea();
+  Standard_HIDDEN RWStepVisual_RWPresentationArea();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationArea)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationArea)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationArea)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationArea)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationArea)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationArea)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cxx
index 9fa312bab1..75e4b7ab1d 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationLayerAssignment.hxx>
+#include "RWStepVisual_RWPresentationLayerAssignment.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PresentationLayerAssignment.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.pxx
index cbf9730b67..f4f0fc5a03 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationLayerAssignment();
+  Standard_HIDDEN RWStepVisual_RWPresentationLayerAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationLayerAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationLayerAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationLayerAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationLayerAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationLayerAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationLayerAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx
index 5ac0fe92b3..24d1c9f597 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationLayerUsage.hxx>
+#include "RWStepVisual_RWPresentationLayerUsage.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PresentationLayerAssignment.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.pxx
index 2e35ab0631..dd09f3f478 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationLayerUsage();
+  Standard_HIDDEN RWStepVisual_RWPresentationLayerUsage();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationLayerUsage)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationLayerUsage)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationLayerUsage)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationLayerUsage)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationLayerUsage)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationLayerUsage)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cxx
index 361bc6dd97..ce420ed467 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationRepresentation.hxx>
+#include "RWStepVisual_RWPresentationRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.pxx
index c83be2686f..c0989647a0 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationRepresentation();
+  Standard_HIDDEN RWStepVisual_RWPresentationRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationSet.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationSet.cxx
index 5ed87197d8..3987f26aee 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationSet.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWPresentationSet.hxx>
+#include "RWStepVisual_RWPresentationSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PresentationSet.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationSet.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationSet.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWPresentationSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationSet.pxx
index c74aa120a0..dbc598bd30 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationSet.pxx
@@ -36,11 +36,11 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationSet();
+  Standard_HIDDEN RWStepVisual_RWPresentationSet();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationSet)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationSet)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationSet)& ent) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationSize.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationSize.cxx
index 152e2511a6..4954e7009b 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationSize.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationSize.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationSize.hxx>
+#include "RWStepVisual_RWPresentationSize.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PlanarBox.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationSize.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationSize.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationSize.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationSize.pxx
index c7ca83425e..044dc8c0c3 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationSize.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationSize.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationSize();
+  Standard_HIDDEN RWStepVisual_RWPresentationSize();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationSize)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationSize)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationSize)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationSize)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationSize)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationSize)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cxx
index 9f650ae649..525e05490f 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationStyleAssignment.hxx>
+#include "RWStepVisual_RWPresentationStyleAssignment.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_NullStyleMember.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.pxx
index 34cb5d36b5..94aa877ede 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationStyleAssignment();
+  Standard_HIDDEN RWStepVisual_RWPresentationStyleAssignment();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationStyleAssignment)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationStyleAssignment)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationStyleAssignment)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationStyleAssignment)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationStyleAssignment)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationStyleAssignment)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cxx
index 5da048e6cc..c28df0c2bd 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationStyleByContext.hxx>
+#include "RWStepVisual_RWPresentationStyleByContext.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_NullStyleMember.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.pxx
index 11460ac8bd..09f1dd0d77 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationStyleByContext();
+  Standard_HIDDEN RWStepVisual_RWPresentationStyleByContext();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationStyleByContext)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationStyleByContext)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationStyleByContext)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationStyleByContext)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationStyleByContext)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationStyleByContext)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationView.cxx b/src/RWStepVisual/RWStepVisual_RWPresentationView.cxx
index 1b94232775..36adb1c0ed 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationView.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationView.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentationView.hxx>
+#include "RWStepVisual_RWPresentationView.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationView.hxx b/src/RWStepVisual/RWStepVisual_RWPresentationView.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentationView.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentationView.pxx
index 9716130aba..bb8b2b0c82 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationView.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationView.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentationView();
+  Standard_HIDDEN RWStepVisual_RWPresentationView();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationView)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentationView)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationView)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentationView)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentationView)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentationView)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cxx b/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cxx
index 5b8bc25a37..d32289eb16 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWPresentedItemRepresentation.hxx>
+#include "RWStepVisual_RWPresentedItemRepresentation.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_PresentedItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.hxx b/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.hxx
rename to src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.pxx
index 7f75ad52c9..2ae5eded1f 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWPresentedItemRepresentation();
+  Standard_HIDDEN RWStepVisual_RWPresentedItemRepresentation();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentedItemRepresentation)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_PresentedItemRepresentation)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentedItemRepresentation)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_PresentedItemRepresentation)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_PresentedItemRepresentation)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_PresentedItemRepresentation)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.cxx b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.cxx
index 6f173e8a19..9bc38d1bab 100644
--- a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.cxx
@@ -11,7 +11,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx>
+#include "RWStepVisual_RWRepositionedTessellatedGeometricSet.pxx"
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.pxx
similarity index 91%
rename from src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.pxx
index 80b8ba04c2..d53c2420c0 100644
--- a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedGeometricSet.pxx
@@ -34,17 +34,17 @@ public:
   RWStepVisual_RWRepositionedTessellatedGeometricSet() {};
 
   //! Reads RepositionedTessellatedGeometricSet
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData,
                                  const Standard_Integer theNum,
                                  Handle(Interface_Check)& theAch,
                                  const Handle(StepVisual_RepositionedTessellatedGeometricSet)& theEnt) const;
 
   //! Writes RepositionedTessellatedGeometricSet
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW,
                                   const Handle(StepVisual_RepositionedTessellatedGeometricSet)& theEnt) const;
 
   //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepVisual_RepositionedTessellatedGeometricSet)& theEnt,
+  Standard_HIDDEN void Share (const Handle(StepVisual_RepositionedTessellatedGeometricSet)& theEnt,
                               Interface_EntityIterator& theIter) const;
 };
 #endif // _RWStepVisual_RWRepositionedTessellatedGeometricSet_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.cxx b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.cxx
index f1e33ebba0..fbfaef3e16 100644
--- a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.cxx
@@ -11,7 +11,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWRepositionedTessellatedItem.hxx>
+#include "RWStepVisual_RWRepositionedTessellatedItem.pxx"
 
 #include <Interface_Check.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.hxx b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.pxx
similarity index 92%
rename from src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.pxx
index 719db354b1..bd185947d3 100644
--- a/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWRepositionedTessellatedItem.pxx
@@ -34,13 +34,13 @@ public:
   RWStepVisual_RWRepositionedTessellatedItem() {};
 
   //! Reads RepositionedTessellatedItem
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& theData,
    const Standard_Integer theNum,
    Handle(Interface_Check)& theAch,
    const Handle(StepVisual_RepositionedTessellatedItem)& theEnt) const;
 
   //! Writes RepositionedTessellatedItem
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& theSW,
     const Handle(StepVisual_RepositionedTessellatedItem)& theEnt) const;
 };
 #endif // _RWStepVisual_RWRepositionedTessellatedItem_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWStyledItem.cxx b/src/RWStepVisual/RWStepVisual_RWStyledItem.cxx
index 8548408906..88527dddb5 100644
--- a/src/RWStepVisual/RWStepVisual_RWStyledItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWStyledItem.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWStyledItem.hxx>
+#include "RWStepVisual_RWStyledItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_StyledItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWStyledItem.hxx b/src/RWStepVisual/RWStepVisual_RWStyledItem.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWStyledItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWStyledItem.pxx
index ab7aefec0a..65cd4e95dd 100644
--- a/src/RWStepVisual/RWStepVisual_RWStyledItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWStyledItem.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWStyledItem();
+  Standard_HIDDEN RWStepVisual_RWStyledItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_StyledItem)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_StyledItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_StyledItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_StyledItem)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_StyledItem)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_StyledItem)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cxx
index 85853902c9..1f576abf07 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceSideStyle.hxx>
+#include "RWStepVisual_RWSurfaceSideStyle.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_SurfaceSideStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.pxx
index c6ea02f00f..55ccf0a3d8 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceSideStyle();
+  Standard_HIDDEN RWStepVisual_RWSurfaceSideStyle();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceSideStyle)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceSideStyle)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceSideStyle)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceSideStyle)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceSideStyle)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceSideStyle)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cxx
index 62c58a9f24..8f756d946b 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceStyleBoundary.hxx>
+#include "RWStepVisual_RWSurfaceStyleBoundary.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CurveStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.pxx
index 042d28cb4e..b7653b5d32 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleBoundary();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleBoundary();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleBoundary)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleBoundary)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleBoundary)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleBoundary)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceStyleBoundary)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceStyleBoundary)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cxx
index dea93f1bfe..3c43ed600f 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceStyleControlGrid.hxx>
+#include "RWStepVisual_RWSurfaceStyleControlGrid.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CurveStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.pxx
index 64e2b1e25c..1c2c144c03 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleControlGrid();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleControlGrid();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleControlGrid)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleControlGrid)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleControlGrid)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleControlGrid)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceStyleControlGrid)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceStyleControlGrid)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cxx
index 2314502b24..210a4f4534 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceStyleFillArea.hxx>
+#include "RWStepVisual_RWSurfaceStyleFillArea.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_FillAreaStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.pxx
index 009b029ede..73f1faaa71 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleFillArea();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleFillArea();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleFillArea)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleFillArea)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleFillArea)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleFillArea)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceStyleFillArea)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceStyleFillArea)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cxx
index 4c5c323ddb..a4db34dfb4 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceStyleParameterLine.hxx>
+#include "RWStepVisual_RWSurfaceStyleParameterLine.pxx"
 #include <Standard_Integer.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.pxx
index 56cef93073..b268488c9a 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleParameterLine();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleParameterLine();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleParameterLine)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleParameterLine)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleParameterLine)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleParameterLine)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceStyleParameterLine)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceStyleParameterLine)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.cxx
index 94f5b75358..fac8f8fb0c 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx>
+#include "RWStepVisual_RWSurfaceStyleReflectanceAmbient.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.pxx
index 9097568d73..357c8845f8 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleReflectanceAmbient.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleReflectanceAmbient();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleReflectanceAmbient();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleReflectanceAmbient)& ent) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleReflectanceAmbient)& ent) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleReflectanceAmbient)& ent) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleReflectanceAmbient)& ent) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_SurfaceStyleReflectanceAmbient)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepVisual_SurfaceStyleReflectanceAmbient)& ent, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepVisual_RWSurfaceStyleReflectanceAmbient_HeaderFile_
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.cxx
index c9c726b47c..66452a2548 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWSurfaceStyleRendering.hxx>
+#include "RWStepVisual_RWSurfaceStyleRendering.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.pxx
index 9082b44e00..1f56a8baa4 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRendering.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleRendering();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleRendering();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleRendering)& ent) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleRendering)& ent) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleRendering)& ent) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleRendering)& ent) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_SurfaceStyleRendering)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepVisual_SurfaceStyleRendering)& ent, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepVisual_RWSurfaceStyleRendering_HeaderFile_
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.cxx
index 99623958e4..a739379896 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWSurfaceStyleRenderingWithProperties.hxx>
+#include "RWStepVisual_RWSurfaceStyleRenderingWithProperties.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.pxx
index 5e1b0921db..a90ae62054 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleRenderingWithProperties.pxx
@@ -34,13 +34,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleRenderingWithProperties();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleRenderingWithProperties();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleRenderingWithProperties)& ent) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleRenderingWithProperties)& ent) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleRenderingWithProperties)& ent) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleRenderingWithProperties)& ent) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_SurfaceStyleRenderingWithProperties)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepVisual_SurfaceStyleRenderingWithProperties)& ent, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepVisual_RWSurfaceStyleRenderingWithProperties_HeaderFile_
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cxx
index 1e4f021f0f..0934114d67 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceStyleSegmentationCurve.hxx>
+#include "RWStepVisual_RWSurfaceStyleSegmentationCurve.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CurveStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.pxx
index 5aa20b6770..a00e9a691a 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleSegmentationCurve();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleSegmentationCurve();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleSegmentationCurve)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleSegmentationCurve)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleSegmentationCurve)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleSegmentationCurve)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceStyleSegmentationCurve)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceStyleSegmentationCurve)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cxx
index 549ac331ae..e0bb1e1828 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceStyleSilhouette.hxx>
+#include "RWStepVisual_RWSurfaceStyleSilhouette.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_CurveStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.pxx
index c8cab52fdc..291e9d7266 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleSilhouette();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleSilhouette();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleSilhouette)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleSilhouette)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleSilhouette)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleSilhouette)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceStyleSilhouette)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceStyleSilhouette)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.cxx
index 30ca3fa32f..0e04026ff2 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWSurfaceStyleTransparent.hxx>
+#include "RWStepVisual_RWSurfaceStyleTransparent.pxx"
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.pxx
index 1f2069b79d..4f9a0f19bd 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleTransparent.pxx
@@ -35,13 +35,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleTransparent();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleTransparent();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleTransparent)& ent) const;
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleTransparent)& ent) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleTransparent)& ent) const;
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleTransparent)& ent) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_SurfaceStyleTransparent)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share(const Handle(StepVisual_SurfaceStyleTransparent)& ent, Interface_EntityIterator& iter) const;
 
 };
 #endif // _RWStepVisual_RWSurfaceStyleTransparent_HeaderFile_
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cxx
index 8c37059db9..1cd00a34a3 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWSurfaceStyleUsage.hxx>
+#include "RWStepVisual_RWSurfaceStyleUsage.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_SurfaceSideStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.hxx b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.hxx
rename to src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.pxx
index a0c30d61b8..4009371315 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWSurfaceStyleUsage();
+  Standard_HIDDEN RWStepVisual_RWSurfaceStyleUsage();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleUsage)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_SurfaceStyleUsage)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleUsage)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_SurfaceStyleUsage)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_SurfaceStyleUsage)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_SurfaceStyleUsage)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTemplate.cxx b/src/RWStepVisual/RWStepVisual_RWTemplate.cxx
index 0f86f7cd08..8431c0d198 100644
--- a/src/RWStepVisual/RWStepVisual_RWTemplate.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTemplate.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTemplate.hxx>
+#include "RWStepVisual_RWTemplate.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTemplate.hxx b/src/RWStepVisual/RWStepVisual_RWTemplate.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTemplate.hxx
rename to src/RWStepVisual/RWStepVisual_RWTemplate.pxx
index 7dc4013eea..90c0fa84d5 100644
--- a/src/RWStepVisual/RWStepVisual_RWTemplate.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTemplate.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWTemplate();
+  Standard_HIDDEN RWStepVisual_RWTemplate();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_Template)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_Template)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_Template)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_Template)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_Template)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_Template)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cxx b/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cxx
index 7d64339907..a75e188944 100644
--- a/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTemplateInstance.hxx>
+#include "RWStepVisual_RWTemplateInstance.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationMap.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTemplateInstance.hxx b/src/RWStepVisual/RWStepVisual_RWTemplateInstance.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTemplateInstance.hxx
rename to src/RWStepVisual/RWStepVisual_RWTemplateInstance.pxx
index a1ffd33d22..e180dfd027 100644
--- a/src/RWStepVisual/RWStepVisual_RWTemplateInstance.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTemplateInstance.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWTemplateInstance();
+  Standard_HIDDEN RWStepVisual_RWTemplateInstance();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TemplateInstance)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TemplateInstance)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TemplateInstance)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TemplateInstance)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_TemplateInstance)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_TemplateInstance)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.cxx
index 662bde0ae4..15e577804a 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.cxx
@@ -15,7 +15,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTessellatedAnnotationOccurrence.hxx>
+#include "RWStepVisual_RWTessellatedAnnotationOccurrence.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.pxx
index 99006f6b32..2fbe80f8a0 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedAnnotationOccurrence.pxx
@@ -34,12 +34,12 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWTessellatedAnnotationOccurrence();
+  Standard_HIDDEN RWStepVisual_RWTessellatedAnnotationOccurrence();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TessellatedAnnotationOccurrence)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TessellatedAnnotationOccurrence)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TessellatedAnnotationOccurrence)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TessellatedAnnotationOccurrence)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_TessellatedAnnotationOccurrence)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_TessellatedAnnotationOccurrence)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWTessellatedAnnotationOccurrence_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.cxx
index ccf65f3995..3999c39ff8 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedConnectingEdge.hxx>
+#include "RWStepVisual_RWTessellatedConnectingEdge.pxx"
 #include <StepVisual_TessellatedConnectingEdge.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.pxx
index a1eb97f4c3..421061f11c 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedConnectingEdge.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedConnectingEdge();
+  Standard_HIDDEN RWStepVisual_RWTessellatedConnectingEdge();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedConnectingEdge)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedConnectingEdge)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedConnectingEdge)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedConnectingEdge)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.cxx
index 520dfcc727..4cbe97ced4 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTessellatedCurveSet.hxx>
+#include "RWStepVisual_RWTessellatedCurveSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_RepresentationItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.pxx
index 0e3a982760..db81ceecec 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedCurveSet.pxx
@@ -35,15 +35,15 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWTessellatedCurveSet();
+  Standard_HIDDEN RWStepVisual_RWTessellatedCurveSet();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data,
 	 const Standard_Integer num,
 	 Handle(Interface_Check)& ach,
 	 const Handle(StepVisual_TessellatedCurveSet)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_TessellatedCurveSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_TessellatedCurveSet)& ent) const;
 
-  Standard_EXPORT void Share (const Handle(StepVisual_TessellatedCurveSet) &ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_TessellatedCurveSet) &ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWTessellatedItem_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.cxx
index 0723e7c997..5c306174d3 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedEdge.hxx>
+#include "RWStepVisual_RWTessellatedEdge.pxx"
 #include <StepVisual_TessellatedEdge.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedEdge.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedEdge.pxx
index a88c46ab1d..9e16c64dbe 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedEdge.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedEdge();
+  Standard_HIDDEN RWStepVisual_RWTessellatedEdge();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedEdge)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedEdge)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedEdge)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedEdge)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.cxx
index dc17e2cd37..e34e559c46 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.cxx
@@ -16,7 +16,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTessellatedGeometricSet.hxx>
+#include "RWStepVisual_RWTessellatedGeometricSet.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_TessellatedGeometricSet.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.pxx
index 22b04348be..7e35215615 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedGeometricSet.pxx
@@ -34,15 +34,15 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWTessellatedGeometricSet();
+  Standard_HIDDEN RWStepVisual_RWTessellatedGeometricSet();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data,
 	 const Standard_Integer num,
 	 Handle(Interface_Check)& ach,
 	 const Handle(StepVisual_TessellatedGeometricSet)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_TessellatedGeometricSet)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_TessellatedGeometricSet)& ent) const;
   
-  Standard_EXPORT void Share (const  Handle(StepVisual_TessellatedGeometricSet)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const  Handle(StepVisual_TessellatedGeometricSet)& ent, Interface_EntityIterator& iter) const;
 };
 #endif // _RWStepVisual_RWTessellatedItem_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedItem.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedItem.cxx
index 4b820a1497..d468e8d7d0 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedItem.cxx
@@ -12,7 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <RWStepVisual_RWTessellatedItem.hxx>
+#include "RWStepVisual_RWTessellatedItem.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_TessellatedItem.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedItem.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedItem.pxx
similarity index 88%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedItem.pxx
index c037f73eb2..a51da9eef7 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedItem.pxx
@@ -33,13 +33,13 @@ public:
 
   DEFINE_STANDARD_ALLOC
   
-  Standard_EXPORT RWStepVisual_RWTessellatedItem();
+  Standard_HIDDEN RWStepVisual_RWTessellatedItem();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data,
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data,
 	 const Standard_Integer num,
 	 Handle(Interface_Check)& ach,
 	 const Handle(StepVisual_TessellatedItem)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_TessellatedItem)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const  Handle(StepVisual_TessellatedItem)& ent) const;
 };
 #endif // _RWStepVisual_RWTessellatedItem_HeaderFile
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.cxx
index 6070e25aac..c8e4a25168 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedPointSet.hxx>
+#include "RWStepVisual_RWTessellatedPointSet.pxx"
 #include <StepVisual_TessellatedPointSet.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.pxx
index 90b7c55cb1..3a201d31cb 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedPointSet.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedPointSet();
+  Standard_HIDDEN RWStepVisual_RWTessellatedPointSet();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedPointSet)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedPointSet)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedPointSet)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedPointSet)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.cxx
index f38aecf2bb..324fc8cbfa 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedShapeRepresentation.hxx>
+#include "RWStepVisual_RWTessellatedShapeRepresentation.pxx"
 #include <StepVisual_TessellatedShapeRepresentation.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.pxx
index c80b2534c1..39b630a7c5 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedShapeRepresentation();
+  Standard_HIDDEN RWStepVisual_RWTessellatedShapeRepresentation();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedShapeRepresentation)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedShapeRepresentation)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedShapeRepresentation)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedShapeRepresentation)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.cxx
index e5f669c2e6..eba3b0d4e6 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx>
+#include "RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.pxx"
 #include <StepVisual_TessellatedShapeRepresentationWithAccuracyParameters.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.pxx
similarity index 89%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.pxx
index 4c6fef75d1..beddccf9e4 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters();
+  Standard_HIDDEN RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedShapeRepresentationWithAccuracyParameters)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedShapeRepresentationWithAccuracyParameters)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedShapeRepresentationWithAccuracyParameters)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedShapeRepresentationWithAccuracyParameters)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedShell.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedShell.cxx
index e6f096101b..38d3848580 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedShell.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedShell.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedShell.hxx>
+#include "RWStepVisual_RWTessellatedShell.pxx"
 #include <StepVisual_TessellatedShell.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedShell.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedShell.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedShell.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedShell.pxx
index ddabbfb0b5..6200abc770 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedShell.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedShell.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedShell();
+  Standard_HIDDEN RWStepVisual_RWTessellatedShell();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedShell)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedShell)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedShell)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedShell)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.cxx
index 883a81629c..73083159d0 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedSolid.hxx>
+#include "RWStepVisual_RWTessellatedSolid.pxx"
 #include <StepVisual_TessellatedSolid.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedSolid.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedSolid.pxx
index 269cb0fc07..442d52d2e4 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedSolid.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedSolid();
+  Standard_HIDDEN RWStepVisual_RWTessellatedSolid();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedSolid)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedSolid)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedSolid)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedSolid)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.cxx
index 56292215db..953d0bbb53 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedStructuredItem.hxx>
+#include "RWStepVisual_RWTessellatedStructuredItem.pxx"
 #include <StepVisual_TessellatedStructuredItem.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.pxx
index ff235c8313..14c387b500 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedStructuredItem.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedStructuredItem();
+  Standard_HIDDEN RWStepVisual_RWTessellatedStructuredItem();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedStructuredItem)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedStructuredItem)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedStructuredItem)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedStructuredItem)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.cxx
index 6c651afd60..c7fde7b827 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedVertex.hxx>
+#include "RWStepVisual_RWTessellatedVertex.pxx"
 #include <StepVisual_TessellatedVertex.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedVertex.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedVertex.pxx
index 6ea6b5eff4..0047e17fed 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedVertex.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedVertex();
+  Standard_HIDDEN RWStepVisual_RWTessellatedVertex();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedVertex)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedVertex)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedVertex)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedVertex)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedWire.cxx b/src/RWStepVisual/RWStepVisual_RWTessellatedWire.cxx
index c37884f095..23c093bb17 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedWire.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedWire.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTessellatedWire.hxx>
+#include "RWStepVisual_RWTessellatedWire.pxx"
 #include <StepVisual_TessellatedWire.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTessellatedWire.hxx b/src/RWStepVisual/RWStepVisual_RWTessellatedWire.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTessellatedWire.hxx
rename to src/RWStepVisual/RWStepVisual_RWTessellatedWire.pxx
index e728a3f78c..cc230a5a9d 100644
--- a/src/RWStepVisual/RWStepVisual_RWTessellatedWire.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTessellatedWire.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTessellatedWire();
+  Standard_HIDDEN RWStepVisual_RWTessellatedWire();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TessellatedWire)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TessellatedWire)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TessellatedWire)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TessellatedWire)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTextLiteral.cxx b/src/RWStepVisual/RWStepVisual_RWTextLiteral.cxx
index 235b832460..f08c9ade4b 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextLiteral.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextLiteral.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTextLiteral.hxx>
+#include "RWStepVisual_RWTextLiteral.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_TextLiteral.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTextLiteral.hxx b/src/RWStepVisual/RWStepVisual_RWTextLiteral.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTextLiteral.hxx
rename to src/RWStepVisual/RWStepVisual_RWTextLiteral.pxx
index 801b98d01a..3713cf879b 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextLiteral.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextLiteral.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWTextLiteral();
+  Standard_HIDDEN RWStepVisual_RWTextLiteral();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextLiteral)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextLiteral)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextLiteral)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextLiteral)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_TextLiteral)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_TextLiteral)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyle.cxx b/src/RWStepVisual/RWStepVisual_RWTextStyle.cxx
index c9363219c0..9e0cfb985d 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyle.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyle.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTextStyle.hxx>
+#include "RWStepVisual_RWTextStyle.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_TextStyle.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyle.hxx b/src/RWStepVisual/RWStepVisual_RWTextStyle.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTextStyle.hxx
rename to src/RWStepVisual/RWStepVisual_RWTextStyle.pxx
index 8ab44973c0..53240a011b 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyle.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyle.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWTextStyle();
+  Standard_HIDDEN RWStepVisual_RWTextStyle();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextStyle)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextStyle)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextStyle)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextStyle)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_TextStyle)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_TextStyle)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cxx b/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cxx
index 94e0aff581..3be230b697 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTextStyleForDefinedFont.hxx>
+#include "RWStepVisual_RWTextStyleForDefinedFont.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepVisual_Colour.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.hxx b/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.hxx
rename to src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.pxx
index dcf404a6d7..67e0e51dbc 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWTextStyleForDefinedFont();
+  Standard_HIDDEN RWStepVisual_RWTextStyleForDefinedFont();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextStyleForDefinedFont)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextStyleForDefinedFont)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextStyleForDefinedFont)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextStyleForDefinedFont)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_TextStyleForDefinedFont)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_TextStyleForDefinedFont)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cxx b/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cxx
index da3039aa2b..b5f0c5f191 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cxx
@@ -14,7 +14,7 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx>
+#include "RWStepVisual_RWTextStyleWithBoxCharacteristics.pxx"
 #include <Standard_Real.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx b/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx
rename to src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.pxx
index 67b5e3a005..b409b04b72 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWTextStyleWithBoxCharacteristics();
+  Standard_HIDDEN RWStepVisual_RWTextStyleWithBoxCharacteristics();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextStyleWithBoxCharacteristics)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_TextStyleWithBoxCharacteristics)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextStyleWithBoxCharacteristics)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_TextStyleWithBoxCharacteristics)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_TextStyleWithBoxCharacteristics)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_TextStyleWithBoxCharacteristics)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.cxx b/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.cxx
index c8acb6a064..47ab3e0baa 100644
--- a/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTriangulatedFace.hxx>
+#include "RWStepVisual_RWTriangulatedFace.pxx"
 #include <StepVisual_TriangulatedFace.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.hxx b/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.pxx
similarity index 87%
rename from src/RWStepVisual/RWStepVisual_RWTriangulatedFace.hxx
rename to src/RWStepVisual/RWStepVisual_RWTriangulatedFace.pxx
index e0ef703b15..0192ff65cf 100644
--- a/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTriangulatedFace.pxx
@@ -35,17 +35,17 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT RWStepVisual_RWTriangulatedFace();
+  Standard_HIDDEN RWStepVisual_RWTriangulatedFace();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TriangulatedFace)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TriangulatedFace)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TriangulatedFace)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TriangulatedFace)& theEnt,
                              Interface_EntityIterator& theIter) const;
 
 };
diff --git a/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.cxx b/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.cxx
index bf02f6e907..1f81fd2d1d 100644
--- a/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.cxx
@@ -11,7 +11,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <RWStepVisual_RWTriangulatedSurfaceSet.hxx>
+#include "RWStepVisual_RWTriangulatedSurfaceSet.pxx"
 
 #include <StepVisual_TriangulatedSurfaceSet.hxx>
 #include <Interface_EntityIterator.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.hxx b/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.hxx
rename to src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.pxx
index 38fafbc49b..4864862e31 100644
--- a/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWTriangulatedSurfaceSet.pxx
@@ -31,17 +31,17 @@ public:
   DEFINE_STANDARD_ALLOC
 
   //! default constructor
-  Standard_EXPORT RWStepVisual_RWTriangulatedSurfaceSet();
+  Standard_HIDDEN RWStepVisual_RWTriangulatedSurfaceSet();
 
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
+  Standard_HIDDEN void ReadStep(const Handle(StepData_StepReaderData)& theData,
                                 const Standard_Integer theNum,
                                 Handle(Interface_Check)& theCheck,
                                 const Handle(StepVisual_TriangulatedSurfaceSet)& theEnt) const;
 
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
+  Standard_HIDDEN void WriteStep(StepData_StepWriter& theSW,
                                  const Handle(StepVisual_TriangulatedSurfaceSet)& theEnt) const;
 
-  Standard_EXPORT void Share(const Handle(StepVisual_TriangulatedSurfaceSet)& theEnt,
+  Standard_HIDDEN void Share(const Handle(StepVisual_TriangulatedSurfaceSet)& theEnt,
                              Interface_EntityIterator& theIter) const;
 };
 
diff --git a/src/RWStepVisual/RWStepVisual_RWViewVolume.cxx b/src/RWStepVisual/RWStepVisual_RWViewVolume.cxx
index 6dd227ef26..617e2248de 100644
--- a/src/RWStepVisual/RWStepVisual_RWViewVolume.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWViewVolume.cxx
@@ -13,7 +13,7 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <RWStepVisual_RWViewVolume.hxx>
+#include "RWStepVisual_RWViewVolume.pxx"
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepGeom_CartesianPoint.hxx>
diff --git a/src/RWStepVisual/RWStepVisual_RWViewVolume.hxx b/src/RWStepVisual/RWStepVisual_RWViewVolume.pxx
similarity index 86%
rename from src/RWStepVisual/RWStepVisual_RWViewVolume.hxx
rename to src/RWStepVisual/RWStepVisual_RWViewVolume.pxx
index d480f7ad1f..f5fb7a24a4 100644
--- a/src/RWStepVisual/RWStepVisual_RWViewVolume.hxx
+++ b/src/RWStepVisual/RWStepVisual_RWViewVolume.pxx
@@ -37,13 +37,13 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT RWStepVisual_RWViewVolume();
+  Standard_HIDDEN RWStepVisual_RWViewVolume();
   
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ViewVolume)& ent) const;
+  Standard_HIDDEN void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_ViewVolume)& ent) const;
   
-  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ViewVolume)& ent) const;
+  Standard_HIDDEN void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_ViewVolume)& ent) const;
   
-  Standard_EXPORT void Share (const Handle(StepVisual_ViewVolume)& ent, Interface_EntityIterator& iter) const;
+  Standard_HIDDEN void Share (const Handle(StepVisual_ViewVolume)& ent, Interface_EntityIterator& iter) const;
 
 
 
diff --git a/src/STEPControl/STEPControl_Controller.cxx b/src/STEPControl/STEPControl_Controller.cxx
index 2b45463e6a..7a0be491da 100644
--- a/src/STEPControl/STEPControl_Controller.cxx
+++ b/src/STEPControl/STEPControl_Controller.cxx
@@ -25,7 +25,7 @@
 #include <Interface_Static.hxx>
 #include <MoniTool_Macros.hxx>
 #include <RWHeaderSection.hxx>
-#include <RWStepAP214.hxx>
+#include "../RWStepAP214/RWStepAP214.pxx"
 #include <Standard_Type.hxx>
 #include <Standard_Version.hxx>
 #include <STEPControl_ActorRead.hxx>
diff --git a/src/STEPSelections/STEPSelections_SelectDerived.cxx b/src/STEPSelections/STEPSelections_SelectDerived.cxx
index 6a39a1f974..642b93d658 100644
--- a/src/STEPSelections/STEPSelections_SelectDerived.cxx
+++ b/src/STEPSelections/STEPSelections_SelectDerived.cxx
@@ -17,7 +17,7 @@
 
 #include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
-#include <RWStepAP214_GeneralModule.hxx>
+#include "../RWStepAP214/RWStepAP214_GeneralModule.pxx"
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_ReadWriteModule.hxx>
diff --git a/src/Standard/Standard_Macro.hxx b/src/Standard/Standard_Macro.hxx
index 85f2785eae..a3eb51bf69 100644
--- a/src/Standard/Standard_Macro.hxx
+++ b/src/Standard/Standard_Macro.hxx
@@ -290,6 +290,23 @@
 
 # endif  /* _WIN32 */
 
+//! @def Standard_HIDDEN
+//! This macro should be used in declarations of methods or functions
+//! to ensure that they are hidden and not exported from the shared library.
+//!
+//! Expands to "__attribute__((visibility("hidden")))" on GCC and Clang
+#if defined(__has_attribute)
+  #if __has_attribute(visibility)
+    #define Standard_HIDDEN __attribute__((visibility("hidden")))
+  #else
+    #define Standard_HIDDEN
+  #endif
+#elif defined(__GNUC__) || defined(__clang__)
+  #define Standard_HIDDEN __attribute__((visibility("hidden")))
+#else
+  #define Standard_HIDDEN
+#endif
+
 //! @def OCCT_UWP
 //! This macro is defined on Windows platform in the case if the code
 //! is being compiled for UWP (Universal Windows Platform).