diff --git a/Mesh_3/include/CGAL/Mesh_polyhedron_3.h b/Mesh_3/include/CGAL/Mesh_polyhedron_3.h
index bc666e097bd..b394bbcd317 100644
--- a/Mesh_3/include/CGAL/Mesh_polyhedron_3.h
+++ b/Mesh_3/include/CGAL/Mesh_polyhedron_3.h
@@ -35,8 +35,6 @@
 
 #include <set>
 
-#include <CGAL/Polygon_mesh_processing/properties.h>
-
 namespace CGAL {
 namespace Mesh_3 {
 
@@ -216,220 +214,6 @@ struct Mesh_polyhedron_3
   typedef Polyhedron_3<Gt, Mesh_3::Mesh_polyhedron_items<Patch_id> > type;
   typedef type Type;
 };
-
-template<typename Polyhedron, typename Handle>
-struct Time_stamp_pmap
-{
-  typedef std::size_t&                   reference;
-  typedef std::size_t                    value_type;
-  typedef Handle                         key_type;
-  typedef boost::writable_property_map_tag category;
-
-  friend std::size_t get(const Time_stamp_pmap&, key_type h)
-  {
-    return h->time_stamp();
-  }
-  
-  friend void put(const Time_stamp_pmap&, key_type h,
-                        std::size_t ts)
-  {
-     h->set_time_stamp(ts);
-  }
-
-};
-
-
-template <typename Gt, typename Patch_id>
-struct Patch_id_pmap {
-
-  typedef typename Mesh_polyhedron_3<Gt,Patch_id>::type Polyhedron;
-  typedef typename Polyhedron::Face_handle key_type;
-  typedef typename Polyhedron::Facet::Patch_id value_type;
-  typedef value_type reference;
-  typedef boost::writable_property_map_tag                          category;
-
-  friend Patch_id get(const Patch_id_pmap&, key_type h)
-  {
-    return h->patch_id();
-  }
-
-  friend void put(const Patch_id_pmap&, key_type h,
-                  Patch_id pid)
-  {
-     h->set_patch_id(pid);
-  }
-
-};
-
-
-template <typename Gt, typename Patch_id>
-inline Patch_id_pmap<Gt,Patch_id> 
-get(CGAL::face_patch_id_t<Patch_id>,
-    const Polyhedron_3<Gt, Mesh_3::Mesh_polyhedron_items<Patch_id> >&)
-{
-  return Patch_id_pmap<Gt,Patch_id>();
-}
-
-
-namespace internal{
-BOOST_MPL_HAS_XXX_TRAIT_DEF(Plane_3)
-}
-
-template <typename Gt>
-struct Get_static_property_map {
-  typedef CGAL::static_property_map<typename boost::graph_traits<Polyhedron_3<Gt,
-  Mesh_3::Mesh_polyhedron_items<int> > >::face_descriptor,std::pair<int,int> > type;
-};
-
-template <typename Gt >
-typename boost::lazy_enable_if<
-internal::has_Plane_3<Gt>,
-Get_static_property_map<Gt>
->::type
-  inline get(CGAL::face_patch_id_t<void>, Polyhedron_3<Gt,
-             Mesh_3::Mesh_polyhedron_items<int> >& )
-{
-  typedef CGAL::static_property_map<typename boost::graph_traits<Polyhedron_3<Gt,
-      Mesh_3::Mesh_polyhedron_items<int> > >::face_descriptor,std::pair<int,int> > Pmap;
-  
-  return Pmap(std::make_pair(0,1)); 
-}
-
-
-template <typename Gt, typename Patch_id>
-struct vertex_num_feature_edges_pmap {
-
-  typedef typename Mesh_polyhedron_3<Gt,Patch_id>::type Polyhedron;
-  typedef typename Polyhedron::Vertex_handle key_type;
-  typedef int value_type;
-  friend int get(const vertex_num_feature_edges_pmap&, key_type h)
-  {
-    return h->nb_of_feature_edges;
-  }
-
-  friend void put(const vertex_num_feature_edges_pmap&, key_type h, int n)
-  {
-     h->nb_of_feature_edges = n;
-  }
-
-};
-
-
-template <typename Gt, typename Patch_id>
-inline vertex_num_feature_edges_pmap<Gt,Patch_id>
-get(vertex_num_feature_edges_t,
-    const Polyhedron_3<Gt, Mesh_3::Mesh_polyhedron_items<Patch_id> >&)
-{
-  return vertex_num_feature_edges_pmap<Gt,Patch_id>();
-}
-
-
-template <typename Gt, typename Patch_id>
-struct Is_feature_pmap {
-  typedef typename Mesh_polyhedron_3<Gt,Patch_id>::type Polyhedron;
-  typedef typename Polyhedron::Halfedge_handle key_type;
-  typedef bool value_type;
-
-  friend bool get(const Is_feature_pmap&, key_type h)
-  {
-    return h->is_feature_edge();
-  }
-
-  friend void put(const Is_feature_pmap&, key_type h, bool b)
-  {
-     h->set_feature_edge(b);
-  }
-
-};
-
-
-template <typename Gt, typename Patch_id>
-inline Is_feature_pmap<Gt,Patch_id>
-get(halfedge_is_feature_t,
-    const Polyhedron_3<Gt, Mesh_3::Mesh_polyhedron_items<Patch_id> >&)
-{
-  return Is_feature_pmap<Gt,Patch_id> ();
-}
-
-
-template <typename Gt, typename Patch_id>
-struct vertex_incident_patches_pmap {
-  typedef typename Mesh_polyhedron_3<Gt,Patch_id>::type Polyhedron;
-  typedef typename Polyhedron::Vertex_handle key_type;
-  typedef typename std::set<Patch_id> value_type;
-  typedef typename boost::read_write_property_map_tag category;
-
-  friend value_type get(const vertex_incident_patches_pmap&, const key_type& h)
-  {
-    return h->incident_patches_ids_set();
-  }
-
-  friend void put(const vertex_incident_patches_pmap&, const key_type& k , value_type& v)
-  {
-    BOOST_FOREACH(Patch_id n, v)
-        k->add_incident_patch(n);
-  }
-
-};
-
-template <typename Gt, typename Patch_id>
-inline vertex_incident_patches_pmap<Gt,Patch_id>
-get(CGAL::vertex_incident_patches_t<Patch_id>,
-    const Polyhedron_3<Gt, Mesh_3::Mesh_polyhedron_items<Patch_id> >&)
-{
-  return vertex_incident_patches_pmap<Gt,Patch_id>();
-}
-
 } // end namespace CGAL
 
