Merge pull request #48 from grafikrobot/modular

Add support for modular build structure.
2026-01-19 04:12:13 +00:00 · 2025-06-19 00:10:07 +02:00
parent d87bd77187 43355d2bd4
commit 7173ef8810
65 changed files with 180 additions and 203 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
            buildtype: "boost"
            packages: ""
            packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-latest"
            container: "ubuntu:16.04"
            cxx: "g++"
            sources: ""
@@ -33,8 +33,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-5"
            packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-latest"
+            container: "ubuntu:18.04"
            cxx: "g++-5"
            sources: ""
            llvm_os: ""
@@ -45,8 +45,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-6"
            packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-latest"
+            container: "ubuntu:18.04"
            cxx: "g++-6"
            sources: ""
            llvm_os: ""
@@ -57,8 +57,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-7"
            packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-latest"
+            container: "ubuntu:18.04"
            cxx: "g++-7"
            sources: ""
            llvm_os: ""
@@ -67,10 +67,10 @@ jobs:
            cxxstd: "11,14,17"
          - name: "TOOLSET=clang CXXSTD=11,14,1z Job 4"
            buildtype: "boost"
-            packages: "libstdc++-4.9-dev clang"
+            packages: "clang"
            packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-latest"
+            container: "ubuntu:18.04"
            cxx: "clang++"
            sources: ""
            llvm_os: ""
@@ -79,22 +79,29 @@ jobs:
            cxxstd: "11,14,1z"

    runs-on: ${{ matrix.os }}
-    container: ${{ matrix.container }}
+    container:
+      image: ${{matrix.container}}
+      volumes:
+        - /node20217:/node20217:rw,rshared
+        - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}

    steps:
-      - name: Check if running in container
-        if: matrix.container != ''
-        run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
-      - name: If running in container, upgrade packages
-        if: matrix.container != ''
+      - name: Setup container environment
+        if: matrix.container
        run: |
-            apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev
-            sudo apt-add-repository ppa:git-core/ppa
-            sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
-            python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
-            sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
-            sudo python3 get-pip.py
-            sudo /usr/local/bin/pip install cmake
+          apt-get update
+          apt-get -y install sudo python3 git g++ curl xz-utils
+
+      - name: Install nodejs20glibc2.17
+        if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
+        run: |
+          curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
+          tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
+          ldd /__e/node20/bin/node
+
+      - name: Install packages
+        if: matrix.packages
+        run: sudo apt-get -y install ${{matrix.packages}}

      - uses: actions/checkout@v2

@@ -117,28 +124,6 @@ jobs:
          echo '==================================> PACKAGES'
          set -e
          if [ -n "$PACKAGES_TO_REMOVE" ]; then sudo apt-get purge -y $PACKAGES_TO_REMOVE; fi
-          echo ">>>>> APT: REPO.."
-          for i in {1..3}; do sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break || sleep 2; done
-          
-          if test -n "${LLVM_OS}" ; then
-              wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-              if test -n "${LLVM_VER}" ; then
-                  sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
-              else
-                  # Snapshot (i.e. trunk) build of clang
-                  sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS} main"
-              fi
-          fi
-          echo ">>>>> APT: UPDATE.."
-          sudo -E apt-get -o Acquire::Retries=3 update
-          if test -n "${SOURCES}" ; then
-              echo ">>>>> APT: INSTALL SOURCES.."
-              for SOURCE in $SOURCES; do
-                  sudo -E apt-add-repository ppa:$SOURCE
-              done
-          fi
-          echo ">>>>> APT: INSTALL ${PACKAGES}.."
-          sudo -E DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=3 -y --no-install-suggests --no-install-recommends install ${PACKAGES}

          echo '==================================> INSTALL AND COMPILE'
          set -e
