diff --git a/fmt/format.cc b/fmt/format.cc
index 9f9d6ae1..f68b2f60 100644
--- a/fmt/format.cc
+++ b/fmt/format.cc
@@ -25,8 +25,8 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "fmt/format.h"
-#include "fmt/printf.h"
+#include "format.h"
+#include "printf.h"
 
 #include <string.h>
 
diff --git a/fmt/ostream.cc b/fmt/ostream.cc
index 2890b4a8..2d443f73 100644
--- a/fmt/ostream.cc
+++ b/fmt/ostream.cc
@@ -7,7 +7,7 @@
  For the license information refer to format.h.
  */
 
-#include "fmt/ostream.h"
+#include "ostream.h"
 
 namespace fmt {
 
diff --git a/fmt/ostream.h b/fmt/ostream.h
index e21b2f6d..4e8c6d8c 100644
--- a/fmt/ostream.h
+++ b/fmt/ostream.h
@@ -10,7 +10,7 @@
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
 
-#include "fmt/format.h"
+#include "format.h"
 #include <ostream>
 
 namespace fmt {
diff --git a/fmt/posix.cc b/fmt/posix.cc
index bd25f61a..bc645560 100644
--- a/fmt/posix.cc
+++ b/fmt/posix.cc
@@ -12,7 +12,7 @@
 # define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "fmt/posix.h"
+#include "posix.h"
 
 #include <limits.h>
 #include <sys/types.h>
diff --git a/fmt/posix.h b/fmt/posix.h
index d4cd1198..57847b33 100644
--- a/fmt/posix.h
+++ b/fmt/posix.h
@@ -27,7 +27,7 @@
 # include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
 #endif
 
-#include "fmt/format.h"
+#include "format.h"
 
 #ifndef FMT_POSIX
 # if defined(_WIN32) && !defined(__MINGW32__)
diff --git a/fmt/printf.h b/fmt/printf.h
index f0c0b9a2..48fa14c0 100644
--- a/fmt/printf.h
+++ b/fmt/printf.h
@@ -13,7 +13,7 @@
 #include <algorithm>  // std::fill_n
 #include <limits>     // std::numeric_limits
 
-#include "fmt/ostream.h"
+#include "ostream.h"
 
 namespace fmt {
 namespace internal {
diff --git a/fmt/string.h b/fmt/string.h
index e7beb039..8bfa5424 100644
--- a/fmt/string.h
+++ b/fmt/string.h
@@ -10,7 +10,7 @@
 #ifndef FMT_STRING_H_
 #define FMT_STRING_H_
 
-#include "fmt/format.h"
+#include "format.h"
 
 namespace fmt {
 
diff --git a/fmt/time.h b/fmt/time.h
index 20a5be7a..1bdca203 100644
--- a/fmt/time.h
+++ b/fmt/time.h
@@ -10,7 +10,7 @@
 #ifndef FMT_TIME_H_
 #define FMT_TIME_H_
 
-#include "fmt/format.h"
+#include "format.h"
 #include <ctime>
 
 #ifdef _MSC_VER