diff --git a/.travis/build_package.sh b/.travis/build_package.sh
index 55d911e91ff..8309c2f56e9 100755
--- a/.travis/build_package.sh
+++ b/.travis/build_package.sh
@@ -118,7 +118,7 @@ do
   fi
 
   IFS=$old_IFS
-  if [ -n "$TRAVIS_PULL_REQUEST" ]; then
+  if [ -n "$TRAVIS_PULL_REQUEST" ] && [ "$ARG" != Polyhedron_demo ]; then
     DO_IGNORE=FALSE
     . $ROOT/.travis/test_package.sh "$ROOT" "$ARG"
     echo "DO_IGNORE is $DO_IGNORE"
diff --git a/.travis/test_package.sh b/.travis/test_package.sh
index cd11a633491..930ba4fcdb3 100644
--- a/.travis/test_package.sh
+++ b/.travis/test_package.sh
@@ -5,7 +5,10 @@
 
 DO_IGNORE=FALSE
 cd $1
-
+if [ ! -f "$2/package_info/$ARG/dependencies" ];then 
+  echo "No dependencies found for $2"
+  return
+fi
 LIST_OF_FILES=$(git diff --name-only origin/master |cut -d/ -f1 |uniq |sort)
 LIST_OF_DEPS=$(cat "$2/package_info/$ARG/dependencies")
 echo "$LIST_OF_DEPS"
diff --git a/Installation/cmake/modules/list_of_whitelisted_headers.cmake b/Installation/cmake/modules/list_of_whitelisted_headers.cmake
index 84422e5dc46..d7d639341ac 100644
--- a/Installation/cmake/modules/list_of_whitelisted_headers.cmake
+++ b/Installation/cmake/modules/list_of_whitelisted_headers.cmake
@@ -6,6 +6,12 @@ set(list_of_whitelisted_headers_txt [=[
   CGAL/IO/read_ply_points.h
   CGAL/IO/write_ply_points.h
   CGAL/Surface_mesh_parameterization/internal/shortest_path.h
+exceptions.h
+Polyhedron_demo_plugin_interface.h
+Scene_interface.h    Scene_item_with_properties.h   Scene_zoomable_item_interface.h  Viewer_interface.h
+Polyhedron_demo_io_plugin_interface.h  Scene_draw_interface.h              Scene_item_config.h  Scene_print_item_interface.h   TextRenderer.h
+Polyhedron_demo_plugin_helper.h        Scene_group_item.h                  Scene_item.h         Scene_transparent_interface.h  Viewer_config.h
+
 ]=])
 
 separate_arguments(list_of_whitelisted_headers UNIX_COMMAND ${list_of_whitelisted_headers_txt})
diff --git a/Three/package_info/Three/dependencies b/Three/package_info/Three/dependencies
deleted file mode 100644
index 8288bc9862f..00000000000
--- a/Three/package_info/Three/dependencies
+++ /dev/null
@@ -1,9 +0,0 @@
- 
-Algebraic_foundations
-GraphicsView
-Installation
-Kernel_23
-Profiling_tools
-STL_Extension
-Stream_support
-Three