diff --git a/code/D3MFExporter.cpp b/code/D3MFExporter.cpp
index 74fa7a6b4..70c2dd409 100644
--- a/code/D3MFExporter.cpp
+++ b/code/D3MFExporter.cpp
@@ -38,6 +38,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
 */
+#ifndef ASSIMP_BUILD_NO_EXPORT
+#ifndef ASSIMP_BUILD_NO_3MF_EXPORTER
+
 #include "D3MFExporter.h"
 
 #include <assimp/scene.h>
@@ -69,8 +72,6 @@ void ExportScene3MF( const char* pFile, IOSystem* pIOSystem, const aiScene* pSce
 
 namespace D3MF {
 
-#ifndef ASSIMP_BUILD_NO3MF_EXPORTER
-
 D3MFExporter::D3MFExporter( const char* pFile, const aiScene* pScene )
 : mArchiveName( pFile )
 , m_zipArchive( nullptr )
@@ -276,8 +277,9 @@ void D3MFExporter::writeRelInfoToFile( const std::string &folder, const std::str
     zip_entry_close( m_zipArchive );
 }
 
-#endif // ASSIMP_BUILD_NO3MF_EXPORTER
 
 } // Namespace D3MF
 } // Namespace Assimp
 
+#endif // ASSIMP_BUILD_NO3MF_EXPORTER
+#endif // ASSIMP_BUILD_NO_EXPORT
diff --git a/code/D3MFExporter.h b/code/D3MFExporter.h
index 862e55fbd..8a38eff05 100644
--- a/code/D3MFExporter.h
+++ b/code/D3MFExporter.h
@@ -58,6 +58,7 @@ class IOStream;
 
 namespace D3MF {
 
+#ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO3MF_EXPORTER
 
 struct OpcPackageRelationship;
@@ -92,6 +93,7 @@ private:
 };
 
 #endif // ASSIMP_BUILD_NO3MF_EXPORTER
+#endif // ASSIMP_BUILD_NO_EXPORT
 
 } // Namespace D3MF
 } // Namespace Assimp