diff --git a/cmake/dllexport.h.in b/cmake/dllexport.h.in
index 0c30f9661..023f06f57 100644
--- a/cmake/dllexport.h.in
+++ b/cmake/dllexport.h.in
@@ -26,22 +26,21 @@
 //   class __declspec(dllexport) MyClass { ... };
 // When included while compiling other code against GTSAM:
 //   class __declspec(dllimport) MyClass { ... };
-
-// mnaranjo: we don't want dllexport on msys2
-//#ifdef _WIN32
-//#  ifdef @library_name@_EXPORTS
-//#    define @library_name@_EXPORT __declspec(dllexport)
-//#    define @library_name@_EXTERN_EXPORT __declspec(dllexport) extern
-//#  else
-//#    ifndef @library_name@_IMPORT_STATIC
-//#      define @library_name@_EXPORT __declspec(dllimport)
-//#      define @library_name@_EXTERN_EXPORT __declspec(dllimport)
-//#    else /* @library_name@_IMPORT_STATIC */
-//#      define @library_name@_EXPORT
-//#      define @library_name@_EXTERN_EXPORT extern
-//#    endif /* @library_name@_IMPORT_STATIC */
-//#  endif /* @library_name@_EXPORTS */
-//#else /* _WIN32 */
+#ifdef _WIN32
+#  ifdef @library_name@_EXPORTS
+#    define @library_name@_EXPORT __declspec(dllexport)
+#    define @library_name@_EXTERN_EXPORT __declspec(dllexport) extern
+#  else
+#    ifndef @library_name@_IMPORT_STATIC
+#      define @library_name@_EXPORT __declspec(dllimport)
+#      define @library_name@_EXTERN_EXPORT __declspec(dllimport)
+#    else /* @library_name@_IMPORT_STATIC */
+#      define @library_name@_EXPORT
+#      define @library_name@_EXTERN_EXPORT extern
+#    endif /* @library_name@_IMPORT_STATIC */
+#  endif /* @library_name@_EXPORTS */
+#else /* _WIN32 */
 #  define @library_name@_EXPORT
 #  define @library_name@_EXTERN_EXPORT extern
-//#endif
+#endif
+
diff --git a/gtsam/3rdparty/GeographicLib/include/GeographicLib/Constants.hpp b/gtsam/3rdparty/GeographicLib/include/GeographicLib/Constants.hpp
index ca83c7530..99baff31f 100644
--- a/gtsam/3rdparty/GeographicLib/include/GeographicLib/Constants.hpp
+++ b/gtsam/3rdparty/GeographicLib/include/GeographicLib/Constants.hpp
@@ -39,19 +39,18 @@
 #  endif
 #endif
 
-// mnaranjo: disable dllexport on msys2
-//#if defined(_MSC_VER) && defined(GEOGRAPHICLIB_SHARED_LIB) && \
-//  GEOGRAPHICLIB_SHARED_LIB
-//#  if GEOGRAPHICLIB_SHARED_LIB > 1
-//#    error GEOGRAPHICLIB_SHARED_LIB must be 0 or 1
-//#  elif defined(GeographicLib_EXPORTS)
-//#    define GEOGRAPHICLIB_EXPORT __declspec(dllexport)
-//#  else
-//#    define GEOGRAPHICLIB_EXPORT __declspec(dllimport)
-//#  endif
-//#else
+#if defined(_MSC_VER) && defined(GEOGRAPHICLIB_SHARED_LIB) && \
+  GEOGRAPHICLIB_SHARED_LIB
+#  if GEOGRAPHICLIB_SHARED_LIB > 1
+#    error GEOGRAPHICLIB_SHARED_LIB must be 0 or 1
+#  elif defined(GeographicLib_EXPORTS)
+#    define GEOGRAPHICLIB_EXPORT __declspec(dllexport)
+#  else
+#    define GEOGRAPHICLIB_EXPORT __declspec(dllimport)
+#  endif
+#else
 #  define GEOGRAPHICLIB_EXPORT
-//#endif
+#endif
 
 #include <stdexcept>
 #include <string>
diff --git a/gtsam_unstable/base/dllexport.h b/gtsam_unstable/base/dllexport.h
index b1916038a..f49199c70 100644
--- a/gtsam_unstable/base/dllexport.h
+++ b/gtsam_unstable/base/dllexport.h
@@ -16,21 +16,21 @@
  * @date     Mar 9, 2013
  */
 
-// mnaranjo: disable dllexport on msys2
-//#ifdef _WIN32
-//#  ifdef GTSAM_UNSTABLE_EXPORTS
-//#    define GTSAM_UNSTABLE_EXPORT __declspec(dllexport)
-//#    define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllexport) extern
-//#  else
-//#    ifndef GTSAM_UNSTABLE_IMPORT_STATIC
-//#      define GTSAM_UNSTABLE_EXPORT __declspec(dllimport)
-//#      define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllimport)
-//#    else /* GTSAM_UNSTABLE_IMPORT_STATIC */
-//#      define GTSAM_UNSTABLE_EXPORT
-//#      define GTSAM_UNSTABLE_EXTERN_EXPORT extern
-//#    endif /* GTSAM_UNSTABLE_IMPORT_STATIC */
-//#  endif /* GTSAM_UNSTABLE_EXPORTS */
-//#else /* _WIN32 */
+#ifdef _WIN32
+#  ifdef GTSAM_UNSTABLE_EXPORTS
+#    define GTSAM_UNSTABLE_EXPORT __declspec(dllexport)
+#    define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllexport) extern
+#  else
+#    ifndef GTSAM_UNSTABLE_IMPORT_STATIC
+#      define GTSAM_UNSTABLE_EXPORT __declspec(dllimport)
+#      define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllimport)
+#    else /* GTSAM_UNSTABLE_IMPORT_STATIC */
+#      define GTSAM_UNSTABLE_EXPORT
+#      define GTSAM_UNSTABLE_EXTERN_EXPORT extern
+#    endif /* GTSAM_UNSTABLE_IMPORT_STATIC */
+#  endif /* GTSAM_UNSTABLE_EXPORTS */
+#else /* _WIN32 */
 #  define GTSAM_UNSTABLE_EXPORT
 #  define GTSAM_UNSTABLE_EXTERN_EXPORT extern
-//#endif
+#endif
+