diff --git a/fmt/CMakeLists.txt b/fmt/CMakeLists.txt
index 083652df..bc8b2026 100644
--- a/fmt/CMakeLists.txt
+++ b/fmt/CMakeLists.txt
@@ -20,7 +20,7 @@ if (FMT_PEDANTIC)
   target_compile_options(fmt PRIVATE ${PEDANTIC_COMPILE_FLAGS})
 endif ()
 
-target_include_directories(fmt INTERFACE
+target_include_directories(fmt PUBLIC
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:include>)
 
diff --git a/fmt/format.cc b/fmt/format.cc
index 886cb9b6..ad3a1cb0 100644
--- a/fmt/format.cc
+++ b/fmt/format.cc
@@ -25,7 +25,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "format.h"
+#include "fmt/format.h"
 
 #include <string.h>
 
diff --git a/fmt/ostream.cc b/fmt/ostream.cc
index 0ba30347..3868d384 100644
--- a/fmt/ostream.cc
+++ b/fmt/ostream.cc
@@ -25,7 +25,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ostream.h"
+#include "fmt/ostream.h"
 
 namespace fmt {
 
diff --git a/fmt/ostream.h b/fmt/ostream.h
index 458d31de..5654eb1b 100644
--- a/fmt/ostream.h
+++ b/fmt/ostream.h
@@ -28,7 +28,7 @@
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
 
-#include "format.h"
+#include "fmt/format.h"
 #include <ostream>
 
 namespace fmt {
diff --git a/fmt/posix.cc b/fmt/posix.cc
index 1ec746a4..c8f828a5 100644
--- a/fmt/posix.cc
+++ b/fmt/posix.cc
@@ -30,7 +30,7 @@
 # define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "posix.h"
+#include "fmt/posix.h"
 
 #include <limits.h>
 #include <sys/types.h>
diff --git a/fmt/posix.h b/fmt/posix.h
index ab6d12e8..a830f6b2 100644
--- a/fmt/posix.h
+++ b/fmt/posix.h
@@ -45,7 +45,7 @@
 # include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
 #endif
 
-#include "format.h"
+#include "fmt/format.h"
 
 #ifndef FMT_POSIX
 # if defined(_WIN32) && !defined(__MINGW32__)
diff --git a/fmt/string.h b/fmt/string.h
index 31c7e9d9..4fc1f767 100644
--- a/fmt/string.h
+++ b/fmt/string.h
@@ -10,7 +10,7 @@
 #ifndef FMT_STRING_H_
 #define FMT_STRING_H_
 
-#include "format.h"
+#include "fmt/format.h"
 
 namespace fmt {
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 618c1221..8758e47e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -111,6 +111,7 @@ endif ()
 check_cxx_compiler_flag(-fno-exceptions HAVE_FNO_EXCEPTIONS_FLAG)
 if (HAVE_FNO_EXCEPTIONS_FLAG)
   add_library(noexception-test ../fmt/format.cc)
+  target_include_directories(noexception-test PRIVATE ${PROJECT_SOURCE_DIR})
   target_compile_options(noexception-test PRIVATE -fno-exceptions)
 endif ()
 
@@ -118,6 +119,7 @@ if (FMT_PEDANTIC)
   # Test that the library compiles without windows.h.
   if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     add_library(no-windows-h-test ../fmt/format.cc)
+    target_include_directories(no-windows-h-test PRIVATE ${PROJECT_SOURCE_DIR})
     target_compile_definitions(no-windows-h-test PRIVATE FMT_USE_WINDOWS_H=0)
   endif ()