diff --git a/include/boost/python/detail/exception_handler.hpp b/include/boost/python/detail/exception_handler.hpp
index c50be2ec..7f49868b 100644
--- a/include/boost/python/detail/exception_handler.hpp
+++ b/include/boost/python/detail/exception_handler.hpp
@@ -11,7 +11,7 @@
 
 namespace boost { namespace python { namespace detail {
 
-struct BOOST_PYTHON_DECL exception_handler;
+struct BOOST_PYTHON_DECL_FORWARD exception_handler;
 
 typedef function2<bool, exception_handler const&, function0<void> const&> handler_function;
 
diff --git a/include/boost/python/detail/wrapper_base.hpp b/include/boost/python/detail/wrapper_base.hpp
index 99a5d7a5..76161682 100755
--- a/include/boost/python/detail/wrapper_base.hpp
+++ b/include/boost/python/detail/wrapper_base.hpp
@@ -14,7 +14,7 @@ class override;
 
 namespace detail
 {
-  class BOOST_PYTHON_DECL wrapper_base;
+  class BOOST_PYTHON_DECL_FORWARD wrapper_base;
   
   namespace wrapper_base_ // ADL disabler
   {