diff --git a/SConstruct b/SConstruct
index 9542696..2c216cc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -250,6 +250,6 @@ env.Alias( 'src-dist', srcdist_cmd )
 
 buildProjectInDirectory( 'src/jsontestrunner' )
 buildProjectInDirectory( 'src/lib_json' )
-buildProjectInDirectory( 'doc' )
+#buildProjectInDirectory( 'doc' ) # THIS IS BROKEN.
 #print env.Dump()
 
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
index 0ded777..9869686 100644
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -1,8 +1,9 @@
 #include <json/reader.h>
 #include <json/value.h>
 #include <utility>
-#include <stdio.h>
-#include <assert.h>
+#include <cstdio>
+#include <cassert>
+#include <cstring>
 #include <iostream>
 #include <stdexcept>
 
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index a917772..734bf16 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -3,11 +3,12 @@
 #include <json/writer.h>
 #include <utility>
 #include <stdexcept>
-#include "assert.h"
+#include <cstring>
+#include <cassert>
 #ifdef JSON_USE_CPPTL
 # include <cpptl/conststring.h>
 #endif
-#include <stddef.h>    // size_t
+#include <cstddef>    // size_t
 #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
 # include "json_batchallocator.h"
 #endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR