diff --git a/.travis.yml b/.travis.yml
index 68f2e218ccd..7f319eec64b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,9 @@ compiler:
   - clang 
   - gcc 
 addons: 
-  apt: 
+  apt:
+    sources:
+      - sourceline: 'ppa:ppsspp/cmake'
     packages: 
       - zsh
       - cmake 
diff --git a/.travis/build_package.sh b/.travis/build_package.sh
index e4fa027e13d..4db46faba23 100755
--- a/.travis/build_package.sh
+++ b/.travis/build_package.sh
@@ -54,7 +54,11 @@ do
   if [ "$ARG" = "CHECK" ]
 	then
     zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
-
+    mkdir -p build-travis
+    pushd build-travis
+    cmake -DCGAL_ENABLE_CHECK_HEADERS=ON ../..
+    make -j2 check_headers
+    popd
   	#parse current matrix and check that no package has been forgotten
 	  old_IFS=$IFS
 	  IFS=$'\n'
diff --git a/.travis/template.txt b/.travis/template.txt
index 8cb7b7e5857..4f5fec1d660 100644
--- a/.travis/template.txt
+++ b/.travis/template.txt
@@ -18,7 +18,9 @@ compiler:
   - clang 
   - gcc 
 addons: 
-  apt: 
+  apt:
+    sources:
+      - sourceline: 'ppa:ppsspp/cmake'
     packages: 
       - zsh
       - cmake 
diff --git a/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h b/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
index 9d5c99d12b0..b1811992a5e 100644
--- a/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
+++ b/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
@@ -21,11 +21,12 @@
 #define CGAL_SPLIT_GRAPH_INTO_POLYLINES
 
 #include <map> 
-#include <set> 
+#include <vector>
+#include <utility>
 #include <boost/foreach.hpp>
 #include <boost/graph/adjacency_list.hpp>
-#include <iostream>
 #include <CGAL/assertions.h>
