diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1ecf0d..6cc2c17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ include_directories(${PROJECT_SOURCE_DIR}/googletest/googletest/include)
 
 target_link_libraries(${PROJECT_TEST} gtest_main gtest)
 
-target_compile_definitions(${PROJECT_TEST} PRIVATE "TESTING")
+target_compile_definitions(${PROJECT_TEST} PRIVATE "DAECPP_TESTING")
 
 include(GoogleTest)
 gtest_discover_tests(${PROJECT_TEST})
diff --git a/dae-cpp/assert-custom.hpp b/dae-cpp/assert-custom.hpp
index a2c0814..f5905bc 100644
--- a/dae-cpp/assert-custom.hpp
+++ b/dae-cpp/assert-custom.hpp
@@ -39,7 +39,7 @@ namespace daecpp_namespace_name
  * Example:
  * WARNING("v = " << v);
  */
-#ifdef TESTING
+#ifdef DAECPP_TESTING
 #define WARNING(msg)
 #else
 #define WARNING(msg) \
@@ -54,7 +54,7 @@ namespace daecpp_namespace_name
  * Example:
  * NOTE("v = " << v);
  */
-#ifdef TESTING
+#ifdef DAECPP_TESTING
 #define NOTE(msg)
 #else
 #define NOTE(msg) \
@@ -69,7 +69,7 @@ namespace daecpp_namespace_name
  * Example:
  * NOTE(verbosity > 1, "v = " << v);
  */
-#ifdef TESTING
+#ifdef DAECPP_TESTING
 #define PRINT(condition, msg)
 #else
 #define PRINT(condition, msg)          \
diff --git a/dae-cpp/typedefs.hpp b/dae-cpp/typedefs.hpp
index 1960b82..6deb28e 100644
--- a/dae-cpp/typedefs.hpp
+++ b/dae-cpp/typedefs.hpp
@@ -54,7 +54,7 @@ enum status
 };
 } // namespace exit_code
 
-// Unsigned integer type
+// Integer type
 #ifdef DAECPP_LONG
 typedef std::int64_t int_type;
 #else
@@ -77,7 +77,7 @@ typedef autodiff::real1st state_value;
 namespace core
 {
 
-// Unsigned integer vector
+// Integer vector
 typedef std::vector<int_type> ivec;
 
 // Floating point (double or single precision) vector
diff --git a/dae-cpp/version.hpp b/dae-cpp/version.hpp
index 7c46777..d867ce2 100644
--- a/dae-cpp/version.hpp
+++ b/dae-cpp/version.hpp
@@ -18,13 +18,13 @@ namespace daecpp_namespace_name
 {
 
 // dae-cpp library major version
-static constexpr uint16_t version_major{DAECPP_VERSION_MAJOR};
+inline constexpr uint16_t version_major{DAECPP_VERSION_MAJOR};
 
 // dae-cpp library minor version
-static constexpr uint16_t version_minor{DAECPP_VERSION_MINOR};
+inline constexpr uint16_t version_minor{DAECPP_VERSION_MINOR};
 
 // dae-cpp library patch version
-static constexpr uint16_t version_patch{DAECPP_VERSION_PATCH};
+inline constexpr uint16_t version_patch{DAECPP_VERSION_PATCH};
 
 } // namespace daecpp_namespace_name