diff --git a/src/util/in-memory-storage.hpp b/src/util/in-memory-storage.hpp
index 2db5564..fb7ddb6 100644
--- a/src/util/in-memory-storage.hpp
+++ b/src/util/in-memory-storage.hpp
@@ -201,7 +201,7 @@
   InMemoryStorage::const_iterator
   end() const;
 
-PUBLIC_WITH_TESTS_ELSE_PROTECTED:
+NDN_CXX_PUBLIC_WITH_TESTS_ELSE_PROTECTED:
   /** @brief Update the entry when the entry is returned by the find() function
    *  according to derived class implemented replacement policy
    */
@@ -232,7 +232,7 @@
   virtual bool
   evictItem() = 0;
 
-PUBLIC_WITH_TESTS_ELSE_PROTECTED:
+NDN_CXX_PUBLIC_WITH_TESTS_ELSE_PROTECTED:
   /** @brief sets current capacity of in-memory storage (in packets)
    */
   void
@@ -269,7 +269,7 @@
   void
   printCache(std::ostream& os) const;
 
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+NDN_CXX_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
   /** @brief free in-memory storage entries by an iterator pointing to that entry.
     */
   void