Reorganize directories to match installation

Signed-off-by: Matthias Kretz <kretz@kde.org>
4J-company · Sep 3, 2018 · 5519ed0 · 5519ed0
1 parent e1c4bd6
commit 5519ed0
Show file tree

Hide file tree

Showing 171 changed files with 33 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,7 +94,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "" AND NOT CMAKE_CXX_FLAGS MATCHES "-O[123]")
    message(STATUS "WARNING! It seems you are compiling without optimization. Please set CMAKE_BUILD_TYPE.")
 endif(CMAKE_BUILD_TYPE STREQUAL "" AND NOT CMAKE_CXX_FLAGS MATCHES "-O[123]")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_custom_target(other VERBATIM)
 add_custom_target(Scalar COMMENT "build Scalar code" VERBATIM)
@@ -105,7 +105,6 @@ add_custom_target(AVX2 COMMENT "build AVX2 code" VERBATIM)
 AddCompilerFlag(-ftemplate-depth=128 CXX_FLAGS CMAKE_CXX_FLAGS)
 
 set(libvc_compile_flags "-DVc_COMPILE_LIB")
-set(libvc_mic_compile_flags "-DVc_COMPILE_LIB")
 AddCompilerFlag("-fPIC" CXX_FLAGS libvc_compile_flags)
 
 # -fstack-protector is the default of GCC, but at least Ubuntu changes the default to -fstack-protector-strong, which is crazy
@@ -165,13 +164,13 @@ endif()
 add_dependencies(other Vc)
 
 install(TARGETS Vc DESTINATION lib${LIB_SUFFIX})
-install(DIRECTORY include/Vc/ DESTINATION include/Vc)
+install(DIRECTORY Vc/ DESTINATION include/Vc)
 
 # Install all implementation headers
-install(DIRECTORY scalar sse avx mic common traits DESTINATION include/Vc FILES_MATCHING REGEX "/*.(h|tcc|def)$")
+install(DIRECTORY Vc/scalar Vc/sse Vc/avx Vc/common Vc/traits DESTINATION include/Vc FILES_MATCHING REGEX "/*.(h|tcc|def)$")
 
 # read version parts from version.h to be put into VcConfig.cmake
-file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/include/Vc/version.h _version_lines REGEX "^#define Vc_VERSION_STRING ")
+file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/Vc/version.h _version_lines REGEX "^#define Vc_VERSION_STRING ")
 string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" _version_matches "${_version_lines}")
 set(Vc_VERSION_MAJOR ${CMAKE_MATCH_1})
 set(Vc_VERSION_MINOR ${CMAKE_MATCH_2})
