diff --git a/gtsam/base/DSFMap.h b/gtsam/base/DSFMap.h
index dfce185dc..1d6bfdefa 100644
--- a/gtsam/base/DSFMap.h
+++ b/gtsam/base/DSFMap.h
@@ -115,8 +115,8 @@ class DSFMap {
 /// Small utility class for representing a wrappable pairs of ints.
 class IndexPair : public std::pair<size_t,size_t> {
  public:
-  IndexPair(): std::pair<size_t,size_t>(0,0) {}
-  IndexPair(size_t i, size_t j) : std::pair<size_t,size_t>(i,j) {}
+  inline IndexPair(): std::pair<size_t,size_t>(0,0) {}
+  inline IndexPair(size_t i, size_t j) : std::pair<size_t,size_t>(i,j) {}
   inline size_t i() const { return first; };
   inline size_t j() const { return second; };
 };
diff --git a/gtsam/base/ThreadsafeException.h b/gtsam/base/ThreadsafeException.h
index ff82ff27c..15a76fbf1 100644
--- a/gtsam/base/ThreadsafeException.h
+++ b/gtsam/base/ThreadsafeException.h
@@ -22,6 +22,7 @@
 #include <gtsam/config.h> // for GTSAM_USE_TBB
 
 #include <boost/optional/optional.hpp>
+#include <gtsam/dllexport.h>
 #include <string>
 #include <typeinfo>
 
@@ -117,7 +118,7 @@ public:
 };
 
 /// Thread-safe runtime error exception
-class RuntimeErrorThreadsafe: public ThreadsafeException<RuntimeErrorThreadsafe> {
+class GTSAM_EXPORT RuntimeErrorThreadsafe: public ThreadsafeException<RuntimeErrorThreadsafe> {
 public:
   /// Construct with a string describing the exception
   RuntimeErrorThreadsafe(const std::string& description) :
diff --git a/gtsam/base/timing.h b/gtsam/base/timing.h
index 557500e73..972bb45f7 100644
--- a/gtsam/base/timing.h
+++ b/gtsam/base/timing.h
@@ -196,7 +196,7 @@ namespace gtsam {
     /**
      * Small class that calls internal::tic at construction, and internol::toc when destroyed
      */
-    class AutoTicToc {
+    class GTSAM_EXPORT AutoTicToc {
      private:
       size_t id_;
       const char* label_;
diff --git a/gtsam/nonlinear/NonlinearOptimizerParams.h b/gtsam/nonlinear/NonlinearOptimizerParams.h
index 9757cca73..65fdd1c92 100644
--- a/gtsam/nonlinear/NonlinearOptimizerParams.h
+++ b/gtsam/nonlinear/NonlinearOptimizerParams.h
@@ -31,7 +31,7 @@ namespace gtsam {
 /** The common parameters for Nonlinear optimizers.  Most optimizers
  * deriving from NonlinearOptimizer also subclass the parameters.
  */
-class NonlinearOptimizerParams {
+class GTSAM_EXPORT NonlinearOptimizerParams {
 public:
   /** See NonlinearOptimizerParams::verbosity */
   enum Verbosity {
@@ -52,7 +52,7 @@ public:
 
   virtual ~NonlinearOptimizerParams() {
   }
-  GTSAM_EXPORT virtual void print(const std::string& str = "") const;
+  virtual void print(const std::string& str = "") const;
 
   size_t getMaxIterations() const { return maxIterations; }
   double getRelativeErrorTol() const { return relativeErrorTol; }
@@ -68,8 +68,8 @@ public:
     verbosity = verbosityTranslator(src);
   }
 
-  GTSAM_EXPORT static Verbosity verbosityTranslator(const std::string &s) ;
-  GTSAM_EXPORT static std::string verbosityTranslator(Verbosity value) ;
+  static Verbosity verbosityTranslator(const std::string &s) ;
+  static std::string verbosityTranslator(Verbosity value) ;
 
   /** See NonlinearOptimizerParams::linearSolverType */
   enum LinearSolverType {
@@ -144,10 +144,10 @@ public:
   }
 
 private:
-  GTSAM_EXPORT std::string linearSolverTranslator(LinearSolverType linearSolverType) const;
-  GTSAM_EXPORT LinearSolverType linearSolverTranslator(const std::string& linearSolverType) const;
-  GTSAM_EXPORT std::string orderingTypeTranslator(Ordering::OrderingType type) const;
-  GTSAM_EXPORT Ordering::OrderingType orderingTypeTranslator(const std::string& type) const;
+  std::string linearSolverTranslator(LinearSolverType linearSolverType) const;
+  LinearSolverType linearSolverTranslator(const std::string& linearSolverType) const;
+  std::string orderingTypeTranslator(Ordering::OrderingType type) const;
+  Ordering::OrderingType orderingTypeTranslator(const std::string& type) const;
 };
 
 // For backward compatibility:
diff --git a/gtsam/symbolic/SymbolicBayesTree.h b/gtsam/symbolic/SymbolicBayesTree.h
index 5f7bdde7e..e28f28764 100644
--- a/gtsam/symbolic/SymbolicBayesTree.h
+++ b/gtsam/symbolic/SymbolicBayesTree.h
@@ -30,7 +30,7 @@ namespace gtsam {
 
   /* ************************************************************************* */
   /// A clique in a SymbolicBayesTree
-  class SymbolicBayesTreeClique :
+  class GTSAM_EXPORT SymbolicBayesTreeClique :
     public BayesTreeCliqueBase<SymbolicBayesTreeClique, SymbolicFactorGraph>
   {
   public:
@@ -45,7 +45,7 @@ namespace gtsam {
   /* ************************************************************************* */
   /// A Bayes tree that represents the connectivity between variables but is not associated with any
   /// probability functions.
-  class SymbolicBayesTree :
+  class GTSAM_EXPORT SymbolicBayesTree :
     public BayesTree<SymbolicBayesTreeClique>
   {
   private:
@@ -59,7 +59,7 @@ namespace gtsam {
     SymbolicBayesTree() {}
 
     /** check equality */
-    GTSAM_EXPORT bool equals(const This& other, double tol = 1e-9) const;
+    bool equals(const This& other, double tol = 1e-9) const;
 
   private:
     /** Serialization function */