diff --git a/gtsam/base/TestableAssertions.h b/gtsam/base/TestableAssertions.h
index 0e6e1c276..c86fbb6d2 100644
--- a/gtsam/base/TestableAssertions.h
+++ b/gtsam/base/TestableAssertions.h
@@ -85,7 +85,7 @@ bool assert_equal(const V& expected, const boost::optional<const V&>& actual, do
  * \deprecated: use container equals instead
  */
 template<class V>
-bool assert_equal(const std::vector<V>& expected, const std::vector<V>& actual, double tol = 1e-9) {
+bool GTSAM_DEPRECATED assert_equal(const std::vector<V>& expected, const std::vector<V>& actual, double tol = 1e-9) {
   bool match = true;
   if (expected.size() != actual.size())
     match = false;
diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h
index 35c68c4b4..a057da46b 100644
--- a/gtsam/base/Vector.h
+++ b/gtsam/base/Vector.h
@@ -207,14 +207,14 @@ inline double inner_prod(const V1 &a, const V2& b) {
  * BLAS Level 1 scal: x <- alpha*x
  * \deprecated: use operators instead
  */
-inline void scal(double alpha, Vector& x) { x *= alpha; }
+inline void GTSAM_DEPRECATED scal(double alpha, Vector& x) { x *= alpha; }
 
 /**
  * BLAS Level 1 axpy: y <- alpha*x + y
  * \deprecated: use operators instead
  */
 template<class V1, class V2>
-inline void axpy(double alpha, const V1& x, V2& y) {
+inline void GTSAM_DEPRECATED axpy(double alpha, const V1& x, V2& y) {
   assert (y.size()==x.size());
   y += alpha * x;
 }
diff --git a/gtsam/base/types.h b/gtsam/base/types.h
index aaada3cee..a0d24f1a6 100644
--- a/gtsam/base/types.h
+++ b/gtsam/base/types.h
@@ -34,6 +34,14 @@
 #include <tbb/scalable_allocator.h>
 #endif
 
+#if defined(__GNUC__) || defined(__clang__)
+#define GTSAM_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#define GTSAM_DEPRECATED __declspec(deprecated)
+#else
+#define GTSAM_DEPRECATED
+#endif
+
 #ifdef GTSAM_USE_EIGEN_MKL_OPENMP
 #include <omp.h>
 #endif
diff --git a/gtsam/discrete/DiscreteConditional.cpp b/gtsam/discrete/DiscreteConditional.cpp
index ac7c58405..e3d187303 100644
--- a/gtsam/discrete/DiscreteConditional.cpp
+++ b/gtsam/discrete/DiscreteConditional.cpp
@@ -35,7 +35,7 @@ using namespace std;
 namespace gtsam {
 
 // Instantiate base class
-template class Conditional<DecisionTreeFactor, DiscreteConditional> ;
+template class GTSAM_EXPORT Conditional<DecisionTreeFactor, DiscreteConditional> ;
 
 /* ******************************************************************************** */
 DiscreteConditional::DiscreteConditional(const size_t nrFrontals,
diff --git a/gtsam/inference/EliminateableFactorGraph.h b/gtsam/inference/EliminateableFactorGraph.h
index 3c51d8f84..579eed7f9 100644
--- a/gtsam/inference/EliminateableFactorGraph.h
+++ b/gtsam/inference/EliminateableFactorGraph.h
@@ -290,7 +290,7 @@ namespace gtsam {
   public:
   #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
     /** \deprecated ordering and orderingType shouldn't both be specified */
-    boost::shared_ptr<BayesNetType> eliminateSequential(
+    boost::shared_ptr<BayesNetType> GTSAM_DEPRECATED eliminateSequential(
       const Ordering& ordering,
       const Eliminate& function,
       OptionalVariableIndex variableIndex,
@@ -299,7 +299,7 @@ namespace gtsam {
       }
     
     /** \deprecated orderingType specified first for consistency */
-    boost::shared_ptr<BayesNetType> eliminateSequential(
+    boost::shared_ptr<BayesNetType> GTSAM_DEPRECATED eliminateSequential(
       const Eliminate& function,
       OptionalVariableIndex variableIndex = boost::none,
       OptionalOrderingType orderingType = boost::none) const {
@@ -307,7 +307,7 @@ namespace gtsam {
       }
 
     /** \deprecated ordering and orderingType shouldn't both be specified */
-    boost::shared_ptr<BayesTreeType> eliminateMultifrontal(
+    boost::shared_ptr<BayesTreeType> GTSAM_DEPRECATED eliminateMultifrontal(
       const Ordering& ordering,
       const Eliminate& function,
       OptionalVariableIndex variableIndex,
@@ -316,7 +316,7 @@ namespace gtsam {
       }
 
     /** \deprecated orderingType specified first for consistency */
-    boost::shared_ptr<BayesTreeType> eliminateMultifrontal(
+    boost::shared_ptr<BayesTreeType> GTSAM_DEPRECATED eliminateMultifrontal(
       const Eliminate& function,
       OptionalVariableIndex variableIndex = boost::none,
       OptionalOrderingType orderingType = boost::none) const {
@@ -324,7 +324,7 @@ namespace gtsam {
       }
 
     /** \deprecated */
-    boost::shared_ptr<BayesNetType> marginalMultifrontalBayesNet(
+    boost::shared_ptr<BayesNetType> GTSAM_DEPRECATED marginalMultifrontalBayesNet(
       boost::variant<const Ordering&, const KeyVector&> variables,
       boost::none_t,
       const Eliminate& function = EliminationTraitsType::DefaultEliminate,
@@ -333,7 +333,7 @@ namespace gtsam {
       }
 
     /** \deprecated */
-    boost::shared_ptr<BayesTreeType> marginalMultifrontalBayesTree(
+    boost::shared_ptr<BayesTreeType> GTSAM_DEPRECATED marginalMultifrontalBayesTree(
       boost::variant<const Ordering&, const KeyVector&> variables,
       boost::none_t,
       const Eliminate& function = EliminationTraitsType::DefaultEliminate,
diff --git a/gtsam/nonlinear/ExpressionFactor.h b/gtsam/nonlinear/ExpressionFactor.h
index b55d643aa..d22690cf3 100644
--- a/gtsam/nonlinear/ExpressionFactor.h
+++ b/gtsam/nonlinear/ExpressionFactor.h
@@ -305,7 +305,7 @@ struct traits<ExpressionFactorN<T, Args...>>
  * \deprecated Prefer the more general ExpressionFactorN<>.
  */
 template <typename T, typename A1, typename A2>
-class ExpressionFactor2 : public ExpressionFactorN<T, A1, A2> {
+class GTSAM_DEPRECATED ExpressionFactor2 : public ExpressionFactorN<T, A1, A2> {
 public:
   /// Destructor
   ~ExpressionFactor2() override {}
diff --git a/gtsam/nonlinear/Marginals.h b/gtsam/nonlinear/Marginals.h
index e73038db0..947274a97 100644
--- a/gtsam/nonlinear/Marginals.h
+++ b/gtsam/nonlinear/Marginals.h
@@ -133,15 +133,15 @@ protected:
 public:
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
   /** \deprecated argument order changed due to removing boost::optional<Ordering> */
-  Marginals(const NonlinearFactorGraph& graph, const Values& solution, Factorization factorization,
+  GTSAM_DEPRECATED Marginals(const NonlinearFactorGraph& graph, const Values& solution, Factorization factorization,
             const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
 
   /** \deprecated argument order changed due to removing boost::optional<Ordering> */
-  Marginals(const GaussianFactorGraph& graph, const Values& solution, Factorization factorization,
+  GTSAM_DEPRECATED Marginals(const GaussianFactorGraph& graph, const Values& solution, Factorization factorization,
             const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
 
   /** \deprecated argument order changed due to removing boost::optional<Ordering> */
-  Marginals(const GaussianFactorGraph& graph, const VectorValues& solution, Factorization factorization,
+  GTSAM_DEPRECATED Marginals(const GaussianFactorGraph& graph, const VectorValues& solution, Factorization factorization,
             const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
 #endif
 
diff --git a/gtsam/nonlinear/NonlinearFactorGraph.h b/gtsam/nonlinear/NonlinearFactorGraph.h
index 5b9ed4bb1..61cbbafb9 100644
--- a/gtsam/nonlinear/NonlinearFactorGraph.h
+++ b/gtsam/nonlinear/NonlinearFactorGraph.h
@@ -267,12 +267,12 @@ namespace gtsam {
 
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
     /** \deprecated */
-    boost::shared_ptr<HessianFactor> linearizeToHessianFactor(
+    boost::shared_ptr<HessianFactor> GTSAM_DEPRECATED linearizeToHessianFactor(
         const Values& values, boost::none_t, const Dampen& dampen = nullptr) const
       {return linearizeToHessianFactor(values, dampen);}
 
     /** \deprecated */
-    Values updateCholesky(const Values& values, boost::none_t,
+    Values GTSAM_DEPRECATED updateCholesky(const Values& values, boost::none_t,
                           const Dampen& dampen = nullptr) const
       {return updateCholesky(values, dampen);}
 #endif