-namespace boost {
-
-  template <typename Gt, typename Patch_id>
-  struct property_map<CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> >, CGAL::face_patch_id_t<Patch_id> >
-  {
-    typedef CGAL::Patch_id_pmap<Gt,Patch_id> type;
-  };
-
-  template <typename Gt, typename Patch_id>
-  struct property_map<CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> >, CGAL::vertex_num_feature_edges_t>
-  {
-    typedef CGAL::vertex_num_feature_edges_pmap<Gt,Patch_id> type;
-  };
-
-  template <typename Gt, typename Patch_id>
-  struct property_map<CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> >, CGAL::halfedge_is_feature_t>
-  {
-    typedef CGAL::Is_feature_pmap<Gt,Patch_id> type;
-  };
-
-  template <typename Gt, typename Patch_id>
-  struct property_map<CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> >, CGAL::vertex_incident_patches_t<Patch_id> >
-  {
-    typedef CGAL::vertex_incident_patches_pmap<Gt,Patch_id> type;
-  };
-
-  template <typename Gt, typename Patch_id>
-  struct property_map<CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> >, CGAL::vertex_time_stamp_t>
-  {
-    typedef CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> > Graph;
-    typedef CGAL::Time_stamp_pmap<Graph, typename boost::graph_traits<Graph>::vertex_descriptor> type;
-  };
-
-
-  template <typename Gt, typename Patch_id>
-  struct property_map<CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> >, CGAL::halfedge_time_stamp_t>
-  {
-    typedef CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> > Graph;
-    typedef CGAL::Time_stamp_pmap<Graph, typename boost::graph_traits<Graph>::halfedge_descriptor> type;
-  };
-
-
-  template <typename Gt, typename Patch_id>
-  struct property_map<CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> >, CGAL::face_time_stamp_t>
-  {
-    typedef CGAL::Polyhedron_3<Gt, CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id> > Graph;
-    typedef CGAL::Time_stamp_pmap<Graph, typename boost::graph_traits<Graph>::face_descriptor> type;
-  };
-} // namespace boost
-
 #endif // CGAL_MESH_POLYHEDRON_3_H
diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
index 3bc1ad325d6..655916d2778 100644
--- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
@@ -40,6 +40,7 @@
 #include <CGAL/Mesh_3/Detect_polylines_in_polyhedra.h>
 #include <CGAL/Mesh_3/Polyline_with_context.h>
 #include <CGAL/Polygon_mesh_processing/Detect_features_in_polyhedra.h>
+#include <CGAL/boost/graph/PMP_properties_Polyhedron_3.h>
 
 #include <CGAL/enum.h>
 #include <CGAL/IO/Polyhedron_iostream.h>
diff --git a/Polyhedron/include/CGAL/boost/graph/PMP_properties_Polyhedron_3.h b/Polyhedron/include/CGAL/boost/graph/PMP_properties_Polyhedron_3.h
new file mode 100644
index 00000000000..440a771ca55
--- /dev/null
+++ b/Polyhedron/include/CGAL/boost/graph/PMP_properties_Polyhedron_3.h
@@ -0,0 +1,314 @@
+// Copyright (c) 2017  GeometryFactory (France).  All rights reserved.
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// $URL$
+// $Id$
+//
+//
+// Author(s)     : Andreas Fabri
+
+#ifndef CGAL_PMP_PROPERTIES_POLYHEDRON_3_H
+#define CGAL_PMP_PROPERTIES_POLYHEDRON_3_H
+
+#include <CGAL/license/Polyhedron.h>
+
+#include <CGAL/Polygon_mesh_processing/properties.h>
+#include <CGAL/boost/graph/properties_Polyhedron_3.h>
+
+#define CGAL_HDS_PARAM_ template < class Traits, class Items, class Alloc> class HDS
+
+namespace CGAL {
+
+struct Polyhedron_face_time_stamp_pmap
+{
+  typedef void                               key_type;
+  typedef std::size_t                        value_type;
+  typedef std::size_t                        reference;
+  typedef boost::read_write_property_map_tag category;
+};
+
+template <typename Handle_type>
+std::size_t get(Polyhedron_face_time_stamp_pmap, Handle_type h)
+{
+  return h->time_stamp();
+}
+
+template <typename Handle_type>
+void put(Polyhedron_face_time_stamp_pmap, Handle_type h,
+         std::size_t ts)
+{
+  h->set_time_stamp(ts);
+}
+
+template <>
+struct Polyhedron_property_map<CGAL::vertex_time_stamp_t>
+{
+  template<class Gt, class I, CGAL_HDS_PARAM_, class A>
+  struct bind_
+  {
+    typedef Polyhedron_face_time_stamp_pmap type;
+    typedef type const_type;
+  };
+};
+
+template <>
+struct Polyhedron_property_map<CGAL::halfedge_time_stamp_t>
+  : public Polyhedron_property_map<CGAL::vertex_time_stamp_t>
+{};
+
+template <>
+struct Polyhedron_property_map<CGAL::face_time_stamp_t>
+  : public Polyhedron_property_map<CGAL::vertex_time_stamp_t>
+{};
+
+
+template <typename Patch_id>
+struct Polyhedron_face_patch_id_pmap {
+  typedef void                               key_type;
+  typedef Patch_id                           value_type;
+  typedef Patch_id                           reference;
+  typedef boost::read_write_property_map_tag category;
+};
+
+template <typename Patch_id, typename Handle_type>
+Patch_id get(Polyhedron_face_patch_id_pmap<Patch_id>, Handle_type h)
+{
+  return h->patch_id();
+}
+
+template <typename Patch_id, typename Handle_type>
+void put(Polyhedron_face_patch_id_pmap<Patch_id>, Handle_type h,
+         Patch_id pid)
+{
+  h->set_patch_id(pid);
+}
+
+template <typename Patch_id>
+struct Polyhedron_property_map<CGAL::face_patch_id_t<Patch_id> >
+{
+  template<class Gt, class I, CGAL_HDS_PARAM_, class A>
+  struct bind_
+  {
+    typedef Polyhedron_face_patch_id_pmap<Patch_id> type;
+    typedef type const_type;
+  };
+};
+
+
+
+namespace internal{
+BOOST_MPL_HAS_XXX_TRAIT_DEF(Plane_3)
+
+template <class Gt, class I, CGAL_HDS_PARAM_, class A>
+struct Get_static_property_map {
+  typedef boost::graph_traits<CGAL::Polyhedron_3<Gt,I,HDS,A> > Graph_traits;
+  typedef CGAL::static_property_map<typename Graph_traits::face_descriptor,
+                                    std::pair<int,int> > type;
+};
+
+} // end namespace internal
+
+template <class Gt, class I, CGAL_HDS_PARAM_, class A>
+typename boost::lazy_enable_if<
+  internal::has_Plane_3<Gt>,
+  internal::Get_static_property_map<Gt, I, HDS, A>
+  >::type
+get(CGAL::face_patch_id_t<void>, const Polyhedron_3<Gt,I,HDS,A>&)
+{
+  typedef typename internal::Get_static_property_map<Gt, I, HDS, A>::type Pmap;
+  return Pmap( std::pair<int,int>(0,1) );
+}
+
+template <>
+struct Polyhedron_property_map<CGAL::face_patch_id_t<void> >
+{
+  template<class Gt, class I, CGAL_HDS_PARAM_, class A>
+  struct bind_
+  {
+    typedef typename internal::Get_static_property_map<Gt,I,HDS,A>::type type;
+    typedef type const_type;
+  };
+};
+
+
+
+struct Polyhedron_num_feature_edges_pmap {
+  typedef void                               key_type;
+  typedef int                                value_type;
+  typedef int                                reference;
+  typedef boost::read_write_property_map_tag category;
+};
+
+template <typename Handle_type>
+int get(Polyhedron_num_feature_edges_pmap, Handle_type h)
+{
+  return h->nb_of_feature_edges;
+}
+
+template <typename Handle_type>
+void put(Polyhedron_num_feature_edges_pmap, Handle_type h, int n)
+{
+  h->nb_of_feature_edges = n;
+}
+
+
+template <>
+struct Polyhedron_property_map<CGAL::vertex_num_feature_edges_t>
+{
+  template<class Gt, class I, CGAL_HDS_PARAM_, class A>
+  struct bind_
+  {
+    typedef Polyhedron_num_feature_edges_pmap type;
+    typedef type const_type;
+  };
+};
+
+struct Polyhedron_is_feature_edge_pmap {
+  typedef void                               key_type;
+  typedef bool                               value_type;
+  typedef bool                               reference;
+  typedef boost::read_write_property_map_tag category;
+};
+
+template <typename Handle_type>
+bool get(Polyhedron_is_feature_edge_pmap, Handle_type h)
+{
+  return h->is_feature_edge();
+}
+
+template <typename Handle_type>
+void put(Polyhedron_is_feature_edge_pmap, Handle_type h, bool b)
+{
+  h->set_feature_edge(b);
+}
+
+template <>
+struct Polyhedron_property_map<CGAL::halfedge_is_feature_t>
+{
+  template<class Gt, class I, CGAL_HDS_PARAM_, class A>
+  struct bind_
+  {
+    typedef Polyhedron_is_feature_edge_pmap type;
+    typedef type const_type;
+  };
+};
+
+// template <typename Gt, typename Patch_id>
+// inline Is_feature_pmap<Gt,Patch_id>
+// get(halfedge_is_feature_t,
+//     const Polyhedron_3<Gt, Mesh_3::Mesh_polyhedron_items<Patch_id> >&)
+// {
+//   return Is_feature_pmap<Gt,Patch_id> ();
+// }
+
+
+template <typename Patch_id>
+struct Polyhedron_incident_patches_pmap {
+  typedef void                               key_type;
+  typedef std::set<Patch_id>                 value_type;
+  typedef std::set<Patch_id>&                reference;
+  typedef boost::read_write_property_map_tag category;
+};
+
+template <typename Patch_id, typename Handle_type>
+std::set<Patch_id>& get(Polyhedron_incident_patches_pmap<Patch_id>,
+                        Handle_type h)
+{
+  return h->incident_patches_ids_set();
+}
+
+template <typename Patch_id, typename Handle_type>
+void put(Polyhedron_incident_patches_pmap<Patch_id>,
+         Handle_type h, const std::set<Patch_id>& v)
+{
+  BOOST_FOREACH(Patch_id n, v)
+    h->add_incident_patch(n);
+}
+
+template <typename Patch_id>
+struct Polyhedron_property_map<CGAL::vertex_incident_patches_t<Patch_id> >
+{
+  template<class Gt, class I, CGAL_HDS_PARAM_, class A>
+  struct bind_
+  {
+    typedef Polyhedron_incident_patches_pmap<Patch_id> type;
+    typedef type const_type;
+  };
+};
+
+// template <typename Gt, typename Patch_id>
+// inline vertex_incident_patches_pmap<Gt,Patch_id>
+// get(CGAL::vertex_incident_patches_t<Patch_id>,
+//     const Polyhedron_3<Gt, Mesh_3::Mesh_polyhedron_items<Patch_id> >&)
+// {
+//   return vertex_incident_patches_pmap<Gt,Patch_id>();
+// }
+
+} // end namespace CGAL
+
+namespace boost {
+
+  // template <class Gt, class I, CGAL_HDS_PARAM_, class A>
+  // struct property_map<CGAL::Polyhedron_3<Gt,I,HDS,A>,
+  //                     CGAL::vertex_time_stamp_t>
+  // {
+  //   typedef CGAL::Polyhedron_face_time_stamp_pmap type;
+  // };
+
+  // template <class Gt, class I, CGAL_HDS_PARAM_, class A>
+  // struct property_map<CGAL::Polyhedron_3<Gt,I,HDS,A>,
+  //                     CGAL::halfedge_time_stamp_t>
+  // {
+  //   typedef CGAL::Polyhedron_face_time_stamp_pmap type;
+  // };
+
+  // template <class Gt, class I, CGAL_HDS_PARAM_, class A>
+  // struct property_map<CGAL::Polyhedron_3<Gt,I,HDS,A>,
+  //                     CGAL::face_time_stamp_t>
+  // {
+  //   typedef CGAL::Polyhedron_face_time_stamp_pmap type;
+  // };
+
+  // template <class Gt, class I, CGAL_HDS_PARAM_, class A, typename Patch_id>
+  // struct property_map<CGAL::Polyhedron_3<Gt,I,HDS,A>,
+  //                     CGAL::face_patch_id_t<Patch_id> >
+  // {
+  //   typedef CGAL::Polyhedron_face_patch_id_pmap<Patch_id> type;
+  // };
+
+  // template <class Gt, class I, CGAL_HDS_PARAM_, class A>
+  // struct property_map<CGAL::Polyhedron_3<Gt,I,HDS,A>,
+  //                     CGAL::vertex_num_feature_edges_t>
+  // {
+  //   typedef CGAL::Polyhedron_num_feature_edges_pmap type;
+  // };
+
+  // template <class Gt, class I, CGAL_HDS_PARAM_, class A>
+  // struct property_map<CGAL::Polyhedron_3<Gt,I,HDS,A>,
+  //                     CGAL::halfedge_is_feature_t>
+  // {
+  //   typedef CGAL::Polyhedron_is_feature_edge_pmap type;
+  // };
+
+  // template <class Gt, class I, CGAL_HDS_PARAM_, class A, typename Patch_id>
+  // struct property_map<CGAL::Polyhedron_3<Gt,I,HDS,A>,
+  //                     CGAL::vertex_incident_patches_t<Patch_id> >
+  // {
+  //   typedef CGAL::Polyhedron_incident_patches_pmap<Patch_id> type;
+  // };
+
+} // namespace boost
+
+#undef CGAL_HDS_PARAM_
+
+#endif // CGAL_PMP_PROPERTIES_POLYHEDRON_3_H