@@ -188,8 +187,6 @@ install(FILES
    cmake/AddCompilerFlag.cmake
    cmake/CheckCCompilerFlag.cmake
    cmake/CheckCXXCompilerFlag.cmake
-   cmake/CheckMicCCompilerFlag.cmake
-   cmake/CheckMicCXXCompilerFlag.cmake
    cmake/OptimizeForArchitecture.cmake
    cmake/FindVc.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/cmake/VcConfig.cmake

diff --git a/include/Vc/Allocator → Vc/Allocator b/include/Vc/Allocator → Vc/Allocator
diff --git a/include/Vc/IO → Vc/IO b/include/Vc/IO → Vc/IO
diff --git a/include/Vc/Memory → Vc/Memory b/include/Vc/Memory → Vc/Memory
diff --git a/include/Vc/SimdArray → Vc/SimdArray b/include/Vc/SimdArray → Vc/SimdArray
diff --git a/include/Vc/Utils → Vc/Utils b/include/Vc/Utils → Vc/Utils
diff --git a/include/Vc/Vc → Vc/Vc b/include/Vc/Vc → Vc/Vc
diff --git a/include/Vc/array → Vc/array b/include/Vc/array → Vc/array
diff --git a/avx/README → Vc/avx/README b/avx/README → Vc/avx/README
diff --git a/avx/casts.h → Vc/avx/casts.h b/avx/casts.h → Vc/avx/casts.h
diff --git a/avx/const.h → Vc/avx/const.h b/avx/const.h → Vc/avx/const.h
diff --git a/avx/const_data.h → Vc/avx/const_data.h b/avx/const_data.h → Vc/avx/const_data.h
diff --git a/avx/debug.h → Vc/avx/debug.h b/avx/debug.h → Vc/avx/debug.h
diff --git a/avx/deinterleave.tcc → Vc/avx/deinterleave.tcc b/avx/deinterleave.tcc → Vc/avx/deinterleave.tcc
diff --git a/avx/detail.h → Vc/avx/detail.h b/avx/detail.h → Vc/avx/detail.h
diff --git a/avx/helperimpl.h → Vc/avx/helperimpl.h b/avx/helperimpl.h → Vc/avx/helperimpl.h
diff --git a/avx/intrinsics.h → Vc/avx/intrinsics.h b/avx/intrinsics.h → Vc/avx/intrinsics.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef VC_AVX_INTRINSICS_H_
 #define VC_AVX_INTRINSICS_H_
 
-#include <Vc/global.h>
+#include "../global.h"
 #include "../traits/type_traits.h"
 
 // see comment in sse/intrinsics.h

diff --git a/avx/limits.h → Vc/avx/limits.h b/avx/limits.h → Vc/avx/limits.h
diff --git a/avx/macros.h → Vc/avx/macros.h b/avx/macros.h → Vc/avx/macros.h
diff --git a/avx/mask.h → Vc/avx/mask.h b/avx/mask.h → Vc/avx/mask.h
diff --git a/avx/mask.tcc → Vc/avx/mask.tcc b/avx/mask.tcc → Vc/avx/mask.tcc
diff --git a/avx/math.h → Vc/avx/math.h b/avx/math.h → Vc/avx/math.h
diff --git a/avx/shuffle.h → Vc/avx/shuffle.h b/avx/shuffle.h → Vc/avx/shuffle.h
diff --git a/avx/simd_cast.h → Vc/avx/simd_cast.h b/avx/simd_cast.h → Vc/avx/simd_cast.h
diff --git a/avx/simd_cast_caller.tcc → Vc/avx/simd_cast_caller.tcc b/avx/simd_cast_caller.tcc → Vc/avx/simd_cast_caller.tcc
diff --git a/avx/types.h → Vc/avx/types.h b/avx/types.h → Vc/avx/types.h
diff --git a/avx/vector.h → Vc/avx/vector.h b/avx/vector.h → Vc/avx/vector.h
diff --git a/avx/vector.tcc → Vc/avx/vector.tcc b/avx/vector.tcc → Vc/avx/vector.tcc
diff --git a/avx/vectorhelper.h → Vc/avx/vectorhelper.h b/avx/vectorhelper.h → Vc/avx/vectorhelper.h
diff --git a/common/algorithms.h → Vc/common/algorithms.h b/common/algorithms.h → Vc/common/algorithms.h
diff --git a/common/aliasingentryhelper.h → Vc/common/aliasingentryhelper.h b/common/aliasingentryhelper.h → Vc/common/aliasingentryhelper.h
diff --git a/common/alignedbase.h → Vc/common/alignedbase.h b/common/alignedbase.h → Vc/common/alignedbase.h
diff --git a/common/bitscanintrinsics.h → Vc/common/bitscanintrinsics.h b/common/bitscanintrinsics.h → Vc/common/bitscanintrinsics.h
diff --git a/common/const.h → Vc/common/const.h b/common/const.h → Vc/common/const.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define VC_COMMON_CONST_H_
 
 #include <type_traits>
-#include <Vc/global.h>
+#include "../global.h"
 
 namespace Vc_VERSIONED_NAMESPACE
 {

diff --git a/common/data.h → Vc/common/data.h b/common/data.h → Vc/common/data.h
diff --git a/common/deinterleave.h → Vc/common/deinterleave.h b/common/deinterleave.h → Vc/common/deinterleave.h
diff --git a/common/elementreference.h → Vc/common/elementreference.h b/common/elementreference.h → Vc/common/elementreference.h
diff --git a/common/exponential.h → Vc/common/exponential.h b/common/exponential.h → Vc/common/exponential.h
diff --git a/common/fix_clang_emmintrin.h → Vc/common/fix_clang_emmintrin.h b/common/fix_clang_emmintrin.h → Vc/common/fix_clang_emmintrin.h
@@ -24,7 +24,7 @@
 #ifndef VC_COMMON_FIX_CLANG_EMMINTRIN_H_
 #define VC_COMMON_FIX_CLANG_EMMINTRIN_H_
 
-#include <Vc/global.h>
+#include "../global.h"
 
 #if (defined Vc_CLANG && Vc_CLANG < 0x30700) || (defined Vc_APPLECLANG && Vc_APPLECLANG < 0x70000)
 

diff --git a/common/gatherimplementation.h → Vc/common/gatherimplementation.h b/common/gatherimplementation.h → Vc/common/gatherimplementation.h
diff --git a/common/gatherinterface.h → Vc/common/gatherinterface.h b/common/gatherinterface.h → Vc/common/gatherinterface.h
diff --git a/common/generalinterface.h → Vc/common/generalinterface.h b/common/generalinterface.h → Vc/common/generalinterface.h
diff --git a/common/iif.h → Vc/common/iif.h b/common/iif.h → Vc/common/iif.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef VC_COMMON_IIF_H_
 #define VC_COMMON_IIF_H_
 
-#include <Vc/type_traits>
+#include "../type_traits"
 #include "macros.h"
 
 namespace Vc_VERSIONED_NAMESPACE

diff --git a/common/indexsequence.h → Vc/common/indexsequence.h b/common/indexsequence.h → Vc/common/indexsequence.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef VC_COMMON_INDEXSEQUENCE_H_
 #define VC_COMMON_INDEXSEQUENCE_H_
 
-#include <Vc/global.h>
+#include "../global.h"
 
 namespace Vc_VERSIONED_NAMESPACE
 {

diff --git a/common/interleave.h → Vc/common/interleave.h b/common/interleave.h → Vc/common/interleave.h
diff --git a/common/interleavedmemory.h → Vc/common/interleavedmemory.h b/common/interleavedmemory.h → Vc/common/interleavedmemory.h
diff --git a/common/iterators.h → Vc/common/iterators.h b/common/iterators.h → Vc/common/iterators.h
diff --git a/common/loadinterface.h → Vc/common/loadinterface.h b/common/loadinterface.h → Vc/common/loadinterface.h
diff --git a/common/loadstoreflags.h → Vc/common/loadstoreflags.h b/common/loadstoreflags.h → Vc/common/loadstoreflags.h
diff --git a/common/logarithm.h → Vc/common/logarithm.h b/common/logarithm.h → Vc/common/logarithm.h
diff --git a/common/macros.h → Vc/common/macros.h b/common/macros.h → Vc/common/macros.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef VC_COMMON_MACROS_H_
 #define VC_COMMON_MACROS_H_
 
-#include <Vc/global.h>
+#include "../global.h"
 
 
 #ifdef Vc_MSVC

diff --git a/common/makeContainer.h → Vc/common/makeContainer.h b/common/makeContainer.h → Vc/common/makeContainer.h
diff --git a/common/make_unique.h → Vc/common/make_unique.h b/common/make_unique.h → Vc/common/make_unique.h
diff --git a/common/malloc.h → Vc/common/malloc.h b/common/malloc.h → Vc/common/malloc.h
diff --git a/common/mask.h → Vc/common/mask.h b/common/mask.h → Vc/common/mask.h
diff --git a/common/maskbool.h → Vc/common/maskbool.h b/common/maskbool.h → Vc/common/maskbool.h
diff --git a/common/math.h → Vc/common/math.h b/common/math.h → Vc/common/math.h
diff --git a/common/memory.h → Vc/common/memory.h b/common/memory.h → Vc/common/memory.h
diff --git a/common/memorybase.h → Vc/common/memorybase.h b/common/memorybase.h → Vc/common/memorybase.h
diff --git a/common/memoryfwd.h → Vc/common/memoryfwd.h b/common/memoryfwd.h → Vc/common/memoryfwd.h
diff --git a/common/operators.h → Vc/common/operators.h b/common/operators.h → Vc/common/operators.h
diff --git a/common/permutation.h → Vc/common/permutation.h b/common/permutation.h → Vc/common/permutation.h
diff --git a/common/scatterimplementation.h → Vc/common/scatterimplementation.h b/common/scatterimplementation.h → Vc/common/scatterimplementation.h
diff --git a/common/scatterinterface.h → Vc/common/scatterinterface.h b/common/scatterinterface.h → Vc/common/scatterinterface.h
diff --git a/common/set.h → Vc/common/set.h b/common/set.h → Vc/common/set.h
diff --git a/common/simd_cast.h → Vc/common/simd_cast.h b/common/simd_cast.h → Vc/common/simd_cast.h
diff --git a/common/simd_cast_caller.tcc → Vc/common/simd_cast_caller.tcc b/common/simd_cast_caller.tcc → Vc/common/simd_cast_caller.tcc
diff --git a/common/simdarray.h → Vc/common/simdarray.h b/common/simdarray.h → Vc/common/simdarray.h
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //#define Vc_DEBUG_SIMD_CAST 1
 //#define Vc_DEBUG_SORTED 1
 #if defined Vc_DEBUG_SIMD_CAST || defined Vc_DEBUG_SORTED
-#include <Vc/IO>
+#include "../IO"
 #endif
 
 #include <array>

diff --git a/common/simdarrayfwd.h → Vc/common/simdarrayfwd.h b/common/simdarrayfwd.h → Vc/common/simdarrayfwd.h
diff --git a/common/simdarrayhelper.h → Vc/common/simdarrayhelper.h b/common/simdarrayhelper.h → Vc/common/simdarrayhelper.h
diff --git a/common/simdize.h → Vc/common/simdize.h b/common/simdize.h → Vc/common/simdize.h
diff --git a/common/simdmaskarray.h → Vc/common/simdmaskarray.h b/common/simdmaskarray.h → Vc/common/simdmaskarray.h
diff --git a/common/span.h → Vc/common/span.h b/common/span.h → Vc/common/span.h
diff --git a/common/storage.h → Vc/common/storage.h b/common/storage.h → Vc/common/storage.h
diff --git a/common/storeinterface.h → Vc/common/storeinterface.h b/common/storeinterface.h → Vc/common/storeinterface.h
diff --git a/common/subscript.h → Vc/common/subscript.h b/common/subscript.h → Vc/common/subscript.h
diff --git a/common/support.h → Vc/common/support.h b/common/support.h → Vc/common/support.h
diff --git a/common/transpose.h → Vc/common/transpose.h b/common/transpose.h → Vc/common/transpose.h
diff --git a/common/trigonometric.h → Vc/common/trigonometric.h b/common/trigonometric.h → Vc/common/trigonometric.h
diff --git a/common/types.h → Vc/common/types.h b/common/types.h → Vc/common/types.h
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstdio>
 #endif
 
-#include <Vc/global.h>
+#include "../global.h"
 #include "../traits/type_traits.h"
 #include "permutation.h"
 

diff --git a/common/utility.h → Vc/common/utility.h b/common/utility.h → Vc/common/utility.h
diff --git a/common/vector.h → Vc/common/vector.h b/common/vector.h → Vc/common/vector.h
diff --git a/common/vector/casts.h → Vc/common/vector/casts.h b/common/vector/casts.h → Vc/common/vector/casts.h
diff --git a/common/vectorabi.h → Vc/common/vectorabi.h b/common/vectorabi.h → Vc/common/vectorabi.h
diff --git a/common/vectortraits.h → Vc/common/vectortraits.h b/common/vectortraits.h → Vc/common/vectortraits.h
diff --git a/common/vectortuple.h → Vc/common/vectortuple.h b/common/vectortuple.h → Vc/common/vectortuple.h
diff --git a/common/where.h → Vc/common/where.h b/common/where.h → Vc/common/where.h
diff --git a/common/writemaskedvector.h → Vc/common/writemaskedvector.h b/common/writemaskedvector.h → Vc/common/writemaskedvector.h
diff --git a/common/x86_prefetches.h → Vc/common/x86_prefetches.h b/common/x86_prefetches.h → Vc/common/x86_prefetches.h
diff --git a/include/Vc/cpuid.h → Vc/cpuid.h b/include/Vc/cpuid.h → Vc/cpuid.h
diff --git a/include/Vc/double_v → Vc/double_v b/include/Vc/double_v → Vc/double_v
diff --git a/include/Vc/float_v → Vc/float_v b/include/Vc/float_v → Vc/float_v
diff --git a/include/Vc/fwddecl.h → Vc/fwddecl.h b/include/Vc/fwddecl.h → Vc/fwddecl.h
diff --git a/include/Vc/global.h → Vc/global.h b/include/Vc/global.h → Vc/global.h
diff --git a/include/Vc/int_v → Vc/int_v b/include/Vc/int_v → Vc/int_v
diff --git a/include/Vc/iterators → Vc/iterators b/include/Vc/iterators → Vc/iterators
diff --git a/include/Vc/limits → Vc/limits b/include/Vc/limits → Vc/limits
diff --git a/scalar/detail.h → Vc/scalar/detail.h b/scalar/detail.h → Vc/scalar/detail.h
diff --git a/scalar/helperimpl.h → Vc/scalar/helperimpl.h b/scalar/helperimpl.h → Vc/scalar/helperimpl.h
diff --git a/scalar/limits.h → Vc/scalar/limits.h b/scalar/limits.h → Vc/scalar/limits.h
diff --git a/scalar/macros.h → Vc/scalar/macros.h b/scalar/macros.h → Vc/scalar/macros.h
diff --git a/scalar/mask.h → Vc/scalar/mask.h b/scalar/mask.h → Vc/scalar/mask.h
diff --git a/scalar/math.h → Vc/scalar/math.h b/scalar/math.h → Vc/scalar/math.h
diff --git a/scalar/operators.h → Vc/scalar/operators.h b/scalar/operators.h → Vc/scalar/operators.h
diff --git a/scalar/simd_cast.h → Vc/scalar/simd_cast.h b/scalar/simd_cast.h → Vc/scalar/simd_cast.h
diff --git a/scalar/simd_cast_caller.tcc → Vc/scalar/simd_cast_caller.tcc b/scalar/simd_cast_caller.tcc → Vc/scalar/simd_cast_caller.tcc
diff --git a/scalar/type_traits.h → Vc/scalar/type_traits.h b/scalar/type_traits.h → Vc/scalar/type_traits.h
diff --git a/scalar/types.h → Vc/scalar/types.h b/scalar/types.h → Vc/scalar/types.h
diff --git a/scalar/vector.h → Vc/scalar/vector.h b/scalar/vector.h → Vc/scalar/vector.h
diff --git a/scalar/vector.tcc → Vc/scalar/vector.tcc b/scalar/vector.tcc → Vc/scalar/vector.tcc
diff --git a/include/Vc/sfloat_v → Vc/sfloat_v b/include/Vc/sfloat_v → Vc/sfloat_v
diff --git a/include/Vc/short_v → Vc/short_v b/include/Vc/short_v → Vc/short_v
diff --git a/include/Vc/simd → Vc/simd b/include/Vc/simd → Vc/simd
diff --git a/include/Vc/simdize → Vc/simdize b/include/Vc/simdize → Vc/simdize
diff --git a/include/Vc/span → Vc/span b/include/Vc/span → Vc/span
diff --git a/sse/casts.h → Vc/sse/casts.h b/sse/casts.h → Vc/sse/casts.h
diff --git a/sse/const.h → Vc/sse/const.h b/sse/const.h → Vc/sse/const.h
diff --git a/sse/const_data.h → Vc/sse/const_data.h b/sse/const_data.h → Vc/sse/const_data.h
diff --git a/sse/debug.h → Vc/sse/debug.h b/sse/debug.h → Vc/sse/debug.h
diff --git a/sse/deinterleave.tcc → Vc/sse/deinterleave.tcc b/sse/deinterleave.tcc → Vc/sse/deinterleave.tcc
diff --git a/sse/detail.h → Vc/sse/detail.h b/sse/detail.h → Vc/sse/detail.h
diff --git a/sse/helperimpl.h → Vc/sse/helperimpl.h b/sse/helperimpl.h → Vc/sse/helperimpl.h
diff --git a/sse/intrinsics.h → Vc/sse/intrinsics.h b/sse/intrinsics.h → Vc/sse/intrinsics.h
diff --git a/sse/limits.h → Vc/sse/limits.h b/sse/limits.h → Vc/sse/limits.h
diff --git a/sse/macros.h → Vc/sse/macros.h b/sse/macros.h → Vc/sse/macros.h
diff --git a/sse/mask.h → Vc/sse/mask.h b/sse/mask.h → Vc/sse/mask.h
diff --git a/sse/mask.tcc → Vc/sse/mask.tcc b/sse/mask.tcc → Vc/sse/mask.tcc
diff --git a/sse/math.h → Vc/sse/math.h b/sse/math.h → Vc/sse/math.h
diff --git a/sse/prefetches.tcc → Vc/sse/prefetches.tcc b/sse/prefetches.tcc → Vc/sse/prefetches.tcc
diff --git a/sse/shuffle.h → Vc/sse/shuffle.h b/sse/shuffle.h → Vc/sse/shuffle.h
diff --git a/sse/simd_cast.h → Vc/sse/simd_cast.h b/sse/simd_cast.h → Vc/sse/simd_cast.h
diff --git a/sse/simd_cast_caller.tcc → Vc/sse/simd_cast_caller.tcc b/sse/simd_cast_caller.tcc → Vc/sse/simd_cast_caller.tcc
diff --git a/sse/type_traits.h → Vc/sse/type_traits.h b/sse/type_traits.h → Vc/sse/type_traits.h
diff --git a/sse/types.h → Vc/sse/types.h b/sse/types.h → Vc/sse/types.h
diff --git a/sse/vector.h → Vc/sse/vector.h b/sse/vector.h → Vc/sse/vector.h
diff --git a/sse/vector.tcc → Vc/sse/vector.tcc b/sse/vector.tcc → Vc/sse/vector.tcc
diff --git a/sse/vectorhelper.h → Vc/sse/vectorhelper.h b/sse/vectorhelper.h → Vc/sse/vectorhelper.h
diff --git a/sse/vectorhelper.tcc → Vc/sse/vectorhelper.tcc b/sse/vectorhelper.tcc → Vc/sse/vectorhelper.tcc
diff --git a/include/Vc/support.h → Vc/support.h b/include/Vc/support.h → Vc/support.h
diff --git a/traits/decay.h → Vc/traits/decay.h b/traits/decay.h → Vc/traits/decay.h
diff --git a/traits/entry_type_of.h → Vc/traits/entry_type_of.h b/traits/entry_type_of.h → Vc/traits/entry_type_of.h
diff --git a/traits/has_addition_operator.h → Vc/traits/has_addition_operator.h b/traits/has_addition_operator.h → Vc/traits/has_addition_operator.h
diff --git a/traits/has_contiguous_storage.h → Vc/traits/has_contiguous_storage.h b/traits/has_contiguous_storage.h → Vc/traits/has_contiguous_storage.h
diff --git a/traits/has_equality_operator.h → Vc/traits/has_equality_operator.h b/traits/has_equality_operator.h → Vc/traits/has_equality_operator.h
diff --git a/traits/has_multiply_operator.h → Vc/traits/has_multiply_operator.h b/traits/has_multiply_operator.h → Vc/traits/has_multiply_operator.h
diff --git a/traits/has_no_allocated_data.h → Vc/traits/has_no_allocated_data.h b/traits/has_no_allocated_data.h → Vc/traits/has_no_allocated_data.h
diff --git a/traits/has_subscript_operator.h → Vc/traits/has_subscript_operator.h b/traits/has_subscript_operator.h → Vc/traits/has_subscript_operator.h
diff --git a/traits/is_functor_argument_immutable.h → Vc/traits/is_functor_argument_immutable.h b/traits/is_functor_argument_immutable.h → Vc/traits/is_functor_argument_immutable.h
diff --git a/traits/is_gather_signature.h → Vc/traits/is_gather_signature.h b/traits/is_gather_signature.h → Vc/traits/is_gather_signature.h
diff --git a/traits/is_implicit_cast_allowed.h → Vc/traits/is_implicit_cast_allowed.h b/traits/is_implicit_cast_allowed.h → Vc/traits/is_implicit_cast_allowed.h
diff --git a/traits/is_index_sequence.h → Vc/traits/is_index_sequence.h b/traits/is_index_sequence.h → Vc/traits/is_index_sequence.h
diff --git a/traits/is_initializer_list.h → Vc/traits/is_initializer_list.h b/traits/is_initializer_list.h → Vc/traits/is_initializer_list.h
diff --git a/traits/is_load_arguments.h → Vc/traits/is_load_arguments.h b/traits/is_load_arguments.h → Vc/traits/is_load_arguments.h
diff --git a/traits/is_output_iterator.h → Vc/traits/is_output_iterator.h b/traits/is_output_iterator.h → Vc/traits/is_output_iterator.h
diff --git a/traits/type_traits.h → Vc/traits/type_traits.h b/traits/type_traits.h → Vc/traits/type_traits.h
diff --git a/include/Vc/type_traits → Vc/type_traits b/include/Vc/type_traits → Vc/type_traits
diff --git a/include/Vc/uint_v → Vc/uint_v b/include/Vc/uint_v → Vc/uint_v
diff --git a/include/Vc/ushort_v → Vc/ushort_v b/include/Vc/ushort_v → Vc/ushort_v
diff --git a/include/Vc/vector → Vc/vector b/include/Vc/vector → Vc/vector
diff --git a/include/Vc/vector.h → Vc/vector.h b/include/Vc/vector.h → Vc/vector.h
diff --git a/include/Vc/version.h → Vc/version.h b/include/Vc/version.h → Vc/version.h
diff --git a/src/avx_sorthelper.cpp b/src/avx_sorthelper.cpp
@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 }}}*/
 
