diff --git a/src/util/in-memory-storage-fifo.hpp b/src/util/in-memory-storage-fifo.hpp
index da7f0fc..fc83fe5 100644
--- a/src/util/in-memory-storage-fifo.hpp
+++ b/src/util/in-memory-storage-fifo.hpp
@@ -43,7 +43,7 @@
   virtual
   ~InMemoryStorageFifo();
 
-PUBLIC_WITH_TESTS_ELSE_PROTECTED:
+NDN_CXX_PUBLIC_WITH_TESTS_ELSE_PROTECTED:
   /** @brief Removes one Data packet from in-memory storage based on FIFO
    *  @return{ whether the Data was removed }
    */
diff --git a/src/util/in-memory-storage-lfu.hpp b/src/util/in-memory-storage-lfu.hpp
index 221c7ca..ac8a02d 100644
--- a/src/util/in-memory-storage-lfu.hpp
+++ b/src/util/in-memory-storage-lfu.hpp
@@ -46,7 +46,7 @@
   virtual
   ~InMemoryStorageLfu();
 
-PUBLIC_WITH_TESTS_ELSE_PROTECTED:
+NDN_CXX_PUBLIC_WITH_TESTS_ELSE_PROTECTED:
   /** @brief Removes one Data packet from in-memory storage based on LFU, i.e. evict the least
    *  frequently accessed Data packet
    *  @return{ whether the Data was removed }
diff --git a/src/util/in-memory-storage-lru.hpp b/src/util/in-memory-storage-lru.hpp
index 4ff82fc..bde0de4 100644
--- a/src/util/in-memory-storage-lru.hpp
+++ b/src/util/in-memory-storage-lru.hpp
@@ -45,7 +45,7 @@
   virtual
   ~InMemoryStorageLru();
 
-PUBLIC_WITH_TESTS_ELSE_PROTECTED:
+NDN_CXX_PUBLIC_WITH_TESTS_ELSE_PROTECTED:
   /** @brief Removes one Data packet from in-memory storage based on LRU, i.e. evict the least
    *  recently accessed Data packet
    *  @return{ whether the Data was removed }
diff --git a/src/util/in-memory-storage-persistent.hpp b/src/util/in-memory-storage-persistent.hpp
index 85cd2e8..cd9faa3 100644
--- a/src/util/in-memory-storage-persistent.hpp
+++ b/src/util/in-memory-storage-persistent.hpp
@@ -39,7 +39,7 @@
   virtual
   ~InMemoryStoragePersistent();
 
-PUBLIC_WITH_TESTS_ELSE_PROTECTED:
+NDN_CXX_PUBLIC_WITH_TESTS_ELSE_PROTECTED:
   /** @brief Do nothing.
    *
    *  This storage is persistent, and does not support eviction.
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