diff --git a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
index c62e29c87d2949bb8cec9bee7f7e06dbf47a0b68..a233ed30cc3fb7d962bb7394d22474897a730149 100644
--- a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
+++ b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: AtlasCompilerSettings.cmake 744652 2016-05-03 19:40:31Z krasznaa $
+# $Id: AtlasCompilerSettings.cmake 754486 2016-06-13 13:31:01Z smh $
 #
 # This file collects settings fine-tuning all the compiler and linker options
 # used in an ATLAS build in one place. It is included by default when using
@@ -29,16 +29,7 @@ set( CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard used for the build" )
 set( CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "(Dis)allow using GNU extensions" )
 
 # Set the definitions needed everywhere:
-add_definitions( -DHAVE_PRETTY_FUNCTION
-   -DHAVE_EXPLICIT -DHAVE_MUTABLE -DHAVE_SIGNED -DHAVE_TYPENAME
-   -DHAVE_NEW_STYLE_CASTS -DHAVE_DYNAMIC_CAST -DHAVE_TYPEID
-   -DHAVE_ANSI_TEMPLATE_INSTANTIATION -DHAVE_TEMPLATE_DEFAULT_ARGS
-   -DHAVE_BROKEN_TEMPLATE_RESCOPE -DHAVE_TEMPLATE_NULL_ARGS
-   -DHAVE_TEMPLATE_NULL_SPEC -DHAVE_TEMPLATE_PARTIAL_SPEC
-   -DHAVE_MEMBER_TEMPLATES -DHAVE_ANSI_OPERATOR_ARROW
-   -DHAVE_NAMESPACES -DHAVE_NAMESPACE_STD
-   -DHAVE_OSTREAM_CHAR_OVERLOAD -DHAVE_ITERATOR_TRAITS -DHAVE_ITERATOR
-   -DHAVE_REVERSE_ITERATOR_STYLE -DHAVE_CXX_STDC_HEADERS )
+add_definitions( -DHAVE_PRETTY_FUNCTION )
 
 # Function helping with setting up variable type checks
 function( _check_for_type typeName definition )
@@ -48,10 +39,6 @@ function( _check_for_type typeName definition )
    endif()
 endfunction( _check_for_type )
 
-# Check for various C++ types:
-_check_for_type( "long long" LONG_LONG )
-_check_for_type( "bool" BOOL )
-
 # Function helping with setting up header checks
 function( _check_for_include include definition )
    check_include_file_cxx( ${include} ${definition} )
@@ -60,9 +47,6 @@ function( _check_for_include include definition )
    endif()
 endfunction( _check_for_include )
 
-# Check for various C++ includes:
-_check_for_include( "iostream" HAVE_NEW_IOSTREAMS )
-
 # Clean up:
 unset( _check_for_type )
 unset( _check_for_include )
diff --git a/Build/AtlasCMake/modules/AtlasInternals.cmake b/Build/AtlasCMake/modules/AtlasInternals.cmake
index e2c6559038948fa3e908f8434b3d9c0874c97109..97b82a290788fe0f228547c3151f03d5d5f736ad 100644
--- a/Build/AtlasCMake/modules/AtlasInternals.cmake
+++ b/Build/AtlasCMake/modules/AtlasInternals.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: AtlasInternals.cmake 751680 2016-06-02 08:25:55Z krasznaa $
+# $Id: AtlasInternals.cmake 755445 2016-06-16 15:09:56Z krasznaa $
 #
 # Functions used internally by functions declared in AtlasFunctions.
 # Which are for general use inside the package descriptions.
@@ -241,7 +241,7 @@ function( atlas_os_id os isValid )
       elseif( _linuxId MATCHES "Ubuntu" )
          set( _linuxShort "ubuntu" )
       elseif( _linuxId MATCHES "CentOS" )
-         set( _linuxShort "cc" )
+         set( _linuxShort "centos" )
       else()
          message( WARNING "Linux flavour not recognised" )
          set( _linuxShort "linux" )
diff --git a/Build/AtlasCMake/modules/FindGaudi.cmake b/Build/AtlasCMake/modules/FindGaudi.cmake
index 67ab62aa24a0a0167139d4bc48f989b6abcecf55..3996e5c9c25da11027ed6f9641906d58e35aba49 100644
--- a/Build/AtlasCMake/modules/FindGaudi.cmake
+++ b/Build/AtlasCMake/modules/FindGaudi.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindGaudi.cmake 753396 2016-06-07 15:36:05Z krasznaa $
+# $Id: FindGaudi.cmake 755055 2016-06-15 15:07:02Z krasznaa $
 #
 # CMake script attempting to find a Gaudi installation that we can build
 # the offline code against. Without making any use of the CMake code
@@ -137,5 +137,4 @@ else()
 endif()
 set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
    "GAUDI_${version}_${ATLAS_PLATFORM}" )
-message( "Added dependency: GAUDI_${version}_${ATLAS_PLATFORM}" )
 unset( version )