@@ -163,7 +148,7 @@ jobs:
          git submodule update --init libs/config
          git submodule update --init tools/boostdep
          cp -r $TRAVIS_BUILD_DIR/* libs/icl
-          python tools/boostdep/depinst/depinst.py icl
+          python3 tools/boostdep/depinst/depinst.py icl
          ./bootstrap.sh
          ./b2 headers

@@ -180,7 +165,7 @@ jobs:
          - name: "TOOLSET=clang CXXSTD=11,14,1z Job 5"
            buildtype: "boost"
            packages: ""
-            os: "macos-11"
+            os: "macos-latest"
            cxx: "clang++"
            sources: ""
            llvm_os: ""
@@ -194,12 +179,6 @@ jobs:
    steps:
      - uses: actions/checkout@v2

-      - name: Set DEVELOPER_DIR
-        if: matrix.xcode_version != ''
-        run: echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer" >> $GITHUB_ENV
-      - name: Test DEVELOPER_DIR
-        run: echo $DEVELOPER_DIR
-
      - name: "osx"
        shell: bash
        env:
@@ -241,7 +220,7 @@ jobs:
          git submodule update --init libs/config
          git submodule update --init tools/boostdep
          cp -r $TRAVIS_BUILD_DIR/* libs/icl
-          python tools/boostdep/depinst/depinst.py icl
+          python3 tools/boostdep/depinst/depinst.py icl
          ./bootstrap.sh
          ./b2 headers

--- a/build.jam
+++ b/build.jam
@@ -0,0 +1,39 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/assert//boost_assert
+    /boost/concept_check//boost_concept_check
+    /boost/config//boost_config
+    /boost/container//boost_container
+    /boost/core//boost_core
+    /boost/date_time//boost_date_time
+    /boost/detail//boost_detail
+    /boost/iterator//boost_iterator
+    /boost/move//boost_move
+    /boost/mpl//boost_mpl
+    /boost/range//boost_range
+    /boost/rational//boost_rational
+    /boost/static_assert//boost_static_assert
+    /boost/type_traits//boost_type_traits
+    /boost/utility//boost_utility ;
+
+project /boost/icl
+    ;
+
+explicit
+    [ alias boost_icl : : :
+        : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_icl
+        example example/boost_party_ example/custom_interval_
+        example/partys_height_average_ example/partys_tallest_guests_
+        test ]
+    ;
+
+call-if : boost-library icl
+    ;
+
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -16,7 +16,7 @@ import quickbook ;

 doxygen icldoc
    :
-        [ glob ../../../boost/icl/*.hpp ]
+        [ glob ../include/boost/icl/*.hpp ]
    :
        <doxygen:param>EXTRACT_ALL=NO
        <doxygen:param>HIDE_UNDOC_MEMBERS=YES
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -2,77 +2,61 @@
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

+project : requirements <library>/boost/icl//boost_icl ;
+
 # Examples that do not use boost_date_time
 exe interval
    :
        interval_/interval.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe interval_container
    :
        interval_container_/interval_container.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe overlap_counter
    :
        overlap_counter_/overlap_counter.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe party
    :
        party_/party.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe std_copy
    :
        std_copy_/std_copy.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe std_transform
    :
        std_transform_/std_transform.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe custom_interval
    :
        custom_interval_/custom_interval.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe dynamic_interval
    :
        dynamic_interval_/dynamic_interval.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe static_interval
    :
        static_interval_/static_interval.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 # Examples using boost_date_time
@@ -80,48 +64,36 @@ exe boost_party
    :
        boost_party_/boost_party.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe partys_height_average
    :
        partys_height_average_/partys_height_average.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe partys_tallest_guests
    :
        partys_tallest_guests_/partys_tallest_guests.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe man_power
    :
        man_power_/man_power.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe month_and_week_grid
    :
        month_and_week_grid_/month_and_week_grid.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe user_groups
    :
        user_groups_/user_groups.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 # Projects
@@ -129,8 +101,6 @@ exe large_bitset
    :
        large_bitset_/large_bitset.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;


@@ -139,15 +109,11 @@ exe itvset_shell
    :
        itvset_shell_/itvset_shell.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

 exe splititvmap_shell
    :
        splititvmap_shell_/splititvmap_shell.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;

--- a/example/boost_party_/Jamfile.v2
+++ b/example/boost_party_/Jamfile.v2
@@ -6,6 +6,4 @@ exe boost_party
    :
        boost_party.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;
--- a/example/custom_interval_/Jamfile.v2
+++ b/example/custom_interval_/Jamfile.v2
@@ -6,6 +6,4 @@ exe custom_interval
    :
        custom_interval.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;
--- a/example/partys_height_average_/Jamfile.v2
+++ b/example/partys_height_average_/Jamfile.v2
@@ -6,6 +6,4 @@ exe partys_height_average
    :
        partys_height_average.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;
--- a/example/partys_tallest_guests_/Jamfile.v2
+++ b/example/partys_tallest_guests_/Jamfile.v2
@@ -6,6 +6,4 @@ exe partys_tallest_guests
    :
        partys_tallest_guests.cpp
    :
-        <include>../../..
-        <include>$(BOOST_ROOT)
    ;
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -8,38 +8,39 @@ import feature ;

 project
    : requirements
+      <library>/boost/icl//boost_icl
      <library>/boost/test//boost_unit_test_framework
      <library>/boost/chrono//boost_chrono
      <link>static
-      <include>../../..
+      <include>.
    ;

 test-suite "itl"
-    : 
+    :
      # interval
      [ run fastest_icl_interval_/fastest_icl_interval.cpp ]
-      
+
      # sets
      [ run fastest_interval_set_/fastest_interval_set.cpp ]
      [ run fastest_interval_set_infix_/fastest_interval_set_infix.cpp ]
-      
+
      [ run fastest_separate_interval_set_/fastest_separate_interval_set.cpp ]
      [ run fastest_separate_interval_set_infix_/fastest_separate_interval_set_infix.cpp ]
-      
+
      [ run fastest_split_interval_set_/fastest_split_interval_set.cpp ]
      [ run fastest_split_interval_set_infix_/fastest_split_interval_set_infix.cpp ]
-            
+
      [ run fastest_interval_set_mixed_/fastest_interval_set_mixed.cpp ]
-      
+
      # maps
      [ run fastest_interval_map_/fastest_interval_map.cpp ]
-      
-      [ run fast_stat_interval_map_/fast_stat_interval_map.cpp 
+
+      [ run fast_stat_interval_map_/fast_stat_interval_map.cpp
            : : : : interval_map_right_open ]
-      [ run fast_stat_interval_map_/fast_stat_interval_map.cpp 
+      [ run fast_stat_interval_map_/fast_stat_interval_map.cpp
            : : : <define>BOOST_ICL_CONTINUOUS_STATIC_INTERVAL_DEFAULT=left_open_interval
            : interval_map_left_open ]
-      
+
      [ run fastest_interval_map_infix_/fastest_interval_map_infix.cpp ]
      [ run fastest_split_interval_map_/fastest_split_interval_map.cpp ]
      [ run fastest_split_interval_map_infix_/fastest_split_interval_map_infix.cpp ]
@@ -52,31 +53,31 @@ test-suite "itl"
      # Concept Set
      [ run fastest_set_interval_set_/fastest_set_interval_set.cpp ]
      [ run fastest_set_icl_set_/fastest_set_icl_set.cpp ]
-      
-      # Concept Map 
+
+      # Concept Map
      [ run fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp ]
-      [ run fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp ]            
+      [ run fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp ]
      [ run fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp ]
-      [ run fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp ]   
-      
-      # Misc -------------------------------------------------------------------         
-      [ run test_misc_/test_misc.cpp ]   
-      [ run test_doc_code_/test_doc_code.cpp ]   
-      [ run test_type_traits_/test_type_traits.cpp ]   
+      [ run fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp ]
+
+      # Misc -------------------------------------------------------------------
+      [ run test_misc_/test_misc.cpp ]
+      [ run test_doc_code_/test_doc_code.cpp ]
+      [ run test_type_traits_/test_type_traits.cpp ]
      # test_combinable is too slow or too large for some compilers
-      #[ run test_combinable_/test_combinable.cpp ]   
-      [ run test_changing_interval_defaults_/test_changing_interval_defaults.cpp ]   
-      
+      #[ run test_combinable_/test_combinable.cpp ]
+      [ run test_changing_interval_defaults_/test_changing_interval_defaults.cpp ]
+
      # Bug fixes --------------------------------------------------------------
-      [ run fix_icl_after_thread_/fix_icl_after_thread.cpp ] 
-      [ run fix_tickets_/fix_tickets.cpp ] 
-      
+      [ run fix_icl_after_thread_/fix_icl_after_thread.cpp ]
+      [ run fix_tickets_/fix_tickets.cpp ]
+
      # Check for compiler bugs ------------------------------------------------
-      # compile-fail-tests  
-      [ run cmp_msvc_value_born_error_/cmp_msvc_value_born_error.cpp ]   
-      [ run cmp_clang_ttp_passing_/cmp_clang_ttp_passing.cpp ]   
+      # compile-fail-tests
+      [ run cmp_msvc_value_born_error_/cmp_msvc_value_born_error.cpp ]
+      [ run cmp_clang_ttp_passing_/cmp_clang_ttp_passing.cpp ]
      [ run cmp_clang_ttp_passing2_/cmp_clang_ttp_passing2.cpp ]
-      
+
      # Examples ---------------------------------------------------------------
      [ run ex_boost_party_/ex_boost_party.cpp ]

@@ -87,74 +88,74 @@ test-suite "itl"
      # ========================================================================
      # Chrono -----------------------------------------------------------------
      # interval
-      [ run fastest_icl_interval_/fastest_icl_interval.cpp 
+      [ run fastest_icl_interval_/fastest_icl_interval.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_icl_interval ]

      # sets
-      [ run fastest_interval_set_/fastest_interval_set.cpp 
+      [ run fastest_interval_set_/fastest_interval_set.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_set ]
-            
+
      [ run fastest_interval_set_infix_/fastest_interval_set_infix.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_set_infix ]
-               
+
      [ run fastest_interval_set_mixed_/fastest_interval_set_mixed.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_set_mixed ]
-            
+
      # maps
-      [ run fastest_interval_map_/fastest_interval_map.cpp 
+      [ run fastest_interval_map_/fastest_interval_map.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_map ]

      [ run fastest_interval_map_infix_/fastest_interval_map_infix.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_map_infix ]
-            
+
      [ run fastest_interval_map_mixed_/fastest_interval_map_mixed.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_map_mixed ]
-      
+
      [ run fastest_interval_map_mixed2_/fastest_interval_map_mixed2.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_map_mixed2 ]
-      
+
      [ run fastest_interval_map_infix_mixed_/fastest_interval_map_infix_mixed.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_interval_map_infix_mixed ]
-      
+
      [ run fastest_icl_map_/fastest_icl_map.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_icl_map ]
-      
+

      # handcoded tests using laws (not LaBatea) -------------------------------
      # Concept Set
      [ run fastest_set_interval_set_/fastest_set_interval_set.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_set_interval_set ]
-            
+
      [ run fastest_set_icl_set_/fastest_set_icl_set.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_set_icl_set ]
-      
-      # Concept Map 
+
+      # Concept Map
      [ run fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_partial_interval_quantifier ]
-      
+
      [ run fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_total_interval_quantifier ]
-            
+
      [ run fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_partial_icl_quantifier ]
-            
+
      [ run fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp
            : : : <define>BOOST_ICL_TEST_CHRONO
            : chrono_total_icl_quantifier ]
-      
+
    ;
--- a/test/cmp_clang_ttp_passing_/cmp_clang_ttp_passing.cpp
+++ b/test/cmp_clang_ttp_passing_/cmp_clang_ttp_passing.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2011-2011: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::cmp_clang_ttp_passing unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <boost/config.hpp>
 #include "../unit_test_unwarned.hpp"

--- a/test/ex_boost_party_/ex_boost_party.cpp
+++ b/test/ex_boost_party_/ex_boost_party.cpp
@@ -7,7 +7,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::example_boost_party unit test

-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include "../unit_test_unwarned.hpp"
 //#include <boost/icl/set.hpp> // Needed for implicit calls of operator << on
 //JODO CLANG                   // GuestSets via test macros.
--- a/test/fast_stat_interval_map_/fast_stat_interval_map.cpp
+++ b/test/fast_stat_interval_map_/fast_stat_interval_map.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2011: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_icl_interval_/fastest_icl_interval.cpp
+++ b/test/fastest_icl_interval_/fastest_icl_interval.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_icl_map_/fastest_icl_map.cpp
+++ b/test/fastest_icl_map_/fastest_icl_map.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::icl_map unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_map_/fastest_interval_map.cpp
+++ b/test/fastest_interval_map_/fastest_interval_map.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_map_infix_/fastest_interval_map_infix.cpp
+++ b/test/fastest_interval_map_infix_/fastest_interval_map_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_map_infix_mixed_/fastest_interval_map_infix_mixed.cpp
+++ b/test/fastest_interval_map_infix_mixed_/fastest_interval_map_infix_mixed.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_infix_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_map_mixed2_/fastest_interval_map_mixed2.cpp
+++ b/test/fastest_interval_map_mixed2_/fastest_interval_map_mixed2.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_map_mixed_/fastest_interval_map_mixed.cpp
+++ b/test/fastest_interval_map_mixed_/fastest_interval_map_mixed.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_set_/fastest_interval_set.cpp
+++ b/test/fastest_interval_set_/fastest_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_set_infix_/fastest_interval_set_infix.cpp
+++ b/test/fastest_interval_set_infix_/fastest_interval_set_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_set_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_interval_set_mixed_/fastest_interval_set_mixed.cpp
+++ b/test/fastest_interval_set_mixed_/fastest_interval_set_mixed.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_set_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp
+++ b/test/fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::partial_icl_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp
+++ b/test/fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::partial_interval_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_separate_interval_set_/fastest_separate_interval_set.cpp
+++ b/test/fastest_separate_interval_set_/fastest_separate_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::separate_interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_separate_interval_set_infix_/fastest_separate_interval_set_infix.cpp
+++ b/test/fastest_separate_interval_set_infix_/fastest_separate_interval_set_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::separate_interval_set_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_set_icl_set_/fastest_set_icl_set.cpp
+++ b/test/fastest_set_icl_set_/fastest_set_icl_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::set_itl_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_set_interval_set_/fastest_set_interval_set.cpp
+++ b/test/fastest_set_interval_set_/fastest_set_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::set_interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_split_interval_map_/fastest_split_interval_map.cpp
+++ b/test/fastest_split_interval_map_/fastest_split_interval_map.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_map unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_split_interval_map_infix_/fastest_split_interval_map_infix.cpp
+++ b/test/fastest_split_interval_map_infix_/fastest_split_interval_map_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_map_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_split_interval_set_/fastest_split_interval_set.cpp
+++ b/test/fastest_split_interval_set_/fastest_split_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_split_interval_set_infix_/fastest_split_interval_set_infix.cpp
+++ b/test/fastest_split_interval_set_infix_/fastest_split_interval_set_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_set_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp
+++ b/test/fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::total_icl_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp
+++ b/test/fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::total_interval_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/fix_icl_after_thread_/fix_icl_after_thread.cpp
+++ b/test/fix_icl_after_thread_/fix_icl_after_thread.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2011-2011: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::fix_icl_after_thread unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include "../unit_test_unwarned.hpp"

 // #include <boost/thread.hpp> MEMO: The problem occured when using thread.hpp
--- a/test/fix_tickets_/fix_tickets.cpp
+++ b/test/fix_tickets_/fix_tickets.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2011-2011: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::fix_icl_after_thread unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include "../unit_test_unwarned.hpp"

 //#define BOOST_ICL_USE_STATIC_BOUNDED_INTERVALS
--- a/test/test_casual_/test_casual.cpp
+++ b/test/test_casual_/test_casual.cpp
@@ -9,7 +9,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber

 #define BOOST_ICL_TEST_CHRONO

-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>

 #include <string>
 #include <vector>
--- a/test/test_changing_interval_defaults_/test_changing_interval_defaults.cpp
+++ b/test/test_changing_interval_defaults_/test_changing_interval_defaults.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::test_doc_code unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>

 #include <limits>
 #include <complex>
--- a/test/test_combinable_/test_combinable.cpp
+++ b/test/test_combinable_/test_combinable.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::casual unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_doc_code_/test_doc_code.cpp
+++ b/test/test_doc_code_/test_doc_code.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::test_doc_code unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>

 #include <limits>
 #include <complex>
--- a/test/test_icl_interval_/test_icl_interval.cpp
+++ b/test/test_icl_interval_/test_icl_interval.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_icl_map_/test_icl_map.cpp
+++ b/test/test_icl_map_/test_icl_map.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::icl_map unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_interval_map_/test_interval_map.cpp
+++ b/test/test_interval_map_/test_interval_map.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_interval_map_infix_/test_interval_map_infix.cpp
+++ b/test/test_interval_map_infix_/test_interval_map_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_interval_map_infix_mixed_/test_interval_map_infix_mixed.cpp
+++ b/test/test_interval_map_infix_mixed_/test_interval_map_infix_mixed.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_infix_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_interval_map_mixed2_/test_interval_map_mixed2.cpp
+++ b/test/test_interval_map_mixed2_/test_interval_map_mixed2.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_interval_map_mixed_/test_interval_map_mixed.cpp
+++ b/test/test_interval_map_mixed_/test_interval_map_mixed.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_map_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_interval_set_/test_interval_set.cpp
+++ b/test/test_interval_set_/test_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <vector>
 #include <boost/mpl/list.hpp>
--- a/test/test_interval_set_infix_/test_interval_set_infix.cpp
+++ b/test/test_interval_set_infix_/test_interval_set_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_set_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_interval_set_mixed_/test_interval_set_mixed.cpp
+++ b/test/test_interval_set_mixed_/test_interval_set_mixed.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::interval_set_mixed unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_misc_/test_misc.cpp
+++ b/test/test_misc_/test_misc.cpp
@@ -9,7 +9,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber

 #define BOOST_ICL_TEST_CHRONO

-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <vector>
 #include <boost/mpl/list.hpp>
--- a/test/test_partial_icl_quantifier_/test_partial_icl_quantifier.cpp
+++ b/test/test_partial_icl_quantifier_/test_partial_icl_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::partial_icl_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_partial_interval_quantifier_/test_partial_interval_quantifier.cpp
+++ b/test/test_partial_interval_quantifier_/test_partial_interval_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::partial_interval_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_separate_interval_set_/test_separate_interval_set.cpp
+++ b/test/test_separate_interval_set_/test_separate_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::separate_interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_separate_interval_set_infix_/test_separate_interval_set_infix.cpp
+++ b/test/test_separate_interval_set_infix_/test_separate_interval_set_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::separate_interval_set_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_set_icl_set_/test_set_icl_set.cpp
+++ b/test/test_set_icl_set_/test_set_icl_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::set_itl_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_set_interval_set_/test_set_interval_set.cpp
+++ b/test/test_set_interval_set_/test_set_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::set_interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_split_interval_map_/test_split_interval_map.cpp
+++ b/test/test_split_interval_map_/test_split_interval_map.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_map unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_split_interval_map_infix_/test_split_interval_map_infix.cpp
+++ b/test/test_split_interval_map_infix_/test_split_interval_map_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_map_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_split_interval_set_/test_split_interval_set.cpp
+++ b/test/test_split_interval_set_/test_split_interval_set.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_set unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_split_interval_set_infix_/test_split_interval_set_infix.cpp
+++ b/test/test_split_interval_set_infix_/test_split_interval_set_infix.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::split_interval_set_infix unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_total_icl_quantifier_/test_total_icl_quantifier.cpp
+++ b/test/test_total_icl_quantifier_/test_total_icl_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::total_icl_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_total_interval_quantifier_/test_total_interval_quantifier.cpp
+++ b/test/test_total_interval_quantifier_/test_total_interval_quantifier.cpp
@@ -6,7 +6,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
           http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::total_interval_quantifier unit test
-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <string>
 #include <boost/mpl/list.hpp>
 #include "../unit_test_unwarned.hpp"
--- a/test/test_type_lists.hpp
+++ b/test/test_type_lists.hpp
@@ -23,7 +23,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber

 #ifdef BOOST_ICL_TEST_CHRONO
 #   define BOOST_CHRONO_EXTENSIONS
-#   include <libs/icl/test/chrono/utility.hpp>
+#   include <chrono/utility.hpp>

    namespace boch  = boost::chrono;
 #endif
--- a/test/test_type_traits_/test_type_traits.cpp
+++ b/test/test_type_traits_/test_type_traits.cpp
@@ -7,7 +7,7 @@ Copyright (c) 2008-2009: Joachim Faulhaber
 +-----------------------------------------------------------------------------*/
 #define BOOST_TEST_MODULE icl::test_type_traits unit test

-#include <libs/icl/test/disable_test_warnings.hpp>
+#include <disable_test_warnings.hpp>
 #include <limits>
 #include <complex>
 #include <string>