diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00140e0f..f501c149 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ArduinoJson: change log
 =======================
 
+HEAD
+----
+
+* Fixed error `IsBaseOf is not a member of ArduinoJson::TypeTraits` (issue #495)
+
 v5.9.0
 ------
 
diff --git a/scripts/build-single-header.sh b/scripts/build-single-header.sh
index 3ca9eea3..b09e91f6 100644
--- a/scripts/build-single-header.sh
+++ b/scripts/build-single-header.sh
@@ -40,5 +40,14 @@ process()
 cd $(dirname $0)/../
 INCLUDED=()
 process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
+g++ -x c++ -c -o ../smoketest.o - <<END
+#include "../ArduinoJson-$TAG.h"
+int main() {}
+END
+
 INCLUDED=()
-process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
\ No newline at end of file
+process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
+g++ -x c++ -c -o ../smoketest.o - <<END
+#include "../ArduinoJson-$TAG.hpp"
+int main() {}
+END
\ No newline at end of file
diff --git a/src/ArduinoJson/StringTraits/ArduinoStream.hpp b/src/ArduinoJson/StringTraits/ArduinoStream.hpp
index 484d6e04..87d1672d 100644
--- a/src/ArduinoJson/StringTraits/ArduinoStream.hpp
+++ b/src/ArduinoJson/StringTraits/ArduinoStream.hpp
@@ -11,10 +11,6 @@
 
 #include <Stream.h>
 
-#include "../TypeTraits/EnableIf.hpp"
-#include "../TypeTraits/IsBaseOf.hpp"
-#include "../TypeTraits/RemoveReference.hpp"
-
 namespace ArduinoJson {
 namespace Internals {
 
diff --git a/src/ArduinoJson/StringTraits/CharPointer.hpp b/src/ArduinoJson/StringTraits/CharPointer.hpp
index 382d7e23..bbdf1e92 100644
--- a/src/ArduinoJson/StringTraits/CharPointer.hpp
+++ b/src/ArduinoJson/StringTraits/CharPointer.hpp
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include "../TypeTraits/EnableIf.hpp"
-#include "../TypeTraits/IsChar.hpp"
-
 namespace ArduinoJson {
 namespace Internals {
 
diff --git a/src/ArduinoJson/StringTraits/StdStream.hpp b/src/ArduinoJson/StringTraits/StdStream.hpp
index 3085cf65..35049d94 100644
--- a/src/ArduinoJson/StringTraits/StdStream.hpp
+++ b/src/ArduinoJson/StringTraits/StdStream.hpp
@@ -10,9 +10,6 @@
 #if ARDUINOJSON_ENABLE_STD_STREAM
 
 #include <istream>
-#include "../TypeTraits/EnableIf.hpp"
-#include "../TypeTraits/IsBaseOf.hpp"
-#include "../TypeTraits/RemoveReference.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
diff --git a/src/ArduinoJson/StringTraits/StringTraits.hpp b/src/ArduinoJson/StringTraits/StringTraits.hpp
index 9fd03065..51f49c0a 100644
--- a/src/ArduinoJson/StringTraits/StringTraits.hpp
+++ b/src/ArduinoJson/StringTraits/StringTraits.hpp
@@ -8,6 +8,10 @@
 #pragma once
 
 #include "../Configuration.hpp"
+#include "../TypeTraits/EnableIf.hpp"
+#include "../TypeTraits/IsBaseOf.hpp"
+#include "../TypeTraits/IsChar.hpp"
+#include "../TypeTraits/RemoveReference.hpp"
 
 namespace ArduinoJson {
 namespace Internals {