diff --git a/BGL/doc/BGL/BGL.txt b/BGL/doc/BGL/BGL.txt
index 8e90fb6bda3..34b833b28b8 100644
--- a/BGL/doc/BGL/BGL.txt
+++ b/BGL/doc/BGL/BGL.txt
@@ -676,7 +676,9 @@ using one of the following tags:
 
 - `CGAL::Alpha_expansion_boost_adjacency_list_tag` (default)
 - `CGAL::Alpha_expansion_boost_compressed_sparse_raw_tag`
-- `CGAL::Alpha_expansion_boost_MaxFlow_tag`
+- `CGAL::Alpha_expansion_boost_MaxFlow_tag`, released under GPL
+  license and provided by the \ref PkgSurfaceMeshSegmentationRef
+  package
 
 All these implementation produce the exact same result but behave
 differently in terms of timing and memory (see
diff --git a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h b/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h
index 35930c748ac..ea5c85f4ed9 100644
--- a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h
+++ b/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h
@@ -490,19 +490,19 @@ double alpha_expansion_graphcut (const InputGraph& input_graph,
    \tparam InputGraph a model of `Graph`
 
    \tparam EdgeWeightMap a model of `ReadablePropertyMap` with
-   `boost::graph_traits<Graph>::%edge_descriptor` as key and `double`
+   `boost::graph_traits<InputGraph>::%edge_descriptor` as key and `double`
    as value.
 
    \tparam VertexIndexMap a model of `ReadablePropertyMap` with
-   `boost::graph_traits<Graph>::%vertex_descriptor` as key and
+   `boost::graph_traits<InputGraph>::%vertex_descriptor` as key and
    `std::size_t` as value.
 
    \tparam VertexLabelCostMap a model of `ReadablePropertyMap`
-   with `boost::graph_traits<Graph>::%vertex_descriptor` as key and
+   with `boost::graph_traits<InputGraph>::%vertex_descriptor` as key and
    `std::vector<double>` as value.
 
    \tparam VertexLabelMap a model of `ReadWritePropertyMap` with 
-   `boost::graph_traits<Graph>::%vertex_descriptor` as key and
+   `boost::graph_traits<InputGraph>::%vertex_descriptor` as key and
    `std::size_t` as value.
 
    \tparam AlphaExpansionImplementationTag optional tag used to select
@@ -513,11 +513,10 @@ double alpha_expansion_graphcut (const InputGraph& input_graph,
    - `CGAL::Alpha_expansion_boost_compressed_sparse_row_tag`
    - `CGAL::Alpha_expansion_MaxFlow_tag`
 
-   \note The `MaxFlow` implementation is provided separately under a
-   GPL license (whereas the rest of the package including this
-   function is under LGPL). The header
-   `<CGAL/boost/graph/alpha_shape_graphcut_maxflow_gpl.h>` should be
-   included if users want to use this implementation.
+   \note The `MaxFlow` implementation is provided by the \ref PkgSurfaceMeshSegmentationRef
+   under GPL license. The header
+   `<CGAL/boost/graph/alpha_shape_graphcut_maxflow.h>`
+   should be included if users want to use this implementation.
 
    \param input_graph the input graph.
 
diff --git a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut_maxflow_gpl.h b/Surface_mesh_segmentation/include/CGAL/boost/graph/alpha_expansion_graphcut_maxflow.h
similarity index 89%
rename from BGL/include/CGAL/boost/graph/alpha_expansion_graphcut_maxflow_gpl.h
rename to Surface_mesh_segmentation/include/CGAL/boost/graph/alpha_expansion_graphcut_maxflow.h
index c9457e816cf..41b105cbe93 100644
--- a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut_maxflow_gpl.h
+++ b/Surface_mesh_segmentation/include/CGAL/boost/graph/alpha_expansion_graphcut_maxflow.h
@@ -1,4 +1,4 @@
-#ifndef CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_MAXFLOW_GPL_H
+#ifndef CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_MAXFLOW_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@@ -19,7 +19,11 @@
 //
 // Author(s)     : Ilker O. Yaz, Simon Giraudot
 
-#define CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_MAXFLOW_GPL_H
+#define CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_MAXFLOW_H
+
+#include <CGAL/license/Surface_mesh_segmentation.h>
+
+/// \cond SKIP_IN_MANUAL
 
 #include <CGAL/boost/graph/alpha_expansion_graphcut.h>
 
@@ -94,4 +98,6 @@ public:
 
 }//namespace CGAL
 
-#endif //CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_MAXFLOW_GPL_H
+/// \endcond
+
+#endif //CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_MAXFLOW_H