From f28645f9002e7ec139d6b506d2eefb10b288f804 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Thu, 24 Apr 2014 12:37:06 -0700
Subject: [PATCH] Fix includes.

---
 format.cc | 2 ++
 format.h  | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/format.cc b/format.cc
index ab2a0ea3..56c93cc4 100644
--- a/format.cc
+++ b/format.cc
@@ -33,7 +33,9 @@
 
 #include "format.h"
 
+#include <cassert>
 #include <cctype>
+#include <climits>
 #include <cmath>
 #include <cstdarg>
 
diff --git a/format.h b/format.h
index 982b7852..75dbf3fe 100644
--- a/format.h
+++ b/format.h
@@ -30,11 +30,8 @@
 
 #include <stdint.h>
 
-#include <cassert>
-#include <climits>
-#include <cstddef>
+#include <cstddef>  // for std::ptrdiff_t
 #include <cstdio>
-#include <cstring>
 #include <algorithm>
 #include <iterator>
 #include <limits>
@@ -79,6 +76,10 @@
        (FMT_GCC_VERSION >= 403 && __cplusplus >= 201103) || _MSC_VER >= 1600)
 #endif
 
+#if FMT_USE_RVALUE_REFERENCES
+# include <utility>  // for std::move
+#endif
+
 // Define FMT_USE_NOEXCEPT to make format use noexcept (C++11 feature).
 #if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
   (FMT_GCC_VERSION >= 408 && __cplusplus >= 201103)