+#include <CGAL/tags.h>
 
 namespace CGAL {
 
diff --git a/Combinatorial_map/include/CGAL/Cell_attribute.h b/Combinatorial_map/include/CGAL/Cell_attribute.h
index 5d7b048a6fa..c6692f22e9e 100644
--- a/Combinatorial_map/include/CGAL/Cell_attribute.h
+++ b/Combinatorial_map/include/CGAL/Cell_attribute.h
@@ -20,6 +20,9 @@
 #ifndef CGAL_CELL_ATTRIBUTE_H
 #define CGAL_CELL_ATTRIBUTE_H 1
 
+#include <CGAL/tags.h>
+#include <CGAL/assertions.h>
+
 namespace CGAL {
 
   template <class, class, class, class>
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h
index 6ebb50f4503..3761d306f88 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h
@@ -20,6 +20,8 @@
 #ifndef CGAL_COMBINATORIAL_MAP_CONSTRUCTORS_H
 #define CGAL_COMBINATORIAL_MAP_CONSTRUCTORS_H 1
 
+#include <CGAL/config.h>
+
 #ifndef CGAL_NO_DEPRECATED_CODE
 
 namespace CGAL {
diff --git a/Combinatorial_map/include/CGAL/Dart.h b/Combinatorial_map/include/CGAL/Dart.h
index 04304ab8780..e2e9055ff90 100644
--- a/Combinatorial_map/include/CGAL/Dart.h
+++ b/Combinatorial_map/include/CGAL/Dart.h
@@ -21,6 +21,7 @@
 #define CGAL_DART_H 1
 
 #include <CGAL/assertions.h>
+#include <CGAL/tags.h>
 #include <CGAL/tuple.h>
 #include <bitset>
 
diff --git a/Envelope_3/include/CGAL/Env_sphere_traits_3.h b/Envelope_3/include/CGAL/Env_sphere_traits_3.h
index 107a6a2e22d..287e5f476d7 100644
--- a/Envelope_3/include/CGAL/Env_sphere_traits_3.h
+++ b/Envelope_3/include/CGAL/Env_sphere_traits_3.h
@@ -32,6 +32,7 @@
 #include <CGAL/Sphere_3.h>
 #include <CGAL/functions_on_signs.h>
 #include <CGAL/Envelope_3/Envelope_base.h>
+#include <CGAL/int.h>
 
 namespace CGAL {
 
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index 94e81674b45..f2694b3c55b 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -81,7 +81,7 @@ if ( CGAL_BRANCH_BUILD )
   foreach (package ${CGAL_CONFIGURED_PACKAGES})
     if (NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${package}")
       list(APPEND CGAL_WRONG_PACKAGES ${package})
-    elseif(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${package}/package_info")
+    elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/${package}/package_info/${package}/maintainer")
       list(APPEND CGAL_WRONG_PACKAGES ${package})
     endif()
   endforeach()
@@ -1151,12 +1151,28 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.")
         endif()
         foreach(header ${${package}_HEADERS})
           set(skip_hdr FALSE)
-          if(POLICY CMP0057
-              AND has_list_of_documented_headers
-              AND NOT header IN_LIST list_of_documented_headers
-              )
-            message(STATUS "Skip non-documented header \"${header}\".")
-            set(skip_hdr TRUE)
+          if(POLICY CMP0057)
+            if(has_list_of_documented_headers
+                AND NOT header IN_LIST list_of_documented_headers)
+              message(STATUS "Skip non-documented header \"${header}\".")
+              set(skip_hdr TRUE)
+            endif()
+          endif()
+          if(NOT QGLVIEWER_FOUND)
+            string(REGEX MATCH "CGAL/Three/.*" is_a_three_header ${header})
+            if(is_a_three_header)
+              message(STATUS "Skip Three header \"${header}\" because \
+QGLVIEWER_FOUND is false.")
+              set(skip_hdr TRUE)
+            endif()
+          endif()
+          if(NOT VTK_FOUND)
+            string(REGEX MATCH ".*vtk.*" is_a_vtk_header ${header})
+            if(is_a_vtk_header)
+              message(STATUS "Skip VTK header \"${header}\" because \
+VTK_FOUND is false.")
+              set(skip_hdr TRUE)
+            endif()
           endif()
           string(REGEX MATCH "CGAL/leda_.*" is_a_leda_header ${header})
           if(NOT LEDA_FOUND AND is_a_leda_header)
@@ -1164,11 +1180,12 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.")
 LEDA_FOUND is false.")
             set(skip_hdr TRUE)
           endif()
-          if(POLICY CMP0057
-              AND has_list_of_whitelisted_headers
-              AND header IN_LIST list_of_whitelisted_headers)
-            message(STATUS "Skip whitelisted header \"${header}\".")
-            set(skip_hdr TRUE)
+          if(POLICY CMP0057)
+            if(has_list_of_whitelisted_headers
+                AND header IN_LIST list_of_whitelisted_headers)
+              message(STATUS "Skip whitelisted header \"${header}\".")
+              set(skip_hdr TRUE)
+            endif()
           endif()
           if(NOT skip_hdr)
             string(REPLACE "/" "__" header2 "${header}")
diff --git a/Maintenance/package_info/Maintenance/maintainer b/Maintenance/package_info/Maintenance/maintainer
new file mode 100644
index 00000000000..15bc0c12a34
--- /dev/null
+++ b/Maintenance/package_info/Maintenance/maintainer
@@ -0,0 +1 @@
+Laurent Rineau <laurent.rineau@cgal.org>
diff --git a/Mesh_3/include/CGAL/Mesh_constant_domain_field_3.h b/Mesh_3/include/CGAL/Mesh_constant_domain_field_3.h
index 297467c0171..a5cceef5a19 100644
--- a/Mesh_3/include/CGAL/Mesh_constant_domain_field_3.h
+++ b/Mesh_3/include/CGAL/Mesh_constant_domain_field_3.h
@@ -31,6 +31,8 @@
 #include <map>
 #include <utility>
 #include <CGAL/internal/Has_nested_type_Bare_point.h>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 
 namespace CGAL {
 
diff --git a/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h b/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h
index 4459772577f..d8b253d504a 100644
--- a/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h
+++ b/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h
@@ -25,6 +25,7 @@
 #include <CGAL/license/Skin_surface_3.h>
 
 
+#include <CGAL/number_utils.h>
 #include <CGAL/determinant.h>
 #include <CGAL/enum.h>
 
diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
index 18b18849620..de8bf483071 100644
--- a/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
+++ b/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
@@ -25,7 +25,7 @@
 #include <CGAL/license/Triangulation_2.h>
 
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 
 namespace CGAL {