diff --git a/src/libclang/preprocessor.cpp b/src/libclang/preprocessor.cpp
index 96f7f32..e5ffd29 100644
--- a/src/libclang/preprocessor.cpp
+++ b/src/libclang/preprocessor.cpp
@@ -8,14 +8,7 @@
 #include <cstddef>
 #include <cstring>
 
-// treat the tiny-process-library as header only
 #include <process.hpp>
-#include <process.cpp>
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32)
-#include <process_win.cpp>
-#else
-#include <process_unix.cpp>
-#endif
 
 #include <type_safe/flag.hpp>
 #include <type_safe/optional.hpp>
diff --git a/src/parser.cpp b/src/parser.cpp
index 7fa4f3c..64f59a3 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -13,7 +13,7 @@ using namespace cppast;
 
 bool diagnostic_logger::log(const char* source, const diagnostic& d) const
 {
-    if (d.severity == severity::error)
+    if (d.severity == severity::error || d.severity == severity::critical)
         error_ = true;
     else if (!verbose_ && d.severity == severity::debug)
         return false;
diff --git a/test/test_parser.hpp b/test/test_parser.hpp
index e6fd852..5f7951f 100644
--- a/test/test_parser.hpp
+++ b/test/test_parser.hpp
@@ -35,7 +35,8 @@ inline std::unique_ptr<cppast::cpp_file> parse(const cppast::cpp_entity_index& i
     stderr_diagnostic_logger logger;
     libclang_parser          p(type_safe::ref(logger));
 
-    auto result = p.parse(idx, name, config);
+    std::unique_ptr<cppast::cpp_file> result;
+    REQUIRE_NOTHROW(result = p.parse(idx, name, config));
     REQUIRE(!logger.error_logged());
     return result;
 }