diff --git a/corelib/include/rtabmap/core/Link.h b/corelib/include/rtabmap/core/Link.h
index 34934fd3..9e559750 100644
--- a/corelib/include/rtabmap/core/Link.h
+++ b/corelib/include/rtabmap/core/Link.h
@@ -28,12 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef LINK_H_
 #define LINK_H_
 
+#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
+
 #include <rtabmap/core/Transform.h>
 #include <opencv2/core/core.hpp>
 
 namespace rtabmap {
 
-class Link
+class RTABMAP_EXP Link
 {
 public:
 	enum Type {kNeighbor, kGlobalClosure, kLocalSpaceClosure, kLocalTimeClosure, kUserClosure, kVirtualClosure, kUndef};
diff --git a/corelib/src/rtflann/util/serialization.h b/corelib/src/rtflann/util/serialization.h
index cc0a5589..8c251661 100644
--- a/corelib/src/rtflann/util/serialization.h
+++ b/corelib/src/rtflann/util/serialization.h
@@ -110,7 +110,7 @@ BASIC_TYPE_SERIALIZER(bool);
 // unsigned __int64 ~= unsigned long long
 // Will throw error on VS2013
 #if _MSC_VER != 1800
-BASIC_TYPE_SERIALIZER(unsigned __int64);
+//BASIC_TYPE_SERIALIZER(unsigned __int64);
 #endif
 #endif