diff --git a/include/boost/mpi/collectives/all_reduce.hpp b/include/boost/mpi/collectives/all_reduce.hpp
index fbb4090..9a62d3b 100644
--- a/include/boost/mpi/collectives/all_reduce.hpp
+++ b/include/boost/mpi/collectives/all_reduce.hpp
@@ -27,7 +27,7 @@ namespace detail {
   template<typename T, typename Op>
   void
   all_reduce_impl(const communicator& comm, const T* in_values, int n,
-                  T* out_values, Op op, mpl::true_ /*is_mpi_op*/,
+                  T* out_values, Op /*op*/, mpl::true_ /*is_mpi_op*/,
                   mpl::true_ /*is_mpi_datatype*/)
   {
     BOOST_MPI_CHECK_RESULT(MPI_Allreduce,
diff --git a/include/boost/mpi/detail/forward_skeleton_iarchive.hpp b/include/boost/mpi/detail/forward_skeleton_iarchive.hpp
index 4004f40..b5dfed0 100644
--- a/include/boost/mpi/detail/forward_skeleton_iarchive.hpp
+++ b/include/boost/mpi/detail/forward_skeleton_iarchive.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_MPI_DETAIL_FORWARD_SKELETON_IARCHIVE_HPP
 #define BOOST_MPI_DETAIL_FORWARD_SKELETON_IARCHIVE_HPP
 
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/iserializer.hpp>
diff --git a/include/boost/mpi/detail/forward_skeleton_oarchive.hpp b/include/boost/mpi/detail/forward_skeleton_oarchive.hpp
index 07c0f73..633189f 100644
--- a/include/boost/mpi/detail/forward_skeleton_oarchive.hpp
+++ b/include/boost/mpi/detail/forward_skeleton_oarchive.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_MPI_DETAIL_FORWARD_SKELETON_OARCHIVE_HPP
 #define BOOST_MPI_DETAIL_FORWARD_SKELETON_OARCHIVE_HPP
 
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/oserializer.hpp>
diff --git a/include/boost/mpi/detail/ignore_skeleton_oarchive.hpp b/include/boost/mpi/detail/ignore_skeleton_oarchive.hpp
index d945375..0fec02e 100644
--- a/include/boost/mpi/detail/ignore_skeleton_oarchive.hpp
+++ b/include/boost/mpi/detail/ignore_skeleton_oarchive.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_MPI_DETAIL_IGNORE_SKELETON_OARCHIVE_HPP
 #define BOOST_MPI_DETAIL_IGNORE_SKELETON_OARCHIVE_HPP
 
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/common_oarchive.hpp>
diff --git a/include/boost/mpi/packed_iarchive.hpp b/include/boost/mpi/packed_iarchive.hpp
index 1500bb0..6b49def 100644
--- a/include/boost/mpi/packed_iarchive.hpp
+++ b/include/boost/mpi/packed_iarchive.hpp
@@ -100,7 +100,7 @@ public:
 
   // Load it directly using the primnivites
   template<class T>
-  void load_override(T& x, int version, mpl::true_)
+  void load_override(T& x, int /*version*/, mpl::true_)
   {
     iprimitive::load(x);
   }
diff --git a/include/boost/mpi/packed_oarchive.hpp b/include/boost/mpi/packed_oarchive.hpp
index b5a97f5..274b1f0 100644
--- a/include/boost/mpi/packed_oarchive.hpp
+++ b/include/boost/mpi/packed_oarchive.hpp
@@ -90,7 +90,7 @@ public:
 
   // Save it directly using the primnivites
   template<class T>
-  void save_override(T const& x, int version, mpl::true_)
+  void save_override(T const& x, int /*version*/, mpl::true_)
   {
     oprimitive::save(x);
   }