diff --git a/global.h b/global.h
index 64c4918..5a9e70b 100644
--- a/global.h
+++ b/global.h
@@ -10,8 +10,8 @@
 #define PASSWORD_FILE_EXPORT
 #define PASSWORD_FILE_IMPORT
 #else
-#define PASSWORD_FILE_EXPORT LIB_EXPORT
-#define PASSWORD_FILE_IMPORT LIB_IMPORT
+#define PASSWORD_FILE_EXPORT CPP_UTILITIES_GENERIC_LIB_EXPORT
+#define PASSWORD_FILE_IMPORT CPP_UTILITIES_GENERIC_LIB_IMPORT
 #endif
 
 /*!
diff --git a/tests/entrytests.cpp b/tests/entrytests.cpp
index 91bd3e1..2b844fb 100644
--- a/tests/entrytests.cpp
+++ b/tests/entrytests.cpp
@@ -190,7 +190,7 @@ void EntryTests::testUniqueLabels()
 {
     NodeEntry root("root");
     const auto *const fooEntry = new AccountEntry("foo", &root);
-    VAR_UNUSED(fooEntry)
+    CPP_UTILITIES_UNUSED(fooEntry)
     const auto *const foo2Entry = new AccountEntry("foo", &root);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("2nd foo renamed to foo 2", "foo 2"s, foo2Entry->label());
     const auto *const foo3Entry = new AccountEntry("foo", &root);