Index: src/build-data/makefile/unix.in
--- src/build-data/makefile/unix.in.orig	2017-10-02 08:00:00.000000000 +0200
+++ src/build-data/makefile/unix.in	2018-03-27 14:00:16.358582000 +0200
@@ -16,8 +16,8 @@
 
 BINDIR        = $(DESTDIR)/bin
 LIBDIR        = $(DESTDIR)/%{libdir}
-HEADERDIR     = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
-DOCDIR        = $(DESTDIR)/%{docdir}/botan-$(VERSION)
+HEADERDIR     = $(DESTDIR)/%{includedir}/botan
+DOCDIR        = $(DESTDIR)/%{docdir}
 PKGCONF_DIR   = $(LIBDIR)/pkgconfig
 
 CONFIG_SCRIPT = %{botan_config}
Index: src/utils/cpuid.cpp
--- src/utils/cpuid.cpp.orig	2017-10-02 08:00:00.000000000 +0200
+++ src/utils/cpuid.cpp	2018-03-27 14:00:16.358742000 +0200
@@ -24,7 +24,7 @@
 
 #endif
 
-#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
+#if 0
 
 #if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
 
Index: src/utils/safeint.h
--- src/utils/safeint.h.orig	2018-03-27 14:00:16.358894000 +0200
+++ src/utils/safeint.h	2018-03-27 14:00:55.437291000 +0200
@@ -11,13 +11,21 @@
 #include <botan/exceptn.h>
 #include <string>
 
+#include <sstream>
+
+template <typename T> std::string my_to_string(const T& n) {
+    std::ostringstream stm;
+    stm << n;
+    return stm.str();
+}
+
 namespace Botan {
 
 class Integer_Overflow_Detected : public Exception
    {
    public:
       Integer_Overflow_Detected(const std::string& file, int line) :
-         Exception("Integer overflow detected at " + file + ":" + to_string(line))
+         Exception("Integer overflow detected at " + file + ":" + my_to_string(line))
          {}
    };
 
Index: src/utils/types.h
--- src/utils/types.h.orig	2017-10-02 08:00:00.000000000 +0200
+++ src/utils/types.h	2018-03-27 14:00:16.359139000 +0200
@@ -43,7 +43,7 @@
    typedef unsigned __int64 u64bit;
 #elif defined(__KCC)
    typedef unsigned __long_long u64bit;
-#elif defined(__GNUG__)
+#elif defined(__GNUC__)
    __extension__ typedef unsigned long long u64bit;
 #else
    typedef unsigned long long u64bit;