-#include <avx/vector.h>
-#include <avx/debug.h>
-#include <avx/macros.h>
+#include <Vc/avx/vector.h>
+#include <Vc/avx/debug.h>
+#include <Vc/avx/macros.h>
 
 namespace Vc_VERSIONED_NAMESPACE
 {

diff --git a/src/const.cpp b/src/const.cpp
@@ -25,16 +25,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 }}}*/
 
-#include "avx/const_data.h"
-#include "sse/const_data.h"
+#include <Vc/avx/const_data.h>
+#include <Vc/sse/const_data.h>
 #include <Vc/version.h>
 
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 
-#include "common/const.h"
-#include "common/macros.h"
+#include <Vc/common/const.h>
+#include <Vc/common/macros.h>
 
 namespace Vc_VERSIONED_NAMESPACE
 {

diff --git a/src/sse_sorthelper.cpp b/src/sse_sorthelper.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 }}}*/
 
-#include <sse/vector.h>
-#include <sse/macros.h>
+#include <Vc/sse/vector.h>
+#include <Vc/sse/macros.h>
 
 namespace Vc_VERSIONED_NAMESPACE
 {

diff --git a/src/trigonometric.cpp b/src/trigonometric.cpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <Vc/vector.h>
 #if defined(Vc_IMPL_SSE) || defined(Vc_IMPL_AVX)
-#include <common/macros.h>
+#include <Vc/common/macros.h>
 //#include <Vc/IO>
 
 namespace Vc_VERSIONED_NAMESPACE

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -133,7 +133,7 @@ macro(vc_add_test _name)
    set(_target "${name}_scalar")
    list(FIND disabled_targets ${_target} _disabled)
    if(_disabled EQUAL -1 AND "${_targets}" MATCHES "Scalar")
-      file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/scalar/*.tcc" "${CMAKE_SOURCE_DIR}/scalar/*.h" "${CMAKE_SOURCE_DIR}/common/*.h")
+      file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/Vc/scalar/*.tcc" "${CMAKE_SOURCE_DIR}/Vc/scalar/*.h" "${CMAKE_SOURCE_DIR}/Vc/common/*.h")
       add_file_dependencies(${_name}.cpp "${_extra_deps}")
       add_executable(${_target} EXCLUDE_FROM_ALL ${_name}.cpp)
       vc_set_test_target_properties(${_target} Scalar "${Vc_SCALAR_FLAGS}")
@@ -143,7 +143,7 @@ macro(vc_add_test _name)
       set(_target "${name}_sse")
       list(FIND disabled_targets ${_target} _disabled)
       if(_disabled EQUAL -1)
-         file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/sse/*.tcc" "${CMAKE_SOURCE_DIR}/sse/*.h" "${CMAKE_SOURCE_DIR}/common/*.h")
+         file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/Vc/sse/*.tcc" "${CMAKE_SOURCE_DIR}/Vc/sse/*.h" "${CMAKE_SOURCE_DIR}/Vc/common/*.h")
          add_file_dependencies(${_name}.cpp "${_extra_deps}")
          add_executable(${_target} EXCLUDE_FROM_ALL ${_name}.cpp)
          vc_set_test_target_properties(${_target} SSE "${Vc_SSE_FLAGS}")
@@ -154,7 +154,7 @@ macro(vc_add_test _name)
       set(_target "${name}_avx")
       list(FIND disabled_targets ${_target} _disabled)
       if(_disabled EQUAL -1)
-         file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/avx/*.tcc" "${CMAKE_SOURCE_DIR}/avx/*.h" "${CMAKE_SOURCE_DIR}/common/*.h")
+         file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/Vc/avx/*.tcc" "${CMAKE_SOURCE_DIR}/Vc/avx/*.h" "${CMAKE_SOURCE_DIR}/Vc/common/*.h")
          add_file_dependencies(${_name}.cpp "${_extra_deps}")
          add_executable(${_target} EXCLUDE_FROM_ALL ${_name}.cpp)
          vc_set_test_target_properties(${_target} AVX "${Vc_AVX_FLAGS}")
@@ -165,7 +165,7 @@ macro(vc_add_test _name)
       set(_target "${name}_avx2")
       list(FIND disabled_targets ${_target} _disabled)
       if(_disabled EQUAL -1)
-         file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/avx/*.tcc" "${CMAKE_SOURCE_DIR}/avx/*.h" "${CMAKE_SOURCE_DIR}/common/*.h")
+         file(GLOB _extra_deps "${CMAKE_SOURCE_DIR}/Vc/avx/*.tcc" "${CMAKE_SOURCE_DIR}/Vc/avx/*.h" "${CMAKE_SOURCE_DIR}/Vc/common/*.h")
          add_file_dependencies(${_name}.cpp "${_extra_deps}")
          add_executable(${_target} EXCLUDE_FROM_ALL ${_name}.cpp)
          vc_set_test_target_properties(${_target} AVX2 "${Vc_AVX2_FLAGS}")
@@ -264,7 +264,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(x86_64|AMD64|amd64)")
          COMMAND ${CMAKE_CXX_COMPILER}
          ${incdirs} ${_flags} -O1 -DVc_IMPL=${_impl} ${ARGN} -S -o ${asmfile}
          ${CMAKE_CURRENT_SOURCE_DIR}/abi.cpp
-         DEPENDS abi.cpp ${CMAKE_SOURCE_DIR}/*/*.h ${CMAKE_SOURCE_DIR}/*/*.tcc
+         DEPENDS abi.cpp ${CMAKE_SOURCE_DIR}/Vc/*/*.h ${CMAKE_SOURCE_DIR}/Vc/*/*.tcc
          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
          COMMENT "Build ABI test: ${asmfile}"
          VERBATIM

diff --git a/tests/arithmetics.cpp b/tests/arithmetics.cpp
@@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iostream>
 #include <limits>
 #include <Vc/limits>
-#include <common/const.h>
-#include <common/macros.h>
+#include <../Vc/common/const.h>
+#include <../Vc/common/macros.h>
 #include <random>
 
 using namespace Vc;

diff --git a/tests/math.cpp b/tests/math.cpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vectormemoryhelper.h"
 #include <cmath>
 #include <algorithm>
-#include <common/const.h>
+#include <Vc/common/const.h>
 /*}}}*/
 using namespace Vc;
 

diff --git a/tests/simdarray.cpp b/tests/simdarray.cpp
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 }}}*/
 
 #include "unittest.h"
-#include "../common/simdarray.h"
+#include <Vc/common/simdarray.h>
 
 using namespace Vc;
 

diff --git a/tests/sse_blend.cpp b/tests/sse_blend.cpp
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 }}}*/
 
 #include "unittest.h"
-#include <sse/intrinsics.h>
+#include <Vc/sse/intrinsics.h>
 
 TEST(blendpd)
 {

diff --git a/tests/stlcontainer.cpp b/tests/stlcontainer.cpp
@@ -29,7 +29,7 @@
 #include <list>
 #include <deque>
 
-#include "common/macros.h"
+#include "../Vc/common/macros.h"
 
 template<typename Vec> size_t alignmentMask()
 {