diff --git a/lib/test_suite.hpp b/lib/test_suite.hpp
index 16ac810..8c44681 100644
--- a/lib/test_suite.hpp
+++ b/lib/test_suite.hpp
@@ -17,7 +17,7 @@ void test(mealy const & specification, transfer_sequences const & prefixes,
           separating_family const & separating_family, size_t k_max, writer const & output);
 
 /// \brief Performs random non-exhaustive tests for more states (harmonized, e.g. HSI / DS)
-[[noreturn]] void randomized_test(mealy const & specification, transfer_sequences const & prefixes,
+void randomized_test(mealy const & specification, transfer_sequences const & prefixes,
                                   separating_family const & separating_family, size_t min_k,
                                   size_t rnd_length, writer const & output);
 
diff --git a/lib/types.hpp b/lib/types.hpp
index f268123..16598da 100644
--- a/lib/types.hpp
+++ b/lib/types.hpp
@@ -1,16 +1,12 @@
 #pragma once
 
-#include <stddef.h> // for size_t
+#include <cstdint>
 #include <vector>
 
-#ifndef __APPLE__
-using uint16_t = __int16;
-#endif
-
 // We use size_ts for fast indexing. Note that there is little type safety here
-using state = uint16_t;
-using input = uint16_t;
-using output = uint16_t;
+using state = std::uint16_t;
+using input = std::uint16_t;
+using output = std::uint16_t;
 
 using word = std::vector<input>;