diff --git a/execution/CMakeLists.txt b/execution/CMakeLists.txt

index edf51af..37040bc 100644

--- a/execution/CMakeLists.txt

+++ b/execution/CMakeLists.txt

@@ -1,4 +1,4 @@

-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)

+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)

 add_leatherman_deps("${Boost_LIBRARIES}")

 if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")

@@ -10,7 +10,6 @@ endif()

 add_leatherman_includes("${Boost_INCLUDE_DIRS}")

 leatherman_dependency(util)

-leatherman_dependency(nowide)

 leatherman_dependency(locale)

 leatherman_dependency(logging)

 leatherman_dependency(file_util)

diff --git a/file_util/CMakeLists.txt b/file_util/CMakeLists.txt

index 41d6463..3012329 100644

--- a/file_util/CMakeLists.txt

+++ b/file_util/CMakeLists.txt

@@ -1,9 +1,8 @@

-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)

+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)

 add_leatherman_deps("${Boost_LIBRARIES}")

 add_leatherman_includes("${Boost_INCLUDE_DIRS}")

-leatherman_dependency(nowide)

 leatherman_dependency(locale)

 leatherman_dependency(logging)

 leatherman_dependency(util)

diff --git a/file_util/src/file.cc b/file_util/src/file.cc

index 1c523b2..2ee5107 100644

--- a/file_util/src/file.cc

+++ b/file_util/src/file.cc

@@ -1,6 +1,6 @@

 #include <leatherman/file_util/file.hpp>

 #include <boost/nowide/fstream.hpp>

-#include <boost/nowide/cenv.hpp>

+#include <boost/nowide/cstdlib.hpp>

 #include <boost/filesystem.hpp>

 #include <sstream>

 #include <leatherman/logging/logging.hpp>

diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt

index 9d26e5a..5c671a4 100644

--- a/logging/CMakeLists.txt

+++ b/logging/CMakeLists.txt

@@ -4,7 +4,6 @@ find_package(Threads)

 add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})

 add_leatherman_includes("${Boost_INCLUDE_DIRS}")

-leatherman_dependency(nowide)

 leatherman_dependency(locale)

 if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")

diff --git a/nowide/CMakeLists.txt b/nowide/CMakeLists.txt

index ff9dba6..5d1b9ce 100644

--- a/nowide/CMakeLists.txt

+++ b/nowide/CMakeLists.txt

@@ -1,7 +1,5 @@

 find_package(Boost 1.54 REQUIRED)

-add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include")

-add_leatherman_headers(../vendor/nowide/include/boost)

 if(WIN32)

     add_leatherman_library(../vendor/nowide/src/iostream.cpp)

 endif()

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt

index fa1760f..acc1e5c 100644

--- a/tests/CMakeLists.txt

+++ b/tests/CMakeLists.txt

@@ -1,8 +1,8 @@

-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)

+set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide)

 if (LEATHERMAN_USE_LOCALES)

     set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)

 endif()

-find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

+find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

 include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS})

 add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS})

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt

index 4d340a9..64e8bd7 100644

--- a/util/CMakeLists.txt

+++ b/util/CMakeLists.txt

@@ -1,10 +1,8 @@

-find_package(Boost 1.54 REQUIRED date_time chrono system)

+find_package(Boost 1.73 REQUIRED date_time chrono system nowide)

 add_leatherman_deps(${Boost_LIBRARIES})

 add_leatherman_includes("${Boost_INCLUDE_DIRS}")

-leatherman_dependency(nowide)

-

 if(WIN32)

     set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc")

     set(PLATFORM_TESTS "tests/windows/environment.cc")

diff --git a/util/src/environment.cc b/util/src/environment.cc

index 8f2ba33..3fbe537 100644

--- a/util/src/environment.cc

+++ b/util/src/environment.cc

@@ -1,5 +1,5 @@

 #include <leatherman/util/environment.hpp>

-#include <boost/nowide/cenv.hpp>

+#include <boost/nowide/cstdlib.hpp>

 #include <stdexcept>

 using namespace std;

diff --git a/util/tests/environment.cc b/util/tests/environment.cc

index 2c694aa..2c116d1 100644

--- a/util/tests/environment.cc

+++ b/util/tests/environment.cc

@@ -1,6 +1,6 @@

 #include <catch.hpp>

 #include <leatherman/util/environment.hpp>

-#include <boost/nowide/cenv.hpp>

+#include <boost/nowide/cstdlib.hpp>

 using namespace std;

 using namespace leatherman::util;