aboutsummaryrefslogtreecommitdiffstats
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/Error.hxx1
-rw-r--r--src/util/FormatString.cxx5
-rw-r--r--src/util/Tokenizer.cxx3
3 files changed, 5 insertions, 4 deletions
diff --git a/src/util/Error.hxx b/src/util/Error.hxx
index facb461dc..aa704d593 100644
--- a/src/util/Error.hxx
+++ b/src/util/Error.hxx
@@ -24,6 +24,7 @@
#include "Compiler.h"
#include <string>
+#include <utility>
#include <assert.h>
diff --git a/src/util/FormatString.cxx b/src/util/FormatString.cxx
index c13d0fb52..ea6d41860 100644
--- a/src/util/FormatString.cxx
+++ b/src/util/FormatString.cxx
@@ -19,10 +19,13 @@
#include "FormatString.hxx"
-#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef WIN32
+#include <string.h>
+#endif
+
char *
FormatNewV(const char *fmt, va_list args)
{
diff --git a/src/util/Tokenizer.cxx b/src/util/Tokenizer.cxx
index 1c8af23fd..c9eb3949e 100644
--- a/src/util/Tokenizer.cxx
+++ b/src/util/Tokenizer.cxx
@@ -26,9 +26,6 @@
#include <glib.h>
-#include <assert.h>
-#include <string.h>
-
static constexpr Domain tokenizer_domain("tokenizer");
static inline bool