diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc8e0cf..af02c45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,17 +6,8 @@ find_package(ament_cmake REQUIRED)
 find_package(ament_cmake_ros_core REQUIRED)
 find_package(rcutils REQUIRED)
 
-# Default to C11
-if(NOT CMAKE_C_STANDARD)
-  set(CMAKE_C_STANDARD 11)
-endif()
 # Note: std::expected is C++23, not C++20. Keep the vendored tl_expected
 # until this package can be bumped to CMAKE_CXX_STANDARD 23.
-# Default to C++17
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
-endif()
-
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   # enables building a static library but later link it into a dynamic library
   add_compile_options(-fPIC)
@@ -40,7 +31,7 @@ if(WIN32)
   target_compile_definitions(${PROJECT_NAME}
     PRIVATE "RCPPUTILS_BUILDING_LIBRARY")
 endif()
-target_link_libraries(${PROJECT_NAME} PUBLIC rcutils::rcutils)
+target_link_libraries(${PROJECT_NAME} PUBLIC rcutils::rcutils ament_cmake_ros_core::ament_ros_defaults)
 
 # Export old-style CMake variables
 ament_export_include_directories("include/${PROJECT_NAME}")
diff --git a/include/rcpputils/endian.hpp b/include/rcpputils/endian.hpp
index 8017a2a..81e9f57 100644
--- a/include/rcpputils/endian.hpp
+++ b/include/rcpputils/endian.hpp
@@ -24,6 +24,12 @@
 #ifndef RCPPUTILS__ENDIAN_HPP_
 #define RCPPUTILS__ENDIAN_HPP_
 
+#if defined(_MSC_VER)
+    #pragma message("WARNING: rcpputils/endian.hpp is deprecated. Use std::endian from <bit> header instead.")
+#else
+    #warning WARNING: rcpputils/endian.hpp is deprecated. Use std::endian from <bit> header instead.
+#endif
+
 // TODO(anyone) replace this macro when the appropriate C++20 value lands.
 #if !defined(RCPPUTILS_NO_STD_ENDIAN) && (__cplusplus <= 201703L)
 #define RCPPUTILS_NO_STD_ENDIAN