diff --git a/include/mapnik/unicode.hpp b/include/mapnik/unicode.hpp
index 3b6d66498..4b2ca68f8 100644
--- a/include/mapnik/unicode.hpp
+++ b/include/mapnik/unicode.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/value_types.hpp>
 
-// stl
+// std
 #include <cstdint>
 #include <string>
 
diff --git a/src/unicode.cpp b/src/unicode.cpp
index c6a012bc1..f6c059f60 100644
--- a/src/unicode.cpp
+++ b/src/unicode.cpp
@@ -24,9 +24,8 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 
-// stl
-#include <cstdlib>
-#include <string>
+// std
+#include <stdexcept>
 
 // icu
 #include <unicode/ucnv.h>