diff --git a/hic/src/hic/hic_library_types.h b/hic/src/hic/hic_library_types.h
index c9c612b5a..72c06adf5 100644
--- a/hic/src/hic/hic_library_types.h
+++ b/hic/src/hic/hic_library_types.h
@@ -9,6 +9,7 @@
  */
 #pragma once
 
+#include "hic/hic_config.h"
 #include "hic/hic_namespace_macro.h"
 
 #if HIC_BACKEND_CUDA
diff --git a/hic/src/hic/hicsparse.h b/hic/src/hic/hicsparse.h
index cde17727d..08786ba07 100644
--- a/hic/src/hic/hicsparse.h
+++ b/hic/src/hic/hicsparse.h
@@ -9,6 +9,10 @@
  */
 #pragma once
 
+#include <stdexcept>
+#include <sstream>
+
+#include "hic/hic_config.h"
 #include "hic/hic_namespace_macro.h"
 #include "hic/hic_library_types.h"
 
@@ -107,9 +111,6 @@ HIC_VALUE(SPARSE_OPERATION_CONJUGATE_TRANSPOSE)
 #endif
 
 inline void hicsparse_assert(hicsparseStatus_t status, const char* const func, const char* const file, const int line) {
-    // Ignore errors when HIP/CUDA runtime is unloaded or deinitialized.
-    // This happens when calling HIP/CUDA after main has ended, e.g. in teardown of static variables calling `hicFree`
-    //   --> ignore hicErrorDeinitialized (a.k.a. cudaErrorCudartUnloading / hipErrorDeinitialized)
     if (status != HICSPARSE_STATUS_SUCCESS) {
         std::ostringstream msg;
         msg << "HIC Runtime Error [code="<<status<<"] at: " << file << " + " << line << " : " << func << "\n";
diff --git a/hic/tests/test_hicsparse.cc b/hic/tests/test_hicsparse.cc
index a4edd1db1..0d977ffaf 100644
--- a/hic/tests/test_hicsparse.cc
+++ b/hic/tests/test_hicsparse.cc
@@ -9,6 +9,7 @@
  */
 #include <iostream>
 #include <functional>
+#include <tuple>
 #include <vector>
 #include <utility>
 #include <cassert>