diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9de1082..8795f5ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,14 @@ else ()
     message(CHECK_PASS "no")
 endif (ENABLE_TESTS)
 
+option(SHARED_LIBS "Build dvmcommon and vocoder as shared libraries" off)
+message(CHECK_START "Build dvmcommon and vocoder as shared libraries")
+if (SHARED_LIBS)
+    message(CHECK_PASS "yes")
+else ()
+    message(CHECK_PASS "no")
+endif (SHARED_LIBS)
+
 option(ENABLE_TUI_SUPPORT "Enable TUI support" on)
 message(CHECK_START "Enable TUI support")
 if (ENABLE_TUI_SUPPORT)
@@ -286,6 +294,12 @@ if (ENABLE_TESTS)
     target_compile_definitions(dvmtests PUBLIC -DCATCH2_TEST_COMPILATION)
     target_link_libraries(dvmtests PRIVATE Catch2::Catch2WithMain common ${OPENSSL_LIBRARIES} asio::asio Threads::Threads util)
     target_include_directories(dvmtests PRIVATE ${OPENSSL_INCLUDE_DIR} src src/host src/fne tests)
+    if (SHARED_LIBS AND NOT COMPILE_WIN32)
+        set_target_properties(dvmtests PROPERTIES
+            BUILD_RPATH_USE_ORIGIN TRUE
+            BUILD_RPATH "$ORIGIN;/opt/dvm/bin;/opt/dvm/lib;/usr/local/bin;/usr/local/lib;/usr/bin"
+            INSTALL_RPATH "$ORIGIN;/opt/dvm/bin;/opt/dvm/lib;/usr/local/bin;/usr/local/lib;/usr/bin")
+    endif ()
     catch_discover_tests(dvmtests)
 endif (ENABLE_TESTS)
 
@@ -301,6 +315,12 @@ install(TARGETS tged DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 endif (ENABLE_TUI_SUPPORT AND (NOT DISABLE_TUI_APPS))
 install(TARGETS dvmbridge DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 install(TARGETS dvmpatch DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+if (SHARED_LIBS)
+    install(TARGETS common vocoder
+        RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+endif (SHARED_LIBS)
 install(FILES configs/config.example.yml configs/fne-config.example.yml configs/fne-sysview.example.yml configs/monitor-config.example.yml configs/iden_table.example.dat configs/RSSI.dat configs/rid_acl.example.dat configs/talkgroup_rules.example.yml configs/bridge-config.example.yml configs/patch-config.example.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/etc)
 install(PROGRAMS tools/start-dvm.sh tools/stop-dvm.sh tools/dvm-watchdog.sh tools/stop-watchdog.sh tools/fne-watchdog.sh tools/start-dvm-fne.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 install(CODE "execute_process(COMMAND bash \"-c\" \"sed -i 's/filePath: ./filePath: \\\\/var\\\\/log\\\\//' /usr/local/etc/config.example.yml\")")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fd59b8f8..143bb9b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,19 @@ include(src/CompilerOptions.cmake)
 ## common
 #
 include(src/common/CMakeLists.txt)
-add_library(common STATIC ${common_SRC} ${common_INCLUDE})
+if (SHARED_LIBS)
+    set(DVM_LIBRARY_TYPE SHARED)
+else ()
+    set(DVM_LIBRARY_TYPE STATIC)
+endif (SHARED_LIBS)
+
+add_library(common ${DVM_LIBRARY_TYPE} ${common_SRC} ${common_INCLUDE})
+set_target_properties(common PROPERTIES OUTPUT_NAME dvmcommon)
+if (SHARED_LIBS)
+    target_compile_definitions(common PRIVATE DVMCOMMON_EXPORTS)
+else ()
+    target_compile_definitions(common PUBLIC DVMCOMMON_STATIC)
+endif (SHARED_LIBS)
 if (COMPILE_WIN32)
     target_link_libraries(common PRIVATE asio::asio Threads::Threads)
 else ()
@@ -25,7 +37,12 @@ target_include_directories(common PRIVATE ${OPENSSL_INCLUDE_DIR} ${LIBDW_INCLUDE
 ## vocoder
 #
 include(src/vocoder/CMakeLists.txt)
-add_library(vocoder STATIC ${vocoder_SRC} ${vocoder_INCLUDE})
+add_library(vocoder ${DVM_LIBRARY_TYPE} ${vocoder_SRC} ${vocoder_INCLUDE})
+if (SHARED_LIBS)
+    target_compile_definitions(vocoder PRIVATE VOCODER_EXPORTS)
+else ()
+    target_compile_definitions(vocoder PUBLIC VOCODER_STATIC)
+endif (SHARED_LIBS)
 target_include_directories(vocoder PRIVATE src src/vocoder)
 
 #
@@ -157,3 +174,23 @@ else ()
     target_link_libraries(dvmpatch PRIVATE common ${OPENSSL_LIBRARIES} ${LIBDW_LIBRARY} dl asio::asio Threads::Threads)
 endif (COMPILE_WIN32)
 target_include_directories(dvmpatch PRIVATE ${OPENSSL_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR} src src/patch)
+
+if (SHARED_LIBS AND NOT COMPILE_WIN32)
+    set(_dvm_shared_library_consumers
+        dvmhost
+        dvmfne
+        dvmcmd
+        dvmbridge
+        dvmpatch)
+
+    if (ENABLE_TUI_SUPPORT AND (NOT DISABLE_TUI_APPS))
+        list(APPEND _dvm_shared_library_consumers sysview tged peered)
+    endif ()
+
+    foreach (_target IN LISTS _dvm_shared_library_consumers)
+        set_target_properties(${_target} PROPERTIES
+            BUILD_RPATH_USE_ORIGIN TRUE
+            BUILD_RPATH "$ORIGIN;/opt/dvm/bin;/opt/dvm/lib;/usr/local/bin;/usr/local/lib;/usr/bin"
+            INSTALL_RPATH "$ORIGIN;/opt/dvm/bin;/opt/dvm/lib;/usr/local/bin;/usr/local/lib;/usr/bin")
+    endforeach ()
+endif ()
diff --git a/src/common/AESCrypto.h b/src/common/AESCrypto.h
index 8f87a535..1c1a211e 100644
--- a/src/common/AESCrypto.h
+++ b/src/common/AESCrypto.h
@@ -45,7 +45,7 @@ namespace crypto
      * @brief Advanced Encryption Standard Algorithm.
      * @ingroup crypto
      */
-    class HOST_SW_API AES {
+    class DVM_COMMON_API AES {
     public:
         /**
          * @brief Initializes a new instance of the AES class.
diff --git a/src/common/Clock.h b/src/common/Clock.h
index 46a1a1e4..8413a0eb 100644
--- a/src/common/Clock.h
+++ b/src/common/Clock.h
@@ -54,7 +54,7 @@
   * @param tzp
   * @returns int
   */
-extern HOST_SW_API int gettimeofday(struct timeval* tv, struct timezone* tzp);
+extern DVM_COMMON_API int gettimeofday(struct timeval* tv, struct timezone* tzp);
 #endif // defined(_WIN32)
 
 namespace system_clock 
@@ -70,7 +70,7 @@ namespace system_clock
          * @ingroup system_clock
          * @returns uint64_t Current time in NTP units.
          */
-        uint64_t now();
+        DVM_COMMON_API uint64_t now();
         /**
          * @brief Calculate the time difference of two NTP times.
          * @ingroup system_clock
@@ -78,14 +78,14 @@ namespace system_clock
          * @param ntp2 Time in NTP units to compare.
          * @returns uint64_t Difference in NTP units between ntp1 and ntp2.
          */
-        uint64_t diff(uint64_t ntp1, uint64_t ntp2);
+        DVM_COMMON_API uint64_t diff(uint64_t ntp1, uint64_t ntp2);
         /**
          * @brief Calculate the time difference the given NTP time and now.
          * @ingroup system_clock
          * @param then Time in NTP units to compare.
          * @returns uint64_t Difference in NTP units between now and then.
          */
-        uint64_t diffNow(uint64_t then);
+        DVM_COMMON_API uint64_t diffNow(uint64_t then);
     } // namespace ntp
 
     /*
@@ -101,7 +101,7 @@ namespace system_clock
          * @ingroup system_clock
          * @returns hrc_t Current time in HRC units.
          */
-        hrc_t now();
+        DVM_COMMON_API hrc_t now();
         /**
          * @brief Calculate the time difference of two HRC times.
          * @ingroup system_clock
@@ -109,21 +109,21 @@ namespace system_clock
          * @param hrc2 Time in HRC units to compare.
          * @returns uint64_t Difference in HRC units between hrc1 and hrc2.
          */
-        uint64_t diff(hrc_t hrc1, hrc_t hrc2);
+        DVM_COMMON_API uint64_t diff(hrc_t hrc1, hrc_t hrc2);
         /**
          * @brief Calculate the time difference the given HRC time and now.
          * @ingroup system_clock
          * @param then Time in HRC units to compare.
          * @returns uint64_t Difference in HRC units between now and then.
          */
-        uint64_t diffNow(hrc_t then);
+        DVM_COMMON_API uint64_t diffNow(hrc_t then);
         /**
          * @brief Calculate the time difference the given HRC time and now in microseconds.
          * @ingroup system_clock
          * @param then Time in HRC units to compare.
          * @returns uint64_t Difference in HRC units between now and then.
          */
-        uint64_t diffNowUS(hrc_t& then);
+        DVM_COMMON_API uint64_t diffNowUS(hrc_t& then);
     } // namespace hrc
 
     /**
@@ -132,14 +132,14 @@ namespace system_clock
      * @param ms Milliseconds.
      * @returns uint64_t Milliseconds in jiffies.
      */
-    uint64_t msToJiffies(uint64_t ms);
+    DVM_COMMON_API uint64_t msToJiffies(uint64_t ms);
     /**
      * @brief Convert jiffies to milliseconds.
      * @ingroup system_clock
      * @param jiffies Jiffies.
      * @returns uint64_t Jiffes in miilliseconds.
      */
-    uint64_t jiffiesToMs(uint64_t jiffies);
+    DVM_COMMON_API uint64_t jiffiesToMs(uint64_t jiffies);
 } // namespace system_clock
 
 #endif // __CLOCK_H__
\ No newline at end of file
diff --git a/src/common/DESCrypto.h b/src/common/DESCrypto.h
index 6d7fcbf3..1f25289f 100644
--- a/src/common/DESCrypto.h
+++ b/src/common/DESCrypto.h
@@ -28,7 +28,7 @@ namespace crypto
      * @brief Data Encryption Standard Algorithm.
      * @ingroup crypto
      */
-    class HOST_SW_API DES {
+    class DVM_COMMON_API DES {
     public:
         /**
          * @brief Initializes a new instance of the DES class.
diff --git a/src/common/Defines.h b/src/common/Defines.h
index b76e4939..61e062c9 100644
--- a/src/common/Defines.h
+++ b/src/common/Defines.h
@@ -141,6 +141,30 @@ typedef unsigned long long  ulong64_t;
 
 #define HOST_SW_API
 
+#if defined(DVMCOMMON_STATIC)
+    #define DVM_COMMON_API
+#elif defined(_WIN32)
+    #if defined(DVMCOMMON_EXPORTS)
+        #define DVM_COMMON_API __declspec(dllexport)
+    #else
+        #define DVM_COMMON_API __declspec(dllimport)
+    #endif
+#else
+    #define DVM_COMMON_API __attribute__((visibility("default")))
+#endif
+
+#if defined(VOCODER_STATIC)
+    #define VOCODER_API
+#elif defined(_WIN32)
+    #if defined(VOCODER_EXPORTS)
+        #define VOCODER_API __declspec(dllexport)
+    #else
+        #define VOCODER_API __declspec(dllimport)
+    #endif
+#else
+    #define VOCODER_API __attribute__((visibility("default")))
+#endif
+
 /**
  * @addtogroup common
  * @{
diff --git a/src/common/Log.h b/src/common/Log.h
index 7104a584..b24b2d75 100644
--- a/src/common/Log.h
+++ b/src/common/Log.h
@@ -191,29 +191,29 @@ namespace log_internal
      * @brief Internal helper to set an output stream to direct logging to.
      * @param stream 
      */
-    extern HOST_SW_API void SetInternalOutputStream(std::ostream& stream);
+    extern DVM_COMMON_API void SetInternalOutputStream(std::ostream& stream);
     /**
      * @brief Writes a new entry to the diagnostics log.
      * @param level Log level for entry.
      * @param log Fully formatted log message.
      */
-    extern HOST_SW_API void LogInternal(uint32_t level, const std::string& log);
+    extern DVM_COMMON_API void LogInternal(uint32_t level, const std::string& log);
 
     /**
      * @brief Internal helper to get the log file path.
      * @returns std::string Configured log file path.
      */
-    extern HOST_SW_API std::string GetLogFilePath();
+    extern DVM_COMMON_API std::string GetLogFilePath();
     /**
      * @brief Internal helper to get the log file root name.
      * @returns std::string Configured log file root name.
      */
-    extern HOST_SW_API std::string GetLogFileRoot();
+    extern DVM_COMMON_API std::string GetLogFileRoot();
     /**
      * @brief Internal helper to get the log file handle pointer.
      * @returns FILE* Pointer to the open log file.
      */
-    extern HOST_SW_API FILE* GetLogFile();
+    extern DVM_COMMON_API FILE* GetLogFile();
 } // namespace log_internal
 
 namespace log_stacktrace
@@ -228,7 +228,7 @@ namespace log_stacktrace
      * @brief Backward backtrace signal handling class.
      * @ingroup logger
      */
-    class HOST_SW_API SignalHandling {
+    class DVM_COMMON_API SignalHandling {
     public:
         /**
          * @brief Helper to generate a default list of POSIX signals to handle.
@@ -440,7 +440,7 @@ namespace log_stacktrace
      * @brief Backward backtrace signal handling class.
      * @ingroup logger
      */
-    class HOST_SW_API SignalHandling {
+    class DVM_COMMON_API SignalHandling {
     public:
         /**
          * @brief Initializes a new instance of the SignalHandling class
@@ -724,7 +724,7 @@ namespace log_stacktrace
      * @brief Backward backtrace signal handling class.
      * @ingroup logger
      */
-    class HOST_SW_API SignalHandling {
+    class DVM_COMMON_API SignalHandling {
     public:
         /**
          * @brief Initializes a new instance of the SignalHandling class
@@ -756,29 +756,29 @@ namespace log_stacktrace
  * @brief Helper to get the current log file level.
  * @returns uint32_t Current log file level.
  */
-extern HOST_SW_API uint32_t CurrentLogFileLevel();
+extern DVM_COMMON_API uint32_t CurrentLogFileLevel();
 
 /**
  * @brief Helper to get the current log file path.
  * @returns std::string Current log file path.
  */
-extern HOST_SW_API std::string LogGetFilePath();
+extern DVM_COMMON_API std::string LogGetFilePath();
 /**
  * @brief Helper to get the current log file root.
  * @returns std::string Current log file root.
  */
-extern HOST_SW_API std::string LogGetFileRoot();
+extern DVM_COMMON_API std::string LogGetFileRoot();
 
 /**
  * @brief Gets the instance of the Network class to transfer the activity log with.
  * @returns void* 
  */
-extern HOST_SW_API void* LogGetNetwork();
+extern DVM_COMMON_API void* LogGetNetwork();
 /**
  * @brief Sets the instance of the Network class to transfer the activity log with.
  * @param network 
  */
-extern HOST_SW_API void LogSetNetwork(void* network);
+extern DVM_COMMON_API void LogSetNetwork(void* network);
 
 /**
  * @brief Initializes the diagnostics log.
@@ -790,12 +790,12 @@ extern HOST_SW_API void LogSetNetwork(void* network);
  * @param syslog Flag indicating whether or not logs will be sent to syslog.
  * @returns 
  */
-extern HOST_SW_API bool LogInitialise(const std::string& filePath, const std::string& fileRoot, 
+extern DVM_COMMON_API bool LogInitialise(const std::string& filePath, const std::string& fileRoot, 
     uint32_t fileLevel, uint32_t displayLevel, bool disableTimeDisplay = false, bool useSyslog = false);
 /**
  * @brief Finalizes the diagnostics log.
  */
-extern HOST_SW_API void LogFinalise();
+extern DVM_COMMON_API void LogFinalise();
 
 /**
  * @brief Writes a new entry to the diagnostics log.
@@ -806,7 +806,7 @@ extern HOST_SW_API void LogFinalise();
  * This is a variable argument function. This shouldn't be called directly, utilize the LogXXXX macros above, instead.
  */
 template<typename ... Args>
-HOST_SW_API void Log(uint32_t level, log_internal::SourceLocation sourceLoc, const std::string& fmt, Args... args)
+DVM_COMMON_API void Log(uint32_t level, log_internal::SourceLocation sourceLoc, const std::string& fmt, Args... args)
 {
     using namespace log_internal;
 
diff --git a/src/common/RC4Crypto.h b/src/common/RC4Crypto.h
index 4b31b857..25c3be9d 100644
--- a/src/common/RC4Crypto.h
+++ b/src/common/RC4Crypto.h
@@ -38,7 +38,7 @@ namespace crypto
      * @brief Rivest Cipher 4 Algorithm.
      * @ingroup crypto
      */
-    class HOST_SW_API RC4 {
+    class DVM_COMMON_API RC4 {
     public:
         /**
          * @brief Initializes a new instance of the RC4 class.
diff --git a/src/common/RingBuffer.h b/src/common/RingBuffer.h
index c8076935..57fadb5c 100644
--- a/src/common/RingBuffer.h
+++ b/src/common/RingBuffer.h
@@ -31,7 +31,7 @@
  * @tparam T Type of data to store in RingBuffer.
  */
 template<class T>
-class HOST_SW_API RingBuffer {
+class DVM_COMMON_API RingBuffer {
 public:
     /**
      * @brief Initializes a new instance of the RingBuffer class.
diff --git a/src/common/StopWatch.h b/src/common/StopWatch.h
index fad612a5..62925025 100644
--- a/src/common/StopWatch.h
+++ b/src/common/StopWatch.h
@@ -38,7 +38,7 @@
  * @brief StopWatch Provides a set of methods and properties that you can use to accurately measure elapsed time.
  * @ingroup timers
  */
-class HOST_SW_API StopWatch {
+class DVM_COMMON_API StopWatch {
 public:
     /**
      * @brief Initializes a new instance of the StopWatch class.
diff --git a/src/common/Thread.h b/src/common/Thread.h
index b6d43726..0ddc8b63 100644
--- a/src/common/Thread.h
+++ b/src/common/Thread.h
@@ -59,7 +59,7 @@ struct thread_t {
  * @brief Creates and controls a thread.
  * @ingroup threading
  */
-class HOST_SW_API Thread {
+class DVM_COMMON_API Thread {
 public:
     /**
      * @brief Initializes a new instance of the Thread class.
diff --git a/src/common/ThreadPool.h b/src/common/ThreadPool.h
index 38018383..215f7c1f 100644
--- a/src/common/ThreadPool.h
+++ b/src/common/ThreadPool.h
@@ -33,7 +33,7 @@
  * @brief Represents a task run by a thread pool worker thread.
  * @ingroup threading
  */
-class HOST_SW_API ThreadPoolTask {
+class DVM_COMMON_API ThreadPoolTask {
 public:
     /**
      * @brief Initializes a new instance of the ThreadPoolTask class.
@@ -77,7 +77,7 @@ ThreadPoolTask* new_pooltask(F&& f, Args&&... args) { return new ThreadPoolTask(
  * @brief Creates and controls a thread pool.
  * @ingroup threading
  */
-class HOST_SW_API ThreadPool {
+class DVM_COMMON_API ThreadPool {
 public:
     /**
      * @brief Initializes a new instance of the Thread class.
diff --git a/src/common/Timer.h b/src/common/Timer.h
index cab668ce..4630df7d 100644
--- a/src/common/Timer.h
+++ b/src/common/Timer.h
@@ -27,7 +27,7 @@
  * @brief Timer Simple timer that tracks the time and marks if an expiration period has been reached. 
  * @ingroup timers
  */
-class HOST_SW_API Timer {
+class DVM_COMMON_API Timer {
 public:
     /**
      * @brief Initializes a new instance of the Timer class.
diff --git a/src/common/Utils.h b/src/common/Utils.h
index 1279ed1e..a9ce638d 100644
--- a/src/common/Utils.h
+++ b/src/common/Utils.h
@@ -133,7 +133,7 @@ inline uint32_t __IP_FROM_STR(const std::string& value) {
     return (ip[0U] << 24) | (ip[1U] << 16) | (ip[2U] << 8)  | (ip[3U] << 0);
 }
 #else
-extern HOST_SW_API uint32_t __IP_FROM_STR(const std::string& value);
+extern DVM_COMMON_API uint32_t __IP_FROM_STR(const std::string& value);
 #endif // !defined(_WIN32)
 
 /**
@@ -168,7 +168,7 @@ inline std::string strtoupper(const std::string value) {
  * @brief Various helper utilities.
  * @ingroup utils
  */
-class HOST_SW_API Utils {
+class DVM_COMMON_API Utils {
 public:
     /**
      * @brief Helper to dump the input buffer and display the hexadecimal output in the log.
diff --git a/src/common/analog/AnalogAudio.h b/src/common/analog/AnalogAudio.h
index dfcbf955..0620f36f 100644
--- a/src/common/analog/AnalogAudio.h
+++ b/src/common/analog/AnalogAudio.h
@@ -29,7 +29,7 @@ namespace analog
      * @brief Implements aLaw and uLaw audio codecs, along with helper routines for analog audio.
      * @ingroup analog
      */
-    class HOST_SW_API AnalogAudio {
+    class DVM_COMMON_API AnalogAudio {
     public:
         /**
          * @brief Helper to convert PCM into G.711 aLaw.
diff --git a/src/common/analog/data/NetData.h b/src/common/analog/data/NetData.h
index 2691c5ef..ae6b83e3 100644
--- a/src/common/analog/data/NetData.h
+++ b/src/common/analog/data/NetData.h
@@ -32,7 +32,7 @@ namespace analog
          *  audio at 8kHz, or 320 bytes in length.
          * @ingroup analog
          */
-        class HOST_SW_API NetData {
+        class DVM_COMMON_API NetData {
         public:
             /**
              * @brief Initializes a new instance of the NetData class.
diff --git a/src/common/dmr/DMRUtils.h b/src/common/dmr/DMRUtils.h
index aa4aaa9a..6db613c4 100644
--- a/src/common/dmr/DMRUtils.h
+++ b/src/common/dmr/DMRUtils.h
@@ -27,7 +27,7 @@ namespace dmr
      * @brief This class implements various helper functions for validating DMR data.
      * @ingroup dmr
      */
-    class HOST_SW_API DMRUtils {
+    class DVM_COMMON_API DMRUtils {
     public:
         /**
          * @brief Helper to test and clamp a DMR color code.
diff --git a/src/common/dmr/SiteData.h b/src/common/dmr/SiteData.h
index 7b4c20de..2ea914ae 100644
--- a/src/common/dmr/SiteData.h
+++ b/src/common/dmr/SiteData.h
@@ -28,7 +28,7 @@ namespace dmr
      * @brief Represents site data for DMR.
      * @ingroup dmr
      */
-    class HOST_SW_API SiteData {
+    class DVM_COMMON_API SiteData {
     public:
         /**
          * @brief Initializes a new instance of the SiteData class.
diff --git a/src/common/dmr/SlotType.h b/src/common/dmr/SlotType.h
index 35d6b37c..81c55223 100644
--- a/src/common/dmr/SlotType.h
+++ b/src/common/dmr/SlotType.h
@@ -30,7 +30,7 @@ namespace dmr
      * @brief Represents DMR slot type.
      * @ingroup dmr
      */
-    class HOST_SW_API SlotType {
+    class DVM_COMMON_API SlotType {
     public:
         /**
          * @brief Initializes a new instance of the SlotType class.
diff --git a/src/common/dmr/Sync.h b/src/common/dmr/Sync.h
index ce68bfb4..28e344f2 100644
--- a/src/common/dmr/Sync.h
+++ b/src/common/dmr/Sync.h
@@ -28,7 +28,7 @@ namespace dmr
      * @brief Helper class for generating DMR sync data.
      * @ingroup dmr
      */
-    class HOST_SW_API Sync {
+    class DVM_COMMON_API Sync {
     public:
         /**
          * @brief Helper to append DMR data sync bytes to the passed buffer.
diff --git a/src/common/dmr/acl/AccessControl.h b/src/common/dmr/acl/AccessControl.h
index ab98ed01..36f24a11 100644
--- a/src/common/dmr/acl/AccessControl.h
+++ b/src/common/dmr/acl/AccessControl.h
@@ -36,7 +36,7 @@ namespace dmr
          * @brief Implements radio and talkgroup ID access control checking.
          * @ingroup dmr
          */
-        class HOST_SW_API AccessControl {
+        class DVM_COMMON_API AccessControl {
         public:
             /**
              * @brief Initializes the DMR access control.
diff --git a/src/common/dmr/data/Assembler.h b/src/common/dmr/data/Assembler.h
index b2103808..ad7e498d 100644
--- a/src/common/dmr/data/Assembler.h
+++ b/src/common/dmr/data/Assembler.h
@@ -35,7 +35,7 @@ namespace dmr
          * @brief Implements a packet assembler for DMR PDU packet streams.
          * @ingroup dmr_pdu
          */
-        class HOST_SW_API Assembler {
+        class DVM_COMMON_API Assembler {
         public:
             /**
              * @brief Initializes a new instance of the Assembler class.
diff --git a/src/common/dmr/data/DataBlock.h b/src/common/dmr/data/DataBlock.h
index 93dc3c42..3afa2c6d 100644
--- a/src/common/dmr/data/DataBlock.h
+++ b/src/common/dmr/data/DataBlock.h
@@ -36,7 +36,7 @@ namespace dmr
          * @brief Represents a data block for PDU DMR packets.
          * @ingroup dmr_pdu
          */
-        class HOST_SW_API DataBlock {
+        class DVM_COMMON_API DataBlock {
         public:
             /**
              * @brief Initializes a copy instance of the DataBlock class.
diff --git a/src/common/dmr/data/DataHeader.h b/src/common/dmr/data/DataHeader.h
index fb778fd4..d90efd01 100644
--- a/src/common/dmr/data/DataHeader.h
+++ b/src/common/dmr/data/DataHeader.h
@@ -36,7 +36,7 @@ namespace dmr
          * @brief Represents the data header for PDU DMR packets.
          * @ingroup dmr_pdu
          */
-        class HOST_SW_API DataHeader {
+        class DVM_COMMON_API DataHeader {
         public:
             /**
              * @brief Initializes a copy instance of the DataHeader class.
diff --git a/src/common/dmr/data/EMB.h b/src/common/dmr/data/EMB.h
index c0bec59e..89b39ca3 100644
--- a/src/common/dmr/data/EMB.h
+++ b/src/common/dmr/data/EMB.h
@@ -30,7 +30,7 @@ namespace dmr
          * @brief Represents a DMR embedded signalling data.
          * @ingroup dmr
          */
-        class HOST_SW_API EMB {
+        class DVM_COMMON_API EMB {
         public:
             /**
              * @brief Initializes a new instance of the EMB class.
diff --git a/src/common/dmr/data/EmbeddedData.h b/src/common/dmr/data/EmbeddedData.h
index d00808c8..d01d2b9c 100644
--- a/src/common/dmr/data/EmbeddedData.h
+++ b/src/common/dmr/data/EmbeddedData.h
@@ -44,7 +44,7 @@ namespace dmr
          * @brief Represents a DMR embedded data.
          * @ingroup dmr
          */
-        class HOST_SW_API EmbeddedData {
+        class DVM_COMMON_API EmbeddedData {
         public:
             /**
              * @brief Initializes a new instance of the EmbeddedData class.
diff --git a/src/common/dmr/data/NetData.h b/src/common/dmr/data/NetData.h
index 5c1587c4..7c96ac30 100644
--- a/src/common/dmr/data/NetData.h
+++ b/src/common/dmr/data/NetData.h
@@ -32,7 +32,7 @@ namespace dmr
          * @brief Represents network DMR data.
          * @ingroup dmr
          */
-        class HOST_SW_API NetData {
+        class DVM_COMMON_API NetData {
         public:
             /**
              * @brief Initializes a new instance of the NetData class.
diff --git a/src/common/dmr/lc/CSBK.h b/src/common/dmr/lc/CSBK.h
index 04f2eabc..d7351678 100644
--- a/src/common/dmr/lc/CSBK.h
+++ b/src/common/dmr/lc/CSBK.h
@@ -35,7 +35,7 @@ namespace dmr
          * @brief Represents DMR control signalling block data.
          * @ingroup dmr_lc
          */
-        class HOST_SW_API CSBK {
+        class DVM_COMMON_API CSBK {
         public:
             /**
              * @brief Initializes a copy instance of the CSBK class.
diff --git a/src/common/dmr/lc/FullLC.h b/src/common/dmr/lc/FullLC.h
index 13274e8f..3b6008ca 100644
--- a/src/common/dmr/lc/FullLC.h
+++ b/src/common/dmr/lc/FullLC.h
@@ -35,7 +35,7 @@ namespace dmr
          * @brief Represents full DMR link control.
          * @ingroup dmr_lc
          */
-        class HOST_SW_API FullLC {
+        class DVM_COMMON_API FullLC {
         public:
             /**
              * @brief Initializes a new instance of the FullLC class.
diff --git a/src/common/dmr/lc/LC.h b/src/common/dmr/lc/LC.h
index fcf934ba..fad073b6 100644
--- a/src/common/dmr/lc/LC.h
+++ b/src/common/dmr/lc/LC.h
@@ -36,7 +36,7 @@ namespace dmr
          * @brief Represents DMR link control data.
          * @ingroup dmr_lc
          */
-        class HOST_SW_API LC {
+        class DVM_COMMON_API LC {
         public:
             /**
              * @brief Initializes a new instance of the LC class.
diff --git a/src/common/dmr/lc/PrivacyLC.h b/src/common/dmr/lc/PrivacyLC.h
index 12bd0dc6..36e68831 100644
--- a/src/common/dmr/lc/PrivacyLC.h
+++ b/src/common/dmr/lc/PrivacyLC.h
@@ -30,7 +30,7 @@ namespace dmr
          * @brief Represents DMR privacy indicator link control data.
          * @ingroup dmr_lc
          */
-        class HOST_SW_API PrivacyLC {
+        class DVM_COMMON_API PrivacyLC {
         public:
             /**
              * @brief Initializes a new instance of the PrivacyLC class.
diff --git a/src/common/dmr/lc/ShortLC.h b/src/common/dmr/lc/ShortLC.h
index f29cacb1..8872200d 100644
--- a/src/common/dmr/lc/ShortLC.h
+++ b/src/common/dmr/lc/ShortLC.h
@@ -30,7 +30,7 @@ namespace dmr
          * @brief Represents short DMR link control.
          * @ingroup dmr_lc
          */
-        class HOST_SW_API ShortLC {
+        class DVM_COMMON_API ShortLC {
         public:
             /**
              * @brief Initializes a new instance of the ShortLC class.
diff --git a/src/common/dmr/lc/csbk/CSBKFactory.h b/src/common/dmr/lc/csbk/CSBKFactory.h
index 0cd5eba4..ab11398a 100644
--- a/src/common/dmr/lc/csbk/CSBKFactory.h
+++ b/src/common/dmr/lc/csbk/CSBKFactory.h
@@ -58,7 +58,7 @@ namespace dmr
              * @brief Helper class to instantiate an instance of a CSBK.
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBKFactory {
+            class DVM_COMMON_API CSBKFactory {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBKFactory class.
diff --git a/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h b/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h
index f9fc40f9..7a019d81 100644
--- a/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h
+++ b/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements ACK RSP - Acknowledge Response
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_ACK_RSP : public CSBK {
+            class DVM_COMMON_API CSBK_ACK_RSP : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_ACK_RSP class.
diff --git a/src/common/dmr/lc/csbk/CSBK_ALOHA.h b/src/common/dmr/lc/csbk/CSBK_ALOHA.h
index 4a731354..730c2d47 100644
--- a/src/common/dmr/lc/csbk/CSBK_ALOHA.h
+++ b/src/common/dmr/lc/csbk/CSBK_ALOHA.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements ALOHA - Aloha PDUs for the random access protocol
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_ALOHA : public CSBK {
+            class DVM_COMMON_API CSBK_ALOHA : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_ALOHA class.
diff --git a/src/common/dmr/lc/csbk/CSBK_BROADCAST.h b/src/common/dmr/lc/csbk/CSBK_BROADCAST.h
index a7d8370f..d8749fb7 100644
--- a/src/common/dmr/lc/csbk/CSBK_BROADCAST.h
+++ b/src/common/dmr/lc/csbk/CSBK_BROADCAST.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements BCAST - Announcement PDUs
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_BROADCAST : public CSBK {
+            class DVM_COMMON_API CSBK_BROADCAST : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_BROADCAST class.
diff --git a/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h b/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h
index d164956b..459f9feb 100644
--- a/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h
+++ b/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements BS DWN ACT - BS Outbound Activation
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_BSDWNACT : public CSBK {
+            class DVM_COMMON_API CSBK_BSDWNACT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_BSDWNACT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h b/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h
index b7323f2b..490e5e12 100644
--- a/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h
+++ b/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements CALL ALRT - Call Alert
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_CALL_ALRT : public CSBK {
+            class DVM_COMMON_API CSBK_CALL_ALRT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_CALL_ALRT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h b/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h
index 92d7086f..10724b77 100644
--- a/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h
+++ b/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements EXT FNCT - Extended Function
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_EXT_FNCT : public CSBK {
+            class DVM_COMMON_API CSBK_EXT_FNCT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_EXT_FNCT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_MAINT.h b/src/common/dmr/lc/csbk/CSBK_MAINT.h
index c5f3300a..04d5958c 100644
--- a/src/common/dmr/lc/csbk/CSBK_MAINT.h
+++ b/src/common/dmr/lc/csbk/CSBK_MAINT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements MAINT - Call Maintainence
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_MAINT : public CSBK {
+            class DVM_COMMON_API CSBK_MAINT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_MAINT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h b/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h
index c31ce19e..247997c5 100644
--- a/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h
+++ b/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements NACK RSP - Negative Acknowledgement Response
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_NACK_RSP : public CSBK {
+            class DVM_COMMON_API CSBK_NACK_RSP : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_NACK_RSP class.
diff --git a/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h b/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h
index 77fc2b03..ab56965c 100644
--- a/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements PD_GRANT - Private Data Channel Grant
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_PD_GRANT : public CSBK {
+            class DVM_COMMON_API CSBK_PD_GRANT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_PD_GRANT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h b/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h
index 53a9a63e..5be1e263 100644
--- a/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h
+++ b/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h
@@ -34,7 +34,7 @@ namespace dmr
              * @brief Implements PRE CSBK - Preamble CSBK
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_PRECCSBK : public CSBK {
+            class DVM_COMMON_API CSBK_PRECCSBK : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_PRECCSBK class.
diff --git a/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h b/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h
index b4b3032a..4dcfb97d 100644
--- a/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements PV_GRANT - Private Voice Channel Grant
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_PV_GRANT : public CSBK {
+            class DVM_COMMON_API CSBK_PV_GRANT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_PV_GRANT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h b/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h
index af2a98d7..c37ecf7c 100644
--- a/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h
+++ b/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements P_CLEAR - Payload Channel Clear
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_P_CLEAR : public CSBK {
+            class DVM_COMMON_API CSBK_P_CLEAR : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_P_CLEAR class.
diff --git a/src/common/dmr/lc/csbk/CSBK_P_GRANT.h b/src/common/dmr/lc/csbk/CSBK_P_GRANT.h
index 877a5074..e95e2e04 100644
--- a/src/common/dmr/lc/csbk/CSBK_P_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_P_GRANT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements P_GRANT - Payload Channel Talkgroup Voice Channel Grant
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_P_GRANT : public CSBK {
+            class DVM_COMMON_API CSBK_P_GRANT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_P_GRANT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_RAND.h b/src/common/dmr/lc/csbk/CSBK_RAND.h
index 119cacb1..289a12b2 100644
--- a/src/common/dmr/lc/csbk/CSBK_RAND.h
+++ b/src/common/dmr/lc/csbk/CSBK_RAND.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements RAND - Random Access
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_RAND : public CSBK {
+            class DVM_COMMON_API CSBK_RAND : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_RAND class.
diff --git a/src/common/dmr/lc/csbk/CSBK_RAW.h b/src/common/dmr/lc/csbk/CSBK_RAW.h
index eb52f6b9..9174d1b3 100644
--- a/src/common/dmr/lc/csbk/CSBK_RAW.h
+++ b/src/common/dmr/lc/csbk/CSBK_RAW.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements a mechanism to generate raw CSBK data from bytes.
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_RAW : public CSBK {
+            class DVM_COMMON_API CSBK_RAW : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_RAW class.
diff --git a/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h b/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h
index 67afe43d..77516756 100644
--- a/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements TD_GRANT - Talkgroup Data Channel Grant
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_TD_GRANT : public CSBK {
+            class DVM_COMMON_API CSBK_TD_GRANT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_TD_GRANT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h b/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h
index 12418ec6..66ea5c77 100644
--- a/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements TV_GRANT - Talkgroup Voice Channel Grant
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_TV_GRANT : public CSBK {
+            class DVM_COMMON_API CSBK_TV_GRANT : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_TV_GRANT class.
diff --git a/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h b/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h
index e3b3a449..aeb1004d 100644
--- a/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h
+++ b/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements UU ANS RSP - Unit to Unit Answer Response
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_UU_ANS_RSP : public CSBK {
+            class DVM_COMMON_API CSBK_UU_ANS_RSP : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_UU_ANS_RSP class.
diff --git a/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h b/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h
index 2d08ee13..69c62d89 100644
--- a/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h
+++ b/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h
@@ -33,7 +33,7 @@ namespace dmr
              * @brief Implements UU VCH REQ - Unit-to-Unit Voice Channel Request
              * @ingroup dmr_csbk
              */
-            class HOST_SW_API CSBK_UU_V_REQ : public CSBK {
+            class DVM_COMMON_API CSBK_UU_V_REQ : public CSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the CSBK_UU_V_REQ class.
diff --git a/src/common/edac/AMBE2FEC.h b/src/common/edac/AMBE2FEC.h
index 7074e32e..7a4b4810 100644
--- a/src/common/edac/AMBE2FEC.h
+++ b/src/common/edac/AMBE2FEC.h
@@ -64,7 +64,7 @@ namespace edac
      * c0[24], c1[23], c2[11], c3[14], MSB first. Annex S conversion between
      * transmitted dibits and this codeword is intentionally separate.
      */
-    class HOST_SW_API AMBE2FEC {
+    class DVM_COMMON_API AMBE2FEC {
     public:
         /**
          * @brief Regenerates the P25 Phase 2 half-rate FEC.
diff --git a/src/common/edac/AMBEFEC.h b/src/common/edac/AMBEFEC.h
index 6e46bd0e..6dfe474c 100644
--- a/src/common/edac/AMBEFEC.h
+++ b/src/common/edac/AMBEFEC.h
@@ -464,7 +464,7 @@ namespace edac
      *  correction.
      * @ingroup edac
      */
-    class HOST_SW_API AMBEFEC {
+    class DVM_COMMON_API AMBEFEC {
     public:
         /**
          * @brief Initializes a new instance of the AMBEFEC class.
diff --git a/src/common/edac/BCH.h b/src/common/edac/BCH.h
index 6ff21ef8..c64e6695 100644
--- a/src/common/edac/BCH.h
+++ b/src/common/edac/BCH.h
@@ -29,7 +29,7 @@ namespace edac
      *  data.
      * @ingroup edac
      */
-    class HOST_SW_API BCH {
+    class DVM_COMMON_API BCH {
     public:
         /**
          * @brief Initializes a new instance of the BCH class.
diff --git a/src/common/edac/BPTC19696.h b/src/common/edac/BPTC19696.h
index 584e67f2..3f283f59 100644
--- a/src/common/edac/BPTC19696.h
+++ b/src/common/edac/BPTC19696.h
@@ -28,7 +28,7 @@ namespace edac
      * @brief Implements Block Product Turbo Code (196,96) FEC.
      * @ingroup edac
      */
-    class HOST_SW_API BPTC19696 {
+    class DVM_COMMON_API BPTC19696 {
     public:
         /**
          * @brief Initializes a new instance of the BPTC19696 class.
diff --git a/src/common/edac/CRC.h b/src/common/edac/CRC.h
index e16e32b9..577a460a 100644
--- a/src/common/edac/CRC.h
+++ b/src/common/edac/CRC.h
@@ -29,7 +29,7 @@ namespace edac
      * @brief Implements various Cyclic Redundancy Check routines.
      * @ingroup edac
      */
-    class HOST_SW_API CRC {
+    class DVM_COMMON_API CRC {
     public:
         /**
          * @brief Check 5-bit CRC.
diff --git a/src/common/edac/Golay2087.h b/src/common/edac/Golay2087.h
index 2ce36d8d..74e46831 100644
--- a/src/common/edac/Golay2087.h
+++ b/src/common/edac/Golay2087.h
@@ -28,7 +28,7 @@ namespace edac
      * @brief Implements Golay (20,8,7) forward error correction.
      * @ingroup edac
      */
-    class HOST_SW_API Golay2087 {
+    class DVM_COMMON_API Golay2087 {
     public:
         /**
          * @brief Decode Golay (20,8,7) FEC.
diff --git a/src/common/edac/Golay24128.h b/src/common/edac/Golay24128.h
index e9562792..57d138dd 100644
--- a/src/common/edac/Golay24128.h
+++ b/src/common/edac/Golay24128.h
@@ -30,7 +30,7 @@ namespace edac
      *  correction.
      * @ingroup edac
      */
-    class HOST_SW_API Golay24128 {
+    class DVM_COMMON_API Golay24128 {
     public:
         /**
          * @brief Decode Golay (23,12,7) FEC.
diff --git a/src/common/edac/Hamming.h b/src/common/edac/Hamming.h
index f4ba51c0..6088cab4 100644
--- a/src/common/edac/Hamming.h
+++ b/src/common/edac/Hamming.h
@@ -30,7 +30,7 @@ namespace edac
      *  (17, 12, 3) forward error correction.
      * @ingroup edac
      */
-    class HOST_SW_API Hamming {
+    class DVM_COMMON_API Hamming {
     public:
         /**
          * @brief Decode Hamming (15,11,3).
diff --git a/src/common/edac/QR1676.h b/src/common/edac/QR1676.h
index 5e34cb7f..b44412ee 100644
--- a/src/common/edac/QR1676.h
+++ b/src/common/edac/QR1676.h
@@ -28,7 +28,7 @@ namespace edac
      * @brief Implements Quadratic residue (16,7,6) forward error correction.
      * @ingroup edac
      */
-    class HOST_SW_API QR1676 {
+    class DVM_COMMON_API QR1676 {
     public:
         /**
          * @brief Decode QR (16,7,6) FEC.
diff --git a/src/common/edac/RS129.h b/src/common/edac/RS129.h
index f1970f73..19b5847c 100644
--- a/src/common/edac/RS129.h
+++ b/src/common/edac/RS129.h
@@ -28,7 +28,7 @@ namespace edac
      * @brief Implements Reed-Solomon (12,9) forward error correction.
      * @ingroup edac
      */
-    class HOST_SW_API RS129 {
+    class DVM_COMMON_API RS129 {
     public:
         /**
          * @brief Check RS (12,9) FEC.
diff --git a/src/common/edac/RS634717.h b/src/common/edac/RS634717.h
index 34805556..fccea427 100644
--- a/src/common/edac/RS634717.h
+++ b/src/common/edac/RS634717.h
@@ -31,7 +31,7 @@ namespace edac
      *  (45,26,20). (44,16,29) forward error correction.
      * @ingroup edac
      */
-    class HOST_SW_API RS634717 {
+    class DVM_COMMON_API RS634717 {
     public:
         /**
          * @brief Initializes a new instance of the RS634717 class.
diff --git a/src/common/edac/SHA256.h b/src/common/edac/SHA256.h
index 18c09fa6..29d85c9e 100644
--- a/src/common/edac/SHA256.h
+++ b/src/common/edac/SHA256.h
@@ -39,7 +39,7 @@ namespace edac
      * @brief Implements SHA-256 hashing.
      * @ingroup edac
      */
-    class HOST_SW_API SHA256 {
+    class DVM_COMMON_API SHA256 {
     public:
         /**
          * @brief Initializes a new instance of the SHA256 class.'
diff --git a/src/common/edac/Trellis.h b/src/common/edac/Trellis.h
index 8bb9a7b4..2526c766 100644
--- a/src/common/edac/Trellis.h
+++ b/src/common/edac/Trellis.h
@@ -29,7 +29,7 @@ namespace edac
      * @brief Implements 1/2 rate and 3/4 rate Trellis for DMR/P25.
      * @ingroup edac
      */
-    class HOST_SW_API Trellis {
+    class DVM_COMMON_API Trellis {
     public:
         /**
          * @brief Initializes a new instance of the Trellis class.
diff --git a/src/common/lookups/AdjSiteMapLookup.h b/src/common/lookups/AdjSiteMapLookup.h
index 0755b755..01d36b19 100644
--- a/src/common/lookups/AdjSiteMapLookup.h
+++ b/src/common/lookups/AdjSiteMapLookup.h
@@ -39,7 +39,7 @@ namespace lookups
      * @brief Represents an adjacent peer map entry.
      * @ingroup lookups_asm
      */
-    class HOST_SW_API AdjPeerMapEntry {
+    class DVM_COMMON_API AdjPeerMapEntry {
     public:
         /**
          * @brief Initializes a new instance of the AdjPeerMapEntry class.
@@ -148,7 +148,7 @@ namespace lookups
      *  information.
      * @ingroup lookups_asm
      */
-    class HOST_SW_API AdjSiteMapLookup : public Thread {
+    class DVM_COMMON_API AdjSiteMapLookup : public Thread {
     public:
         /**
          * @brief Initializes a new instance of the AdjSiteMapLookup class.
diff --git a/src/common/lookups/AffiliationLookup.h b/src/common/lookups/AffiliationLookup.h
index c364414f..206092c0 100644
--- a/src/common/lookups/AffiliationLookup.h
+++ b/src/common/lookups/AffiliationLookup.h
@@ -43,7 +43,7 @@ namespace lookups
      *  and group affiliation information.
      * @ingroup lookups_aff
      */
-    class HOST_SW_API AffiliationLookup : public concurrent::concurrent_lock {
+    class DVM_COMMON_API AffiliationLookup : public concurrent::concurrent_lock {
     public:
         /**
          * @brief Initializes a new instance of the AffiliationLookup class.
diff --git a/src/common/lookups/ChannelLookup.h b/src/common/lookups/ChannelLookup.h
index e1114c7c..0adfa5b0 100644
--- a/src/common/lookups/ChannelLookup.h
+++ b/src/common/lookups/ChannelLookup.h
@@ -40,7 +40,7 @@ namespace lookups
      * @brief Represents voice channel data.
      * @ingroup lookups_ch
      */
-    class HOST_SW_API VoiceChData {
+    class DVM_COMMON_API VoiceChData {
     public:
         /**
          * @brief Initializes a new instance of the VoiceChData class.
@@ -192,7 +192,7 @@ namespace lookups
      * @brief Implements a lookup table class that contains RF channel information.
      * @ingroup lookups_ch
      */
-    class HOST_SW_API ChannelLookup {
+    class DVM_COMMON_API ChannelLookup {
     public:
         /**
          * @brief Initializes a new instance of the ChannelLookup class.
diff --git a/src/common/lookups/IdenTableLookup.h b/src/common/lookups/IdenTableLookup.h
index 864155b4..0ae230ec 100644
--- a/src/common/lookups/IdenTableLookup.h
+++ b/src/common/lookups/IdenTableLookup.h
@@ -38,7 +38,7 @@ namespace lookups
      * @brief Represents an individual entry in the bandplan identity table.
      * @ingroup lookups_iden
      */
-    class HOST_SW_API IdenTable {
+    class DVM_COMMON_API IdenTable {
     public:
         /**
          * @brief Initializes a new instance of the IdenTable class.
@@ -119,7 +119,7 @@ namespace lookups
      *  identity table.
      * @ingroup lookups_iden
      */
-    class HOST_SW_API IdenTableLookup : public LookupTable<IdenTable> {
+    class DVM_COMMON_API IdenTableLookup : public LookupTable<IdenTable> {
     public:
         /**
          * @brief Initializes a new instance of the IdenTableLookup class.
diff --git a/src/common/lookups/LookupTable.h b/src/common/lookups/LookupTable.h
index e0bcfb22..f51078b2 100644
--- a/src/common/lookups/LookupTable.h
+++ b/src/common/lookups/LookupTable.h
@@ -43,7 +43,7 @@ namespace lookups
      * @ingroup lookups
      */
     template <class T>
-    class HOST_SW_API LookupTable : public Thread {
+    class DVM_COMMON_API LookupTable : public Thread {
     public:
         /**
          * @brief Initializes a new instance of the LookupTable class.
diff --git a/src/common/lookups/PeerListLookup.h b/src/common/lookups/PeerListLookup.h
index 04f6d140..8570bb66 100644
--- a/src/common/lookups/PeerListLookup.h
+++ b/src/common/lookups/PeerListLookup.h
@@ -41,7 +41,7 @@ namespace lookups
      * @brief Represents an individual entry in the peer ID table.
      * @ingroup lookups_peer
      */
-    class HOST_SW_API PeerId {
+    class DVM_COMMON_API PeerId {
     public:
         /**
          * @brief Initializes a new instance of the PeerId class.
@@ -205,7 +205,7 @@ namespace lookups
      *  lookup table.
      * @ingroup lookups_peer
      */
-    class HOST_SW_API PeerListLookup : public LookupTable<PeerId> {
+    class DVM_COMMON_API PeerListLookup : public LookupTable<PeerId> {
     public:
         /**
          * @brief Initializes a new instance of the PeerListLookup class.
diff --git a/src/common/lookups/RSSIInterpolator.h b/src/common/lookups/RSSIInterpolator.h
index fffb9c3c..706dc1fc 100644
--- a/src/common/lookups/RSSIInterpolator.h
+++ b/src/common/lookups/RSSIInterpolator.h
@@ -33,7 +33,7 @@ namespace lookups
      * @brief RSSI interpolated lookup for RSSI values returned from the modem.
      * @ingroup lookups
      */
-    class HOST_SW_API RSSIInterpolator {
+    class DVM_COMMON_API RSSIInterpolator {
     public:
         /**
          * @brief Initializes a new instance of the RSSIInterpolator class.
diff --git a/src/common/lookups/RadioAliasLookup.h b/src/common/lookups/RadioAliasLookup.h
index 9048cac3..28dd58bf 100644
--- a/src/common/lookups/RadioAliasLookup.h
+++ b/src/common/lookups/RadioAliasLookup.h
@@ -34,7 +34,7 @@ namespace lookups
      *  lookup table.
      * @ingroup lookups_rid
      */
-    class HOST_SW_API RadioAliasLookup : public LookupTable<std::string> {
+    class DVM_COMMON_API RadioAliasLookup : public LookupTable<std::string> {
     public:
         /**
          * @brief Initializes a new instance of the RadioAliasLookup class.
diff --git a/src/common/lookups/RadioIdLookup.h b/src/common/lookups/RadioIdLookup.h
index b9636cd7..f355a2ac 100644
--- a/src/common/lookups/RadioIdLookup.h
+++ b/src/common/lookups/RadioIdLookup.h
@@ -39,7 +39,7 @@ namespace lookups
      * @brief Represents an individual entry in the radio ID table.
      * @ingroup lookups_rid
      */
-    class HOST_SW_API RadioId {
+    class DVM_COMMON_API RadioId {
     public:
         /**
          * @brief Initializes a new instance of the RadioId class.
@@ -171,7 +171,7 @@ namespace lookups
      *  lookup table.
      * @ingroup lookups_rid
      */
-    class HOST_SW_API RadioIdLookup : public LookupTable<RadioId> {
+    class DVM_COMMON_API RadioIdLookup : public LookupTable<RadioId> {
     public:
         /**
          * @brief Initializes a new instance of the RadioIdLookup class.
diff --git a/src/common/lookups/TalkgroupRulesLookup.h b/src/common/lookups/TalkgroupRulesLookup.h
index 74dfc55a..f98d8858 100644
--- a/src/common/lookups/TalkgroupRulesLookup.h
+++ b/src/common/lookups/TalkgroupRulesLookup.h
@@ -52,7 +52,7 @@ namespace lookups
      * @brief Represents an source block for a routing rule.
      * @ingroup lookups_tgid
      */
-    class HOST_SW_API TalkgroupRuleGroupVoiceSource {
+    class DVM_COMMON_API TalkgroupRuleGroupVoiceSource {
     public:
         /**
          * @brief Initializes a new instance of the TalkgroupRuleGroupVoiceSource class.
@@ -117,7 +117,7 @@ namespace lookups
      * @brief Represents an rewrite block for a routing rule rewrites.
      * @ingroup lookups_tgid
      */
-    class HOST_SW_API TalkgroupRuleRewrite {
+    class DVM_COMMON_API TalkgroupRuleRewrite {
     public:
         /**
          * @brief Initializes a new instance of the TalkgroupRuleRewrite class.
@@ -190,7 +190,7 @@ namespace lookups
      * @brief Represents an configuration block for a routing rule.
      * @ingroup lookups_tgid
      */
-    class HOST_SW_API TalkgroupRuleConfig {
+    class DVM_COMMON_API TalkgroupRuleConfig {
     public:
         /**
          * @brief Initializes a new instance of the TalkgroupRuleConfig class.
@@ -450,7 +450,7 @@ namespace lookups
      * @brief Represents an group voice block for a routing rule.
      * @ingroup lookups_tgid
      */
-    class HOST_SW_API TalkgroupRuleGroupVoice {
+    class DVM_COMMON_API TalkgroupRuleGroupVoice {
     public:
         /**
          * @brief Initializes a new instance of the TalkgroupRuleGroupVoice class.
@@ -549,7 +549,7 @@ namespace lookups
      *  rules information.
      * @ingroup lookups_tgid
      */
-    class HOST_SW_API TalkgroupRulesLookup : public Thread {
+    class DVM_COMMON_API TalkgroupRulesLookup : public Thread {
     public:
         /**
          * @brief Initializes a new instance of the TalkgroupRulesLookup class.
diff --git a/src/common/network/AdaptiveJitterBuffer.h b/src/common/network/AdaptiveJitterBuffer.h
index 078ed101..bab12822 100644
--- a/src/common/network/AdaptiveJitterBuffer.h
+++ b/src/common/network/AdaptiveJitterBuffer.h
@@ -102,7 +102,7 @@ namespace network
      * fast path for in-order packets. Out-of-order packets are buffered briefly
      * to allow reordering, with adaptive timeout based on observed jitter.
      */
-    class HOST_SW_API AdaptiveJitterBuffer {
+    class DVM_COMMON_API AdaptiveJitterBuffer {
     public:
         /**
          * @brief Initializes a new instance of the AdaptiveJitterBuffer class.
diff --git a/src/common/network/BaseNetwork.h b/src/common/network/BaseNetwork.h
index 68e19308..6ab59ab3 100644
--- a/src/common/network/BaseNetwork.h
+++ b/src/common/network/BaseNetwork.h
@@ -196,7 +196,7 @@ namespace network
      * @brief Handles dealing with maintaining RTP sequencing for multiple multiplexed RTP streams.
      * @ingroup fne_network
      */
-    class HOST_SW_API RTPStreamMultiplex {
+    class DVM_COMMON_API RTPStreamMultiplex {
     public:
         auto operator=(RTPStreamMultiplex&) -> RTPStreamMultiplex& = delete;
         auto operator=(RTPStreamMultiplex&&) -> RTPStreamMultiplex& = delete;
@@ -393,7 +393,7 @@ namespace network
      * @brief Implements the base networking logic.
      * @ingroup network_core
      */
-    class HOST_SW_API BaseNetwork {
+    class DVM_COMMON_API BaseNetwork {
     public:
         /**
          * @brief Initializes a new instance of the BaseNetwork class.
diff --git a/src/common/network/FrameQueue.h b/src/common/network/FrameQueue.h
index 0a2893dd..5f32c124 100644
--- a/src/common/network/FrameQueue.h
+++ b/src/common/network/FrameQueue.h
@@ -43,7 +43,7 @@ namespace network
      * @brief Implements the network RTP frame queuing logic.
      * @ingroup network_core
      */
-    class HOST_SW_API FrameQueue : public RawFrameQueue {
+    class DVM_COMMON_API FrameQueue : public RawFrameQueue {
     public: typedef std::pair<const NET_FUNC::ENUM, const NET_SUBFUNC::ENUM> OpcodePair;
     public:
         auto operator=(FrameQueue&) -> FrameQueue& = delete;
diff --git a/src/common/network/NetRPC.h b/src/common/network/NetRPC.h
index 2401f327..459b9967 100644
--- a/src/common/network/NetRPC.h
+++ b/src/common/network/NetRPC.h
@@ -38,7 +38,7 @@ namespace network
         //  Class Prototypes
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API Socket;
+        class Socket;
     }
 
     // ---------------------------------------------------------------------------
@@ -55,7 +55,7 @@ namespace network
      * @brief Implements the Remote Procedure Call networking logic.
      * @ingroup network_core
      */
-    class HOST_SW_API NetRPC {
+    class DVM_COMMON_API NetRPC {
     public:
         typedef std::function<void(json::object& request, json::object& reply)> RPCType;
 
diff --git a/src/common/network/Network.h b/src/common/network/Network.h
index d4f1e5d3..dfdb86c5 100644
--- a/src/common/network/Network.h
+++ b/src/common/network/Network.h
@@ -141,7 +141,7 @@ namespace network
      * @brief Implements the core peer networking logic.
      * @ingroup network_core
      */
-    class HOST_SW_API Network : public BaseNetwork {
+    class DVM_COMMON_API Network : public BaseNetwork {
     public:
         /**
          * @brief Initializes a new instance of the Network class.
diff --git a/src/common/network/PacketBuffer.h b/src/common/network/PacketBuffer.h
index 4aa4e13d..46fbe6e3 100644
--- a/src/common/network/PacketBuffer.h
+++ b/src/common/network/PacketBuffer.h
@@ -54,7 +54,7 @@ namespace network
      *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      * \endcode
      */
-    class HOST_SW_API PacketBuffer {
+    class DVM_COMMON_API PacketBuffer {
     public:
         auto operator=(PacketBuffer&) -> PacketBuffer& = delete;
         auto operator=(PacketBuffer&&) -> PacketBuffer& = delete;
diff --git a/src/common/network/RPCHeader.h b/src/common/network/RPCHeader.h
index ac231d85..897f6063 100644
--- a/src/common/network/RPCHeader.h
+++ b/src/common/network/RPCHeader.h
@@ -47,7 +47,7 @@ namespace network
          * 8 bytes
          * \endcode
          */
-        class HOST_SW_API RPCHeader {
+        class DVM_COMMON_API RPCHeader {
         public:
             /**
              * @brief Initializes a new instance of the RPCHeader class.
diff --git a/src/common/network/RTPExtensionHeader.h b/src/common/network/RTPExtensionHeader.h
index 658054de..dc279233 100644
--- a/src/common/network/RTPExtensionHeader.h
+++ b/src/common/network/RTPExtensionHeader.h
@@ -47,7 +47,7 @@ namespace network
          * 4 bytes
          * \endcode
          */
-        class HOST_SW_API RTPExtensionHeader {
+        class DVM_COMMON_API RTPExtensionHeader {
         public:
             /**
              * @brief Initializes a new instance of the RTPExtensionHeader class.
diff --git a/src/common/network/RTPFNEHeader.h b/src/common/network/RTPFNEHeader.h
index 2b6ccc89..fd58e93d 100644
--- a/src/common/network/RTPFNEHeader.h
+++ b/src/common/network/RTPFNEHeader.h
@@ -184,7 +184,7 @@ namespace network
          * 20 bytes (16 bytes without RTP Extension Header)
          * \endcode
          */
-        class HOST_SW_API RTPFNEHeader : public RTPExtensionHeader {
+        class DVM_COMMON_API RTPFNEHeader : public RTPExtensionHeader {
         public:
             /**
              * @brief Initializes a new instance of the RTPFNEHeader class.
diff --git a/src/common/network/RTPHeader.h b/src/common/network/RTPHeader.h
index 5b719888..21de0b08 100644
--- a/src/common/network/RTPHeader.h
+++ b/src/common/network/RTPHeader.h
@@ -54,7 +54,7 @@ namespace network
          * \endcode
          * @ingroup network_core
          */
-        class HOST_SW_API RTPHeader {
+        class DVM_COMMON_API RTPHeader {
         public:
             /**
              * @brief Initializes a new instance of the RTPHeader class.
diff --git a/src/common/network/RawFrameQueue.h b/src/common/network/RawFrameQueue.h
index 49106b26..ac260965 100644
--- a/src/common/network/RawFrameQueue.h
+++ b/src/common/network/RawFrameQueue.h
@@ -40,7 +40,7 @@ namespace network
      * @brief Implements the network frame queuing logic.
      * @ingroup network_core
      */
-    class HOST_SW_API RawFrameQueue {
+    class DVM_COMMON_API RawFrameQueue {
     public:
         auto operator=(RawFrameQueue&) -> RawFrameQueue& = delete;
         auto operator=(RawFrameQueue&&) -> RawFrameQueue& = delete;
diff --git a/src/common/network/tcp/SecureTcpClient.h b/src/common/network/tcp/SecureTcpClient.h
index f8a654c8..6d5728a0 100644
--- a/src/common/network/tcp/SecureTcpClient.h
+++ b/src/common/network/tcp/SecureTcpClient.h
@@ -43,7 +43,7 @@ namespace network
          * @brief Implements a secure TCP client.
          * @ingroup tcp_socket
          */
-        class HOST_SW_API SecureTcpClient : public Socket
+        class DVM_COMMON_API SecureTcpClient : public Socket
         {
         public:
             auto operator=(SecureTcpClient&) -> SecureTcpClient& = delete;
diff --git a/src/common/network/tcp/SecureTcpListener.h b/src/common/network/tcp/SecureTcpListener.h
index 6d7bdab7..f6c0ffe2 100644
--- a/src/common/network/tcp/SecureTcpListener.h
+++ b/src/common/network/tcp/SecureTcpListener.h
@@ -38,7 +38,7 @@ namespace network
          * @brief Implements a secure TCP server listener.
          * @ingroup tcp_socket
          */
-        class HOST_SW_API SecureTcpListener : public Socket
+        class DVM_COMMON_API SecureTcpListener : public Socket
         {
         public:
             auto operator=(SecureTcpListener&) -> SecureTcpListener& = delete;
diff --git a/src/common/network/tcp/Socket.h b/src/common/network/tcp/Socket.h
index 64a118f6..4930197e 100644
--- a/src/common/network/tcp/Socket.h
+++ b/src/common/network/tcp/Socket.h
@@ -58,7 +58,7 @@ namespace network
          *  network socket.
          * @ingroup tcp_socket
          */
-        class HOST_SW_API Socket
+        class DVM_COMMON_API Socket
         {
         public:
             auto operator=(Socket&) -> Socket& = delete;
diff --git a/src/common/network/tcp/TcpClient.h b/src/common/network/tcp/TcpClient.h
index 8f242101..8cb53573 100644
--- a/src/common/network/tcp/TcpClient.h
+++ b/src/common/network/tcp/TcpClient.h
@@ -33,7 +33,7 @@ namespace network
          * @brief Implements a TCP client. 
          * @ingroup tcp_socket
          */
-        class HOST_SW_API TcpClient : public Socket
+        class DVM_COMMON_API TcpClient : public Socket
         {
         public:
             auto operator=(TcpClient&) -> TcpClient& = delete;
diff --git a/src/common/network/tcp/TcpListener.h b/src/common/network/tcp/TcpListener.h
index 9201957f..3f1d15a3 100644
--- a/src/common/network/tcp/TcpListener.h
+++ b/src/common/network/tcp/TcpListener.h
@@ -31,7 +31,7 @@ namespace network
          * @brief Implements a TCP server listener.
          * @ingroup tcp_socket
          */
-        class HOST_SW_API TcpListener : public Socket
+        class DVM_COMMON_API TcpListener : public Socket
         {
         public:
 
diff --git a/src/common/network/udp/Socket.h b/src/common/network/udp/Socket.h
index 8993c675..227baea8 100644
--- a/src/common/network/udp/Socket.h
+++ b/src/common/network/udp/Socket.h
@@ -182,7 +182,7 @@ namespace network
          *  network socket.
          * @ingroup udp_socket
          */
-        class HOST_SW_API Socket {
+        class DVM_COMMON_API Socket {
         public:
             auto operator=(Socket&) -> Socket& = delete;
             auto operator=(Socket&&) -> Socket& = delete;
diff --git a/src/common/network/viface/VIFace.h b/src/common/network/viface/VIFace.h
index 4f2063a9..20731c7f 100644
--- a/src/common/network/viface/VIFace.h
+++ b/src/common/network/viface/VIFace.h
@@ -52,7 +52,7 @@ namespace network
          *  network interface.
          * @ingroup viface
          */
-        class HOST_SW_API VIFace {
+        class DVM_COMMON_API VIFace {
         public:
             auto operator=(VIFace&) -> VIFace& = delete;
             auto operator=(VIFace&&) -> VIFace& = delete;
diff --git a/src/common/nxdn/Audio.h b/src/common/nxdn/Audio.h
index c9640be8..860a18ce 100644
--- a/src/common/nxdn/Audio.h
+++ b/src/common/nxdn/Audio.h
@@ -454,7 +454,7 @@ namespace nxdn
      * @brief Implements NXDN audio processing and interleaving.
      * @ingroup host_nxdn
      */
-    class HOST_SW_API Audio {
+    class DVM_COMMON_API Audio {
     public:
         /**
          * @brief Initializes a new instance of the Audio class.
diff --git a/src/common/nxdn/NXDNUtils.h b/src/common/nxdn/NXDNUtils.h
index 264931b2..1bf14773 100644
--- a/src/common/nxdn/NXDNUtils.h
+++ b/src/common/nxdn/NXDNUtils.h
@@ -29,7 +29,7 @@ namespace nxdn
      * @brief This class implements various helper functions for scrambling NXDN data.
      * @ingroup nxdn
      */
-    class HOST_SW_API NXDNUtils {
+    class DVM_COMMON_API NXDNUtils {
     public:
         /**
          * @brief Helper to scramble the NXDN frame data.
diff --git a/src/common/nxdn/SiteData.h b/src/common/nxdn/SiteData.h
index 576845d9..8c8ffde2 100644
--- a/src/common/nxdn/SiteData.h
+++ b/src/common/nxdn/SiteData.h
@@ -27,7 +27,7 @@ namespace nxdn
      * @brief Represents site data for NXDN.
      * @ingroup nxdn
      */
-    class HOST_SW_API SiteData {
+    class DVM_COMMON_API SiteData {
     public:
         /**
          * @brief Initializes a new instance of the SiteData class.
diff --git a/src/common/nxdn/Sync.h b/src/common/nxdn/Sync.h
index 1ce6dcd8..0fc3cc2a 100644
--- a/src/common/nxdn/Sync.h
+++ b/src/common/nxdn/Sync.h
@@ -28,7 +28,7 @@ namespace nxdn
      * @brief Helper class for generating NXDN sync data.
      * @ingroup nxdn
      */
-    class HOST_SW_API Sync {
+    class DVM_COMMON_API Sync {
     public:
         /**
          * @brief Helper to append NXDN sync bytes to the passed buffer.
diff --git a/src/common/nxdn/acl/AccessControl.h b/src/common/nxdn/acl/AccessControl.h
index d6728328..470f73fa 100644
--- a/src/common/nxdn/acl/AccessControl.h
+++ b/src/common/nxdn/acl/AccessControl.h
@@ -36,7 +36,7 @@ namespace nxdn
          * @brief This class implements radio and talkgroup ID access control checking.
          * @ingroup nxdn
          */
-        class HOST_SW_API AccessControl {
+        class DVM_COMMON_API AccessControl {
         public:
             /**
              * @brief Initializes the NXDN access control.
diff --git a/src/common/nxdn/channel/CAC.h b/src/common/nxdn/channel/CAC.h
index b5d299bf..aa0e6373 100644
--- a/src/common/nxdn/channel/CAC.h
+++ b/src/common/nxdn/channel/CAC.h
@@ -31,7 +31,7 @@ namespace nxdn
          * @brief Implements NXDN Common Access Channel.
          * @ingroup nxdn_ch
          */
-        class HOST_SW_API CAC {
+        class DVM_COMMON_API CAC {
         public:
             /**
              * @brief Initializes a new instance of the CAC class.
diff --git a/src/common/nxdn/channel/FACCH1.h b/src/common/nxdn/channel/FACCH1.h
index d60a5fd4..353c7e0c 100644
--- a/src/common/nxdn/channel/FACCH1.h
+++ b/src/common/nxdn/channel/FACCH1.h
@@ -30,7 +30,7 @@ namespace nxdn
          * @brief Implements NXDN Fast Associated Control Channel 1.
          * @ingroup nxdn_ch
          */
-        class HOST_SW_API FACCH1 {
+        class DVM_COMMON_API FACCH1 {
         public:
             /**
              * @brief Initializes a new instance of the FACCH1 class.
diff --git a/src/common/nxdn/channel/LICH.h b/src/common/nxdn/channel/LICH.h
index 3eedaf01..34f59c16 100644
--- a/src/common/nxdn/channel/LICH.h
+++ b/src/common/nxdn/channel/LICH.h
@@ -36,7 +36,7 @@ namespace nxdn
          * @brief Implements NXDN Link Information Channel.
          * @ingroup nxdn_ch
          */
-        class HOST_SW_API LICH {
+        class DVM_COMMON_API LICH {
         public:
             /**
              * @brief Initializes a new instance of the LICH class.
diff --git a/src/common/nxdn/channel/SACCH.h b/src/common/nxdn/channel/SACCH.h
index fdf29408..b6060b7f 100644
--- a/src/common/nxdn/channel/SACCH.h
+++ b/src/common/nxdn/channel/SACCH.h
@@ -32,7 +32,7 @@ namespace nxdn
          * @brief Implements NXDN Slow Associated Control Channel.
          * @ingroup nxdn_ch
          */
-        class HOST_SW_API SACCH {
+        class DVM_COMMON_API SACCH {
         public:
             /**
              * @brief Initializes a new instance of the SACCH class.
diff --git a/src/common/nxdn/channel/UDCH.h b/src/common/nxdn/channel/UDCH.h
index a5d93e2d..86a84267 100644
--- a/src/common/nxdn/channel/UDCH.h
+++ b/src/common/nxdn/channel/UDCH.h
@@ -31,7 +31,7 @@ namespace nxdn
          * @brief Implements NXDN User Data Channel / Fast Access Control Channel 2.
          * @ingroup nxdn_ch
          */
-        class HOST_SW_API UDCH {
+        class DVM_COMMON_API UDCH {
         public:
             /**
              * @brief Initializes a new instance of the UDCH class.
diff --git a/src/common/nxdn/edac/Convolution.h b/src/common/nxdn/edac/Convolution.h
index 18862ddd..8c214e82 100644
--- a/src/common/nxdn/edac/Convolution.h
+++ b/src/common/nxdn/edac/Convolution.h
@@ -37,7 +37,7 @@ namespace nxdn
          * @brief Implements NXDN frame convolution processing.
          * @ingroup nxdn_edac
          */
-        class HOST_SW_API Convolution {
+        class DVM_COMMON_API Convolution {
         public:
             /**
              * @brief Initializes a new instance of the Convolution class.
diff --git a/src/common/nxdn/lc/PacketInformation.h b/src/common/nxdn/lc/PacketInformation.h
index 57e0187d..cf45bf21 100644
--- a/src/common/nxdn/lc/PacketInformation.h
+++ b/src/common/nxdn/lc/PacketInformation.h
@@ -30,7 +30,7 @@ namespace nxdn
          * @brief Represents the packet information data for link control data.
          * @ingroup nxdn_lc
          */
-        class HOST_SW_API PacketInformation {
+        class DVM_COMMON_API PacketInformation {
         public:
             /**
              * @brief Initializes a new instance of the PacketInformation class.
diff --git a/src/common/nxdn/lc/RCCH.h b/src/common/nxdn/lc/RCCH.h
index 0c2cad8f..c3d4a480 100644
--- a/src/common/nxdn/lc/RCCH.h
+++ b/src/common/nxdn/lc/RCCH.h
@@ -32,7 +32,7 @@ namespace nxdn
          * @brief Represents link control data for control channel NXDN calls.
          * @ingroup nxdn_lc
          */
-        class HOST_SW_API RCCH {
+        class DVM_COMMON_API RCCH {
         public:
             /**
              * @brief Initializes a new instance of the RCCH class.
diff --git a/src/common/nxdn/lc/RTCH.h b/src/common/nxdn/lc/RTCH.h
index 84de99cd..bd8d1e0d 100644
--- a/src/common/nxdn/lc/RTCH.h
+++ b/src/common/nxdn/lc/RTCH.h
@@ -36,7 +36,7 @@ namespace nxdn
          * @brief Represents link control data for traffic channel NXDN calls.
          * @ingroup nxdn_lc
          */
-        class HOST_SW_API RTCH {
+        class DVM_COMMON_API RTCH {
         public:
             /**
              * @brief Initializes a new instance of the RTCH class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h
index c2de1dfc..0ea64bcc 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h
@@ -33,7 +33,7 @@ namespace nxdn
              * @brief Implements DCALL_HDR - Data Call Header
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_DCALL_HDR : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_DCALL_HDR : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_DCALL_HDR class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h
index 724b5e9d..1773b6aa 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h
@@ -33,7 +33,7 @@ namespace nxdn
              * @brief Implements DST_ID_INFO - Digital Station ID
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_DST_ID_INFO : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_DST_ID_INFO : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_DST_ID_INFO class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h
index 48c9f298..3e0accd5 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h
@@ -34,7 +34,7 @@ namespace nxdn
              *  Group Registration Response (OSP)
              * @ingroup nxdn_rcch 
              */
-            class HOST_SW_API MESSAGE_TYPE_GRP_REG : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_GRP_REG : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_GRP_REG class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h
index 709487ea..a6581df8 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h
@@ -33,7 +33,7 @@ namespace nxdn
              * @brief Implements IDLE - Idle
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_IDLE : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_IDLE : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_IDLE class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h
index b2f44350..1ada97e0 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h
@@ -34,7 +34,7 @@ namespace nxdn
              *  Registration Response (OSP)
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_REG : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_REG : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_REG class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h
index 6ed50f69..36989c9b 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h
@@ -34,7 +34,7 @@ namespace nxdn
              *  Registration Clear Response (OSP)
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_REG_C : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_REG_C : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_REG_C class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h
index e4beb2a7..7e2f6abc 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h
@@ -33,7 +33,7 @@ namespace nxdn
              * @brief Implements REG_COMM - Registration Command
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_REG_COMM : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_REG_COMM : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_REG_COMM class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h
index a374db2b..a2b742b7 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h
@@ -33,7 +33,7 @@ namespace nxdn
              * @brief Implements SITE_INFO - Site Information
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_SITE_INFO : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_SITE_INFO : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_SITE_INFO class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h
index e3b68985..adb28b92 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h
@@ -33,7 +33,7 @@ namespace nxdn
              * @brief Implements SRV_INFO - Service Information
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_SRV_INFO : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_SRV_INFO : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_SRV_INFO class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h
index a853a36f..72417716 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h
@@ -33,7 +33,7 @@ namespace nxdn
              * @brief Implements VCALL_ASSGN - Voice Call Assignment
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_VCALL_ASSGN : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_VCALL_ASSGN : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_VCALL_ASSGN class.
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h
index e90d6ce3..5a969291 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h
@@ -34,7 +34,7 @@ namespace nxdn
              *  Voice Call Connection Response (OSP)
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API MESSAGE_TYPE_VCALL_CONN : public RCCH {
+            class DVM_COMMON_API MESSAGE_TYPE_VCALL_CONN : public RCCH {
             public:
                 /**
                  * @brief Initializes a new instance of the MESSAGE_TYPE_VCALL_CONN class.
diff --git a/src/common/nxdn/lc/rcch/RCCHFactory.h b/src/common/nxdn/lc/rcch/RCCHFactory.h
index 8f56a797..a00ad780 100644
--- a/src/common/nxdn/lc/rcch/RCCHFactory.h
+++ b/src/common/nxdn/lc/rcch/RCCHFactory.h
@@ -49,7 +49,7 @@ namespace nxdn
              * @brief Helper class to instantiate an instance of a RCCH.
              * @ingroup nxdn_rcch
              */
-            class HOST_SW_API RCCHFactory {
+            class DVM_COMMON_API RCCHFactory {
             public:
                 /**
                  * @brief Initializes a new instance of the RCCHFactory class.
diff --git a/src/common/p25/Audio.h b/src/common/p25/Audio.h
index 176fc85f..0630a08a 100644
--- a/src/common/p25/Audio.h
+++ b/src/common/p25/Audio.h
@@ -29,7 +29,7 @@ namespace p25
      * @brief Implements P25 audio processing and interleaving.
      * @ingroup p25
      */
-    class HOST_SW_API Audio {
+    class DVM_COMMON_API Audio {
     public:
         /**
          * @brief Initializes a new instance of the Audio class.
diff --git a/src/common/p25/Crypto.h b/src/common/p25/Crypto.h
index 81c08bb0..14e9d29b 100644
--- a/src/common/p25/Crypto.h
+++ b/src/common/p25/Crypto.h
@@ -38,7 +38,7 @@ namespace p25
          * @brief Project 25 Cryptography.
          * @ingroup p25_crypto
          */
-        class HOST_SW_API P25Crypto {
+        class DVM_COMMON_API P25Crypto {
         public:
             /**
              * @brief Initializes a new instance of the P25Crypto class.
diff --git a/src/common/p25/NID.h b/src/common/p25/NID.h
index 78fc68b4..dd1e2110 100644
--- a/src/common/p25/NID.h
+++ b/src/common/p25/NID.h
@@ -30,7 +30,7 @@ namespace p25
      * @brief Represents the P25 network identifier.
      * @ingroup p25
      */
-    class HOST_SW_API NID {
+    class DVM_COMMON_API NID {
     public:
         /**
          * @brief Initializes a new instance of the NID class.
diff --git a/src/common/p25/P25Utils.h b/src/common/p25/P25Utils.h
index 66b4cb27..6a0ab25f 100644
--- a/src/common/p25/P25Utils.h
+++ b/src/common/p25/P25Utils.h
@@ -30,7 +30,7 @@ namespace p25
      *  for interleaving P25 data.
      * @ingroup p25
      */
-    class HOST_SW_API P25Utils {
+    class DVM_COMMON_API P25Utils {
     public:
         /**
          * @brief Helper to test and clamp a P25 NAC.
diff --git a/src/common/p25/SiteData.h b/src/common/p25/SiteData.h
index f8162dcd..6225235b 100644
--- a/src/common/p25/SiteData.h
+++ b/src/common/p25/SiteData.h
@@ -30,7 +30,7 @@ namespace p25
      * @brief Represents site data for P25.
      * @ingroup p25
      */
-    class HOST_SW_API SiteData {
+    class DVM_COMMON_API SiteData {
     public:
         /**
          * @brief Initializes a new instance of the SiteData class.
diff --git a/src/common/p25/Sync.h b/src/common/p25/Sync.h
index a51b032a..d54af6aa 100644
--- a/src/common/p25/Sync.h
+++ b/src/common/p25/Sync.h
@@ -29,7 +29,7 @@ namespace p25
      * @brief Helper class for generating P25 sync data.
      * @ingroup p25
      */
-    class HOST_SW_API Sync {
+    class DVM_COMMON_API Sync {
     public:
         /**
          * @brief Helper to append P25 sync bytes to the passed buffer.
diff --git a/src/common/p25/acl/AccessControl.h b/src/common/p25/acl/AccessControl.h
index de5e82b6..c303b0f1 100644
--- a/src/common/p25/acl/AccessControl.h
+++ b/src/common/p25/acl/AccessControl.h
@@ -36,7 +36,7 @@ namespace p25
          * @brief Implements radio and talkgroup ID access control checking.
          * @ingroup p25
          */
-        class HOST_SW_API AccessControl {
+        class DVM_COMMON_API AccessControl {
         public:
             /**
              * @brief Initializes the P25 access control.
diff --git a/src/common/p25/data/Assembler.h b/src/common/p25/data/Assembler.h
index 85cbfef8..f94f8aeb 100644
--- a/src/common/p25/data/Assembler.h
+++ b/src/common/p25/data/Assembler.h
@@ -35,7 +35,7 @@ namespace p25
          * @brief Implements a packet assembler for P25 PDU packet streams.
          * @ingroup p25_pdu
          */
-        class HOST_SW_API Assembler {
+        class DVM_COMMON_API Assembler {
         public:
             /**
              * @brief Initializes a new instance of the Assembler class.
diff --git a/src/common/p25/data/DataBlock.h b/src/common/p25/data/DataBlock.h
index 4bf7b9fa..d1f9e8b7 100644
--- a/src/common/p25/data/DataBlock.h
+++ b/src/common/p25/data/DataBlock.h
@@ -34,7 +34,7 @@ namespace p25
          * @brief Represents a data block for PDU P25 packets.
          * @ingroup p25_pdu
          */
-        class HOST_SW_API DataBlock {
+        class DVM_COMMON_API DataBlock {
         public:
             /**
              * @brief Initializes a copy instance of the DataBlock class.
diff --git a/src/common/p25/data/DataHeader.h b/src/common/p25/data/DataHeader.h
index 93b5fa47..0070dfb4 100644
--- a/src/common/p25/data/DataHeader.h
+++ b/src/common/p25/data/DataHeader.h
@@ -37,7 +37,7 @@ namespace p25
          * @brief Represents the data header for PDU P25 packets.
          * @ingroup p25_pdu
          */
-        class HOST_SW_API DataHeader {
+        class DVM_COMMON_API DataHeader {
         public:
             /**
              * @brief Initializes a copy instance of the DataHeader class.
diff --git a/src/common/p25/data/LowSpeedData.h b/src/common/p25/data/LowSpeedData.h
index 04ee56e8..46c2fa18 100644
--- a/src/common/p25/data/LowSpeedData.h
+++ b/src/common/p25/data/LowSpeedData.h
@@ -31,7 +31,7 @@ namespace p25
          * @brief Represents embedded low speed data in P25 LDUs.
          * @ingroup p25
          */
-        class HOST_SW_API LowSpeedData {
+        class DVM_COMMON_API LowSpeedData {
         public:
             /**
              * @brief Initializes a new instance of the LowSpeedData class.
diff --git a/src/common/p25/dfsi/LC.h b/src/common/p25/dfsi/LC.h
index b1f498d2..48936e48 100644
--- a/src/common/p25/dfsi/LC.h
+++ b/src/common/p25/dfsi/LC.h
@@ -36,7 +36,7 @@ namespace p25
          * @brief Represents link control data for DFSI VHDR, LDU1 and 2 packets.
          * @ingroup p25_dfsi
          */
-        class HOST_SW_API LC {
+        class DVM_COMMON_API LC {
         public:
             /**
              * @brief Initializes a new instance of the LC class.
diff --git a/src/common/p25/dfsi/frames/BlockHeader.h b/src/common/p25/dfsi/frames/BlockHeader.h
index 69c5005d..58a8ab4a 100644
--- a/src/common/p25/dfsi/frames/BlockHeader.h
+++ b/src/common/p25/dfsi/frames/BlockHeader.h
@@ -51,7 +51,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API BlockHeader {
+            class DVM_COMMON_API BlockHeader {
             public:
                 static const uint8_t LENGTH = 1U;
                 static const uint8_t VERBOSE_LENGTH = 4U;
diff --git a/src/common/p25/dfsi/frames/ControlOctet.h b/src/common/p25/dfsi/frames/ControlOctet.h
index f8419270..790ab8c8 100644
--- a/src/common/p25/dfsi/frames/ControlOctet.h
+++ b/src/common/p25/dfsi/frames/ControlOctet.h
@@ -43,7 +43,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API ControlOctet {
+            class DVM_COMMON_API ControlOctet {
             public:
                 static const uint8_t LENGTH = 1U;
 
diff --git a/src/common/p25/dfsi/frames/FullRateVoice.h b/src/common/p25/dfsi/frames/FullRateVoice.h
index f4e8eaf0..d02a3fa0 100644
--- a/src/common/p25/dfsi/frames/FullRateVoice.h
+++ b/src/common/p25/dfsi/frames/FullRateVoice.h
@@ -183,7 +183,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API FullRateVoice {
+            class DVM_COMMON_API FullRateVoice {
             public:
                 static const uint8_t LENGTH_121011 = 14U;
                 static const uint8_t LENGTH_918 = 17U;
diff --git a/src/common/p25/dfsi/frames/MotFullRateVoice.h b/src/common/p25/dfsi/frames/MotFullRateVoice.h
index 1c2e1349..fca16396 100644
--- a/src/common/p25/dfsi/frames/MotFullRateVoice.h
+++ b/src/common/p25/dfsi/frames/MotFullRateVoice.h
@@ -53,7 +53,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API MotFullRateVoice {
+            class DVM_COMMON_API MotFullRateVoice {
             public:
                 static const uint8_t LENGTH = 17U;
                 static const uint8_t SHORTENED_LENGTH = 14U;
diff --git a/src/common/p25/dfsi/frames/MotStartOfStream.h b/src/common/p25/dfsi/frames/MotStartOfStream.h
index 2d23868c..e3084e54 100644
--- a/src/common/p25/dfsi/frames/MotStartOfStream.h
+++ b/src/common/p25/dfsi/frames/MotStartOfStream.h
@@ -48,7 +48,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API MotStartOfStream {
+            class DVM_COMMON_API MotStartOfStream {
             public:
                 /**
                  * @brief Initializes a copy instance of the MotStartOfStream class.
diff --git a/src/common/p25/dfsi/frames/MotStartVoiceFrame.h b/src/common/p25/dfsi/frames/MotStartVoiceFrame.h
index 66df6bf9..a9b3c0b5 100644
--- a/src/common/p25/dfsi/frames/MotStartVoiceFrame.h
+++ b/src/common/p25/dfsi/frames/MotStartVoiceFrame.h
@@ -56,7 +56,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API MotStartVoiceFrame {
+            class DVM_COMMON_API MotStartVoiceFrame {
             public:
                 static const uint8_t LENGTH = 22U;
 
diff --git a/src/common/p25/dfsi/frames/MotTDULCFrame.h b/src/common/p25/dfsi/frames/MotTDULCFrame.h
index 66a30838..adee14fe 100644
--- a/src/common/p25/dfsi/frames/MotTDULCFrame.h
+++ b/src/common/p25/dfsi/frames/MotTDULCFrame.h
@@ -53,7 +53,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API MotTDULCFrame {
+            class DVM_COMMON_API MotTDULCFrame {
             public:
                 /**
                  * @brief Initializes a copy instance of the MotTDULCFrame class.
diff --git a/src/common/p25/dfsi/frames/MotTSBKFrame.h b/src/common/p25/dfsi/frames/MotTSBKFrame.h
index 2ffee559..bb9682f0 100644
--- a/src/common/p25/dfsi/frames/MotTSBKFrame.h
+++ b/src/common/p25/dfsi/frames/MotTSBKFrame.h
@@ -55,7 +55,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API MotTSBKFrame {
+            class DVM_COMMON_API MotTSBKFrame {
             public:
                 /**
                  * @brief Initializes a copy instance of the MotTSBKFrame class.
diff --git a/src/common/p25/dfsi/frames/StartOfStream.h b/src/common/p25/dfsi/frames/StartOfStream.h
index 014b08c2..d986a60f 100644
--- a/src/common/p25/dfsi/frames/StartOfStream.h
+++ b/src/common/p25/dfsi/frames/StartOfStream.h
@@ -43,7 +43,7 @@ namespace p25
              * \endcode
              * @ingroup dfsi_frames
              */
-            class HOST_SW_API StartOfStream {
+            class DVM_COMMON_API StartOfStream {
             public:
                 static const uint8_t LENGTH = 3U;
 
diff --git a/src/common/p25/dfsi/frames/fsc/FSCACK.h b/src/common/p25/dfsi/frames/fsc/FSCACK.h
index 26aeab92..a09a5176 100644
--- a/src/common/p25/dfsi/frames/fsc/FSCACK.h
+++ b/src/common/p25/dfsi/frames/fsc/FSCACK.h
@@ -39,7 +39,7 @@ namespace p25
                  * @brief Implements the FSC Acknowledgement Message.
                  * @ingroup dfsi_fsc_frames
                  */
-                class HOST_SW_API FSCACK : public FSCMessage {
+                class DVM_COMMON_API FSCACK : public FSCMessage {
                 public:
                     static const uint8_t LENGTH = 7U;
 
diff --git a/src/common/p25/dfsi/frames/fsc/FSCConnect.h b/src/common/p25/dfsi/frames/fsc/FSCConnect.h
index 5f337f82..9123758e 100644
--- a/src/common/p25/dfsi/frames/fsc/FSCConnect.h
+++ b/src/common/p25/dfsi/frames/fsc/FSCConnect.h
@@ -39,7 +39,7 @@ namespace p25
                  * @brief Implements the FSC Connect Message.
                  * @ingroup dfsi_fsc_frames
                  */
-                class HOST_SW_API FSCConnect : public FSCMessage {
+                class DVM_COMMON_API FSCConnect : public FSCMessage {
                 public:
                     static const uint8_t LENGTH = 11U;
 
diff --git a/src/common/p25/dfsi/frames/fsc/FSCDisconnect.h b/src/common/p25/dfsi/frames/fsc/FSCDisconnect.h
index 1e9517b9..fa616aa9 100644
--- a/src/common/p25/dfsi/frames/fsc/FSCDisconnect.h
+++ b/src/common/p25/dfsi/frames/fsc/FSCDisconnect.h
@@ -39,7 +39,7 @@ namespace p25
                  * @brief Implements the FSC Disconnect Message.
                  * @ingroup dfsi_fsc_frames
                  */
-                class HOST_SW_API FSCDisconnect : public FSCMessage {
+                class DVM_COMMON_API FSCDisconnect : public FSCMessage {
                 public:
                     static const uint8_t LENGTH = 3U;
 
diff --git a/src/common/p25/dfsi/frames/fsc/FSCHeartbeat.h b/src/common/p25/dfsi/frames/fsc/FSCHeartbeat.h
index ccc7e68e..52cdeb21 100644
--- a/src/common/p25/dfsi/frames/fsc/FSCHeartbeat.h
+++ b/src/common/p25/dfsi/frames/fsc/FSCHeartbeat.h
@@ -39,7 +39,7 @@ namespace p25
                  * @brief Implements the FSC Heartbeat Message.
                  * @ingroup dfsi_fsc_frames
                  */
-                class HOST_SW_API FSCHeartbeat : public FSCMessage {
+                class DVM_COMMON_API FSCHeartbeat : public FSCMessage {
                 public:
                     static const uint8_t LENGTH = 3U;
 
diff --git a/src/common/p25/dfsi/frames/fsc/FSCMessage.h b/src/common/p25/dfsi/frames/fsc/FSCMessage.h
index 1086d596..db676dcf 100644
--- a/src/common/p25/dfsi/frames/fsc/FSCMessage.h
+++ b/src/common/p25/dfsi/frames/fsc/FSCMessage.h
@@ -38,7 +38,7 @@ namespace p25
                  * @brief Base class FSC messages derive from.
                  * @ingroup dfsi_fsc_frames
                  */
-                class HOST_SW_API FSCMessage {
+                class DVM_COMMON_API FSCMessage {
                 public:
                     static const uint8_t LENGTH = 3;
 
diff --git a/src/common/p25/dfsi/frames/fsc/FSCReportSelModes.h b/src/common/p25/dfsi/frames/fsc/FSCReportSelModes.h
index e6be7042..24c12e7e 100644
--- a/src/common/p25/dfsi/frames/fsc/FSCReportSelModes.h
+++ b/src/common/p25/dfsi/frames/fsc/FSCReportSelModes.h
@@ -39,7 +39,7 @@ namespace p25
                  * @brief Implements the FSC Report Selected Modes Message.
                  * @ingroup dfsi_fsc_frames
                  */
-                class HOST_SW_API FSCReportSelModes : public FSCMessage {
+                class DVM_COMMON_API FSCReportSelModes : public FSCMessage {
                 public:
                     static const uint8_t LENGTH = 3U;
 
diff --git a/src/common/p25/dfsi/frames/fsc/FSCSelChannel.h b/src/common/p25/dfsi/frames/fsc/FSCSelChannel.h
index c36ffa00..04efbc46 100644
--- a/src/common/p25/dfsi/frames/fsc/FSCSelChannel.h
+++ b/src/common/p25/dfsi/frames/fsc/FSCSelChannel.h
@@ -39,7 +39,7 @@ namespace p25
                  * @brief Implements the FSC Select Channel Message.
                  * @ingroup dfsi_fsc_frames
                  */
-                class HOST_SW_API FSCSelChannel : public FSCMessage {
+                class DVM_COMMON_API FSCSelChannel : public FSCMessage {
                 public:
                     static const uint8_t LENGTH = 3U;
 
diff --git a/src/common/p25/kmm/KMMDeregistrationCommand.h b/src/common/p25/kmm/KMMDeregistrationCommand.h
index bc8f203b..d8a76bb9 100644
--- a/src/common/p25/kmm/KMMDeregistrationCommand.h
+++ b/src/common/p25/kmm/KMMDeregistrationCommand.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMDeregistrationCommand : public KMMFrame {
+        class DVM_COMMON_API KMMDeregistrationCommand : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMDeregistrationCommand class.
diff --git a/src/common/p25/kmm/KMMDeregistrationResponse.h b/src/common/p25/kmm/KMMDeregistrationResponse.h
index aa0373f2..2553d39d 100644
--- a/src/common/p25/kmm/KMMDeregistrationResponse.h
+++ b/src/common/p25/kmm/KMMDeregistrationResponse.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMDeregistrationResponse : public KMMFrame {
+        class DVM_COMMON_API KMMDeregistrationResponse : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMDeregistrationResponse class.
diff --git a/src/common/p25/kmm/KMMFactory.h b/src/common/p25/kmm/KMMFactory.h
index 306369d5..38cb85b2 100644
--- a/src/common/p25/kmm/KMMFactory.h
+++ b/src/common/p25/kmm/KMMFactory.h
@@ -50,7 +50,7 @@ namespace p25
          * @brief Helper class to instantiate an instance of a KMM frame packet.
          * @ingroup p25_kmm
          */
-        class HOST_SW_API KMMFactory {
+        class DVM_COMMON_API KMMFactory {
         public:
             /**
              * @brief Initializes a new instance of the KMMFactory class.
diff --git a/src/common/p25/kmm/KMMFrame.h b/src/common/p25/kmm/KMMFrame.h
index 44cc9402..3e8f529f 100644
--- a/src/common/p25/kmm/KMMFrame.h
+++ b/src/common/p25/kmm/KMMFrame.h
@@ -51,7 +51,7 @@ namespace p25
          * @brief Represents a KMM frame packet header.
          * @ingroup p25_kmm
          */
-        class HOST_SW_API KMMFrame {
+        class DVM_COMMON_API KMMFrame {
         public:
             /**
              * @brief Initializes a copy instance of the KMMFrame class.
diff --git a/src/common/p25/kmm/KMMHello.h b/src/common/p25/kmm/KMMHello.h
index fbb5a20f..31788a02 100644
--- a/src/common/p25/kmm/KMMHello.h
+++ b/src/common/p25/kmm/KMMHello.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMHello : public KMMFrame {
+        class DVM_COMMON_API KMMHello : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMHello class.
diff --git a/src/common/p25/kmm/KMMInventoryCommand.h b/src/common/p25/kmm/KMMInventoryCommand.h
index 4b34db43..bcddb02a 100644
--- a/src/common/p25/kmm/KMMInventoryCommand.h
+++ b/src/common/p25/kmm/KMMInventoryCommand.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMInventoryCommand : public KMMFrame {
+        class DVM_COMMON_API KMMInventoryCommand : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMInventoryCommand class.
diff --git a/src/common/p25/kmm/KMMInventoryResponseHeader.h b/src/common/p25/kmm/KMMInventoryResponseHeader.h
index 7c8c521a..58abe599 100644
--- a/src/common/p25/kmm/KMMInventoryResponseHeader.h
+++ b/src/common/p25/kmm/KMMInventoryResponseHeader.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMInventoryResponseHeader : public KMMFrame {
+        class DVM_COMMON_API KMMInventoryResponseHeader : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMInventoryResponseHeader class.
diff --git a/src/common/p25/kmm/KMMInventoryResponseListKeyIDs.h b/src/common/p25/kmm/KMMInventoryResponseListKeyIDs.h
index b4466633..ded615a1 100644
--- a/src/common/p25/kmm/KMMInventoryResponseListKeyIDs.h
+++ b/src/common/p25/kmm/KMMInventoryResponseListKeyIDs.h
@@ -45,7 +45,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMInventoryResponseListKeyIDs : public KMMInventoryResponseHeader {
+        class DVM_COMMON_API KMMInventoryResponseListKeyIDs : public KMMInventoryResponseHeader {
         public:
             /**
              * @brief Initializes a new instance of the KMMInventoryResponseListKeyIDs class.
diff --git a/src/common/p25/kmm/KMMInventoryResponseListKeysets.h b/src/common/p25/kmm/KMMInventoryResponseListKeysets.h
index 617752a3..7b2b50e9 100644
--- a/src/common/p25/kmm/KMMInventoryResponseListKeysets.h
+++ b/src/common/p25/kmm/KMMInventoryResponseListKeysets.h
@@ -32,7 +32,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMInventoryResponseListKeysets : public KMMInventoryResponseHeader {
+        class DVM_COMMON_API KMMInventoryResponseListKeysets : public KMMInventoryResponseHeader {
         public:
             /**
              * @brief Initializes a new instance of the KMMInventoryResponseListKeysets class.
diff --git a/src/common/p25/kmm/KMMModifyKey.h b/src/common/p25/kmm/KMMModifyKey.h
index fa8e0cac..4a7e568c 100644
--- a/src/common/p25/kmm/KMMModifyKey.h
+++ b/src/common/p25/kmm/KMMModifyKey.h
@@ -45,7 +45,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMModifyKey : public KMMFrame {
+        class DVM_COMMON_API KMMModifyKey : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMModifyKey class.
diff --git a/src/common/p25/kmm/KMMNegativeAck.h b/src/common/p25/kmm/KMMNegativeAck.h
index a8c07035..7002f680 100644
--- a/src/common/p25/kmm/KMMNegativeAck.h
+++ b/src/common/p25/kmm/KMMNegativeAck.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMNegativeAck : public KMMFrame {
+        class DVM_COMMON_API KMMNegativeAck : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMNegativeAck class.
diff --git a/src/common/p25/kmm/KMMNoService.h b/src/common/p25/kmm/KMMNoService.h
index 8af8a0db..c04d6ced 100644
--- a/src/common/p25/kmm/KMMNoService.h
+++ b/src/common/p25/kmm/KMMNoService.h
@@ -31,7 +31,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMNoService : public KMMFrame {
+        class DVM_COMMON_API KMMNoService : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMNoService class.
diff --git a/src/common/p25/kmm/KMMRegistrationCommand.h b/src/common/p25/kmm/KMMRegistrationCommand.h
index 033563d4..b5c862d8 100644
--- a/src/common/p25/kmm/KMMRegistrationCommand.h
+++ b/src/common/p25/kmm/KMMRegistrationCommand.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMRegistrationCommand : public KMMFrame {
+        class DVM_COMMON_API KMMRegistrationCommand : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMRegistrationCommand class.
diff --git a/src/common/p25/kmm/KMMRegistrationResponse.h b/src/common/p25/kmm/KMMRegistrationResponse.h
index ccd89144..f881a356 100644
--- a/src/common/p25/kmm/KMMRegistrationResponse.h
+++ b/src/common/p25/kmm/KMMRegistrationResponse.h
@@ -44,7 +44,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMRegistrationResponse : public KMMFrame {
+        class DVM_COMMON_API KMMRegistrationResponse : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMRegistrationResponse class.
diff --git a/src/common/p25/kmm/KMMRekeyAck.h b/src/common/p25/kmm/KMMRekeyAck.h
index 831442a1..3c359ba9 100644
--- a/src/common/p25/kmm/KMMRekeyAck.h
+++ b/src/common/p25/kmm/KMMRekeyAck.h
@@ -45,7 +45,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMRekeyAck : public KMMFrame {
+        class DVM_COMMON_API KMMRekeyAck : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMRekeyAck class.
diff --git a/src/common/p25/kmm/KMMRekeyCommand.h b/src/common/p25/kmm/KMMRekeyCommand.h
index 1879f292..aee3792d 100644
--- a/src/common/p25/kmm/KMMRekeyCommand.h
+++ b/src/common/p25/kmm/KMMRekeyCommand.h
@@ -45,7 +45,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMRekeyCommand : public KMMFrame {
+        class DVM_COMMON_API KMMRekeyCommand : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMRekeyCommand class.
diff --git a/src/common/p25/kmm/KMMUnableToDecrypt.h b/src/common/p25/kmm/KMMUnableToDecrypt.h
index 9aa08a81..f81fd305 100644
--- a/src/common/p25/kmm/KMMUnableToDecrypt.h
+++ b/src/common/p25/kmm/KMMUnableToDecrypt.h
@@ -45,7 +45,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMUnableToDecrypt : public KMMFrame {
+        class DVM_COMMON_API KMMUnableToDecrypt : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMUnableToDecrypt class.
diff --git a/src/common/p25/kmm/KMMZeroize.h b/src/common/p25/kmm/KMMZeroize.h
index a48eb16a..fc18cde0 100644
--- a/src/common/p25/kmm/KMMZeroize.h
+++ b/src/common/p25/kmm/KMMZeroize.h
@@ -31,7 +31,7 @@ namespace p25
         //  Class Declaration
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API KMMZeroize : public KMMFrame {
+        class DVM_COMMON_API KMMZeroize : public KMMFrame {
         public:
             /**
              * @brief Initializes a new instance of the KMMZeroize class.
diff --git a/src/common/p25/kmm/KeysetItem.h b/src/common/p25/kmm/KeysetItem.h
index 7c0d6ca8..9b22e9e5 100644
--- a/src/common/p25/kmm/KeysetItem.h
+++ b/src/common/p25/kmm/KeysetItem.h
@@ -45,7 +45,7 @@ namespace p25
          * @brief Represents a key set item within a KMM frame packet.
          * @ingroup p25_kmm
          */
-        class HOST_SW_API KeyItem {
+        class DVM_COMMON_API KeyItem {
         public:
             /**
              * @brief Initializes a new instance of the KeyItem class.
@@ -141,7 +141,7 @@ namespace p25
          * @brief Represents a key set item within a KMM frame packet.
          * @ingroup p25_kmm
          */
-        class HOST_SW_API KeysetItem {
+        class DVM_COMMON_API KeysetItem {
         public:
             /**
              * @brief Initializes a new instance of the KeysetItem class.
@@ -228,7 +228,7 @@ namespace p25
          * @brief Represents a key status within a KMM frame packet.
          * @ingroup p25_kmm
          */
-        class HOST_SW_API KeyStatus {
+        class DVM_COMMON_API KeyStatus {
         public:
             /**
              * @brief Initializes a new instance of the KeyStatus class.
diff --git a/src/common/p25/lc/AMBT.h b/src/common/p25/lc/AMBT.h
index 81e97a93..e3de08e9 100644
--- a/src/common/p25/lc/AMBT.h
+++ b/src/common/p25/lc/AMBT.h
@@ -33,7 +33,7 @@ namespace p25
          * @brief Represents link control data for Alternate Trunking packets.
          * @ingroup p25_lc
          */
-        class HOST_SW_API AMBT : public TSBK {
+        class DVM_COMMON_API AMBT : public TSBK {
         public:
             /**
              * @brief Initializes a new instance of the AMBT class.
diff --git a/src/common/p25/lc/LC.h b/src/common/p25/lc/LC.h
index aa76fdd1..103e21e2 100644
--- a/src/common/p25/lc/LC.h
+++ b/src/common/p25/lc/LC.h
@@ -37,8 +37,8 @@ namespace p25
         //  Class Prototypes
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API TSBK;
-        class HOST_SW_API TDULC;
+        class TSBK;
+        class TDULC;
 
         // ---------------------------------------------------------------------------
         //  Class Declaration
@@ -48,7 +48,7 @@ namespace p25
          * @brief Represents link control data for HDU, LDU1 and 2 packets.
          * @ingroup p25_lc
          */
-        class HOST_SW_API LC {
+        class DVM_COMMON_API LC {
         public:
             /**
              * @brief Initializes a copy instance of the LC class.
diff --git a/src/common/p25/lc/MACPDU.h b/src/common/p25/lc/MACPDU.h
index f7fbfa1a..76719809 100644
--- a/src/common/p25/lc/MACPDU.h
+++ b/src/common/p25/lc/MACPDU.h
@@ -33,7 +33,7 @@ namespace p25
          * @brief Base MAC object for a decoded Phase 2 MAC PDU.
          * @ingroup p25_lc
          */
-        class HOST_SW_API MACPDU {
+        class DVM_COMMON_API MACPDU {
         public:
             /**
              * @brief Initializes a new instance of the MACPDU class.
diff --git a/src/common/p25/lc/TDULC.h b/src/common/p25/lc/TDULC.h
index 217883dc..7d531dfc 100644
--- a/src/common/p25/lc/TDULC.h
+++ b/src/common/p25/lc/TDULC.h
@@ -35,8 +35,8 @@ namespace p25
         //  Class Prototypes
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API LC;
-        class HOST_SW_API TSBK;
+        class LC;
+        class TSBK;
 
         // ---------------------------------------------------------------------------
         //  Class Declaration
@@ -46,7 +46,7 @@ namespace p25
          * @brief Represents link control data for TDULC packets.
          * @ingroup p25_lc
          */
-        class HOST_SW_API TDULC {
+        class DVM_COMMON_API TDULC {
         public:
             /**
              * @brief Initializes a copy instance of the TDULC class.
diff --git a/src/common/p25/lc/TSBK.h b/src/common/p25/lc/TSBK.h
index b869ded7..90194959 100644
--- a/src/common/p25/lc/TSBK.h
+++ b/src/common/p25/lc/TSBK.h
@@ -35,7 +35,7 @@ namespace p25
         //  Class Prototypes
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API LC;
+        class LC;
     }
 
     namespace lc
@@ -44,8 +44,8 @@ namespace p25
         //  Class Prototypes
         // ---------------------------------------------------------------------------
 
-        class HOST_SW_API LC;
-        class HOST_SW_API TDULC;
+        class LC;
+        class TDULC;
 
         // ---------------------------------------------------------------------------
         //  Class Declaration
@@ -55,7 +55,7 @@ namespace p25
          * @brief Represents link control data for TSDU packets.
          * @ingroup p25_lc
          */
-        class HOST_SW_API TSBK {
+        class DVM_COMMON_API TSBK {
         public:
             /**
              * @brief Initializes a copy instance of the TSBK class.
diff --git a/src/common/p25/lc/mac/MACFactory.h b/src/common/p25/lc/mac/MACFactory.h
index 2dd61462..787d97f3 100644
--- a/src/common/p25/lc/mac/MACFactory.h
+++ b/src/common/p25/lc/mac/MACFactory.h
@@ -37,7 +37,7 @@ namespace p25
              * @brief Helper class to instantiate a Phase 2 MAC PDU.
              * @ingroup p25_lc
              */
-            class HOST_SW_API MACFactory {
+            class DVM_COMMON_API MACFactory {
             public:
                 /**
                  * @brief Initializes a new instance of the MACFactory class.
diff --git a/src/common/p25/lc/mac/MAC_GROUP_VCH_USER.h b/src/common/p25/lc/mac/MAC_GROUP_VCH_USER.h
index 153dca46..4de1ee2d 100644
--- a/src/common/p25/lc/mac/MAC_GROUP_VCH_USER.h
+++ b/src/common/p25/lc/mac/MAC_GROUP_VCH_USER.h
@@ -31,7 +31,7 @@ namespace p25
             /**
              * @brief Phase 2 group voice channel user MAC PDU. 
              */
-            class HOST_SW_API MAC_GROUP_VCH_USER : public MACPDU {
+            class DVM_COMMON_API MAC_GROUP_VCH_USER : public MACPDU {
             public:
                 /**
                  * @brief Initializes a new instance of the MAC_GROUP_VCH_USER class.
diff --git a/src/common/p25/lc/mac/MAC_RELEASE.h b/src/common/p25/lc/mac/MAC_RELEASE.h
index 5a06ac31..f1e6341e 100644
--- a/src/common/p25/lc/mac/MAC_RELEASE.h
+++ b/src/common/p25/lc/mac/MAC_RELEASE.h
@@ -31,7 +31,7 @@ namespace p25
             /** 
              * @brief Phase 2 MAC release PDU. 
              */
-            class HOST_SW_API MAC_RELEASE : public MACPDU {
+            class DVM_COMMON_API MAC_RELEASE : public MACPDU {
             public:
                 /**
                  * @brief Initializes a new instance of the MAC_RELEASE class.
diff --git a/src/common/p25/lc/mac/MAC_TEL_INT_VCH_USER.h b/src/common/p25/lc/mac/MAC_TEL_INT_VCH_USER.h
index 054337ed..ee1c5107 100644
--- a/src/common/p25/lc/mac/MAC_TEL_INT_VCH_USER.h
+++ b/src/common/p25/lc/mac/MAC_TEL_INT_VCH_USER.h
@@ -31,7 +31,7 @@ namespace p25
             /** 
              * @brief Phase 2 telephone interconnect voice channel user MAC PDU. 
              */
-            class HOST_SW_API MAC_TEL_INT_VCH_USER : public MACPDU {
+            class DVM_COMMON_API MAC_TEL_INT_VCH_USER : public MACPDU {
             public:
                 /**
                  * @brief Initializes a new instance of the MAC_TEL_INT_VCH_USER class.
diff --git a/src/common/p25/lc/mac/MAC_UU_VCH_USER.h b/src/common/p25/lc/mac/MAC_UU_VCH_USER.h
index a788c0e0..faf0e44d 100644
--- a/src/common/p25/lc/mac/MAC_UU_VCH_USER.h
+++ b/src/common/p25/lc/mac/MAC_UU_VCH_USER.h
@@ -31,7 +31,7 @@ namespace p25
             /** 
              * @brief Phase 2 unit-to-unit voice channel user MAC PDU. 
              */
-            class HOST_SW_API MAC_UU_VCH_USER : public MACPDU {
+            class DVM_COMMON_API MAC_UU_VCH_USER : public MACPDU {
             public:
                 /**
                  * @brief Initializes a new instance of the MAC_UU_VCH_USER class.
diff --git a/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h
index 3c917977..106aafb8 100644
--- a/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements ADJ STS BCAST - Adjacent Site Status Broadcast
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_ADJ_STS_BCAST : public TDULC {
+            class DVM_COMMON_API LC_ADJ_STS_BCAST : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_ADJ_STS_BCAST class.
diff --git a/src/common/p25/lc/tdulc/LC_CALL_TERM.h b/src/common/p25/lc/tdulc/LC_CALL_TERM.h
index fb0dc5ea..ce70525e 100644
--- a/src/common/p25/lc/tdulc/LC_CALL_TERM.h
+++ b/src/common/p25/lc/tdulc/LC_CALL_TERM.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements CALL TERM - Call Termination or Cancellation
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_CALL_TERM : public TDULC {
+            class DVM_COMMON_API LC_CALL_TERM : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_CALL_TERM class.
diff --git a/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h b/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h
index 858e2e08..822df301 100644
--- a/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h
+++ b/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements CONV FALLBACK - Conventional Fallback
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_CONV_FALLBACK : public TDULC {
+            class DVM_COMMON_API LC_CONV_FALLBACK : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_CONV_FALLBACK class.
diff --git a/src/common/p25/lc/tdulc/LC_EXPLICIT_SOURCE_ID.h b/src/common/p25/lc/tdulc/LC_EXPLICIT_SOURCE_ID.h
index 0f95255a..799394f7 100644
--- a/src/common/p25/lc/tdulc/LC_EXPLICIT_SOURCE_ID.h
+++ b/src/common/p25/lc/tdulc/LC_EXPLICIT_SOURCE_ID.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements EXPLICIT SOURCE ID - Explicit Source ID
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_EXPLICIT_SOURCE_ID : public TDULC {
+            class DVM_COMMON_API LC_EXPLICIT_SOURCE_ID : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_EXPLICIT_SOURCE_ID class.
diff --git a/src/common/p25/lc/tdulc/LC_FAILSOFT.h b/src/common/p25/lc/tdulc/LC_FAILSOFT.h
index 8cb418df..a492e39e 100644
--- a/src/common/p25/lc/tdulc/LC_FAILSOFT.h
+++ b/src/common/p25/lc/tdulc/LC_FAILSOFT.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements FAILSOFT - Failsoft
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_FAILSOFT : public TDULC {
+            class DVM_COMMON_API LC_FAILSOFT : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_FAILSOFT class.
diff --git a/src/common/p25/lc/tdulc/LC_GROUP.h b/src/common/p25/lc/tdulc/LC_GROUP.h
index cb2e4c04..6ebb3bf1 100644
--- a/src/common/p25/lc/tdulc/LC_GROUP.h
+++ b/src/common/p25/lc/tdulc/LC_GROUP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements GRP VCH USER - Group Voice Channel User
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_GROUP : public TDULC {
+            class DVM_COMMON_API LC_GROUP : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_GROUP class.
diff --git a/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h b/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h
index 5f9a2b33..49d7b0e9 100644
--- a/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h
+++ b/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements GRP VCH UPDT - Group Voice Channel Update
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_GROUP_UPDT : public TDULC {
+            class DVM_COMMON_API LC_GROUP_UPDT : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_GROUP_UPDT class.
diff --git a/src/common/p25/lc/tdulc/LC_IDEN_UP.h b/src/common/p25/lc/tdulc/LC_IDEN_UP.h
index fcc3048b..901f5840 100644
--- a/src/common/p25/lc/tdulc/LC_IDEN_UP.h
+++ b/src/common/p25/lc/tdulc/LC_IDEN_UP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements IDEN UP - Channel Identifier Update
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_IDEN_UP : public TDULC {
+            class DVM_COMMON_API LC_IDEN_UP : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_IDEN_UP class.
diff --git a/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h
index ca41156c..45bb1142 100644
--- a/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements NET STS BCAST - Network Status Broadcast
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_NET_STS_BCAST : public TDULC {
+            class DVM_COMMON_API LC_NET_STS_BCAST : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_NET_STS_BCAST class.
diff --git a/src/common/p25/lc/tdulc/LC_PRIVATE.h b/src/common/p25/lc/tdulc/LC_PRIVATE.h
index 8b24a655..9c25b3a0 100644
--- a/src/common/p25/lc/tdulc/LC_PRIVATE.h
+++ b/src/common/p25/lc/tdulc/LC_PRIVATE.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements UU VCH USER - Unit-to-Unit Voice Channel User
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_PRIVATE : public TDULC {
+            class DVM_COMMON_API LC_PRIVATE : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_PRIVATE class.
diff --git a/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h
index ba8567aa..9940a909 100644
--- a/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements RFSS STS BCAST - RFSS Status Broadcast
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_RFSS_STS_BCAST : public TDULC {
+            class DVM_COMMON_API LC_RFSS_STS_BCAST : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_RFSS_STS_BCAST class.
diff --git a/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h b/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h
index e8f81678..452a62b5 100644
--- a/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SYS SRV BCAST - System Service Broadcast
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_SYS_SRV_BCAST : public TDULC {
+            class DVM_COMMON_API LC_SYS_SRV_BCAST : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_SYS_SRV_BCAST class.
diff --git a/src/common/p25/lc/tdulc/LC_TDULC_RAW.h b/src/common/p25/lc/tdulc/LC_TDULC_RAW.h
index e7cf5ce2..41562a57 100644
--- a/src/common/p25/lc/tdulc/LC_TDULC_RAW.h
+++ b/src/common/p25/lc/tdulc/LC_TDULC_RAW.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements a mechanism to generate raw TDULC data from bytes.
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_TDULC_RAW : public TDULC {
+            class DVM_COMMON_API LC_TDULC_RAW : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_TDULC_RAW class.
diff --git a/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h b/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h
index e8c66a56..3254b9ff 100644
--- a/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h
+++ b/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements TEL INT VCH USER - Telephone Interconnect Voice Channel User
              * @ingroup p25_lc
              */
-            class HOST_SW_API LC_TEL_INT_VCH_USER : public TDULC {
+            class DVM_COMMON_API LC_TEL_INT_VCH_USER : public TDULC {
             public:
                 /**
                  * @brief Initializes a new instance of the LC_TEL_INT_VCH_USER class.
diff --git a/src/common/p25/lc/tdulc/TDULCFactory.h b/src/common/p25/lc/tdulc/TDULCFactory.h
index 60c33298..2361eed2 100644
--- a/src/common/p25/lc/tdulc/TDULCFactory.h
+++ b/src/common/p25/lc/tdulc/TDULCFactory.h
@@ -50,7 +50,7 @@ namespace p25
              * @brief Helper class to instantiate an instance of a TDULC.
              * @ingroup p25_lc
              */
-            class HOST_SW_API TDULCFactory {
+            class DVM_COMMON_API TDULCFactory {
             public:
                 /**
                  * @brief Initializes a new instance of the TDULCFactory class.
diff --git a/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h b/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h
index c388cabf..9777fd0c 100644
--- a/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h
+++ b/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h
@@ -34,7 +34,7 @@ namespace p25
              *  ACK RSP FNE - Acknowledge Response - FNE (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_ACK_RSP : public TSBK {
+            class DVM_COMMON_API IOSP_ACK_RSP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_ACK_RSP class.
diff --git a/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h b/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h
index 6b5c2d4e..f2baccee 100644
--- a/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h
+++ b/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h
@@ -34,7 +34,7 @@ namespace p25
              *  CALL ALRT - Call Alert (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_CALL_ALRT : public TSBK {
+            class DVM_COMMON_API IOSP_CALL_ALRT : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_CALL_ALRT class.
diff --git a/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h b/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h
index a5bea84d..dc12a1b1 100644
--- a/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h
+++ b/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h
@@ -34,7 +34,7 @@ namespace p25
              *  EXT FNCT CMD - Extended Function Command (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_EXT_FNCT : public TSBK {
+            class DVM_COMMON_API IOSP_EXT_FNCT : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_EXT_FNCT class.
diff --git a/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h b/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h
index d362375a..995c6109 100644
--- a/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h
+++ b/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h
@@ -34,7 +34,7 @@ namespace p25
              *  GRP AFF RSP - Group Affiliation Response (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_GRP_AFF : public TSBK {
+            class DVM_COMMON_API IOSP_GRP_AFF : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_GRP_AFF class.
diff --git a/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h b/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h
index d38dd6e7..a39e54b4 100644
--- a/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h
+++ b/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h
@@ -34,7 +34,7 @@ namespace p25
              *  GRP VCH GRANT - Group Voice Channel Grant (OSP).
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_GRP_VCH : public TSBK {
+            class DVM_COMMON_API IOSP_GRP_VCH : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_GRP_VCH class.
diff --git a/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h b/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h
index a19204f7..1abe06bb 100644
--- a/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h
+++ b/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h
@@ -34,7 +34,7 @@ namespace p25
              *  MSG UPDT - Message Update (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_MSG_UPDT : public TSBK {
+            class DVM_COMMON_API IOSP_MSG_UPDT : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_MSG_UPDT class.
diff --git a/src/common/p25/lc/tsbk/IOSP_RAD_MON.h b/src/common/p25/lc/tsbk/IOSP_RAD_MON.h
index 546b7d80..1886648e 100644
--- a/src/common/p25/lc/tsbk/IOSP_RAD_MON.h
+++ b/src/common/p25/lc/tsbk/IOSP_RAD_MON.h
@@ -35,7 +35,7 @@ namespace p25
              *  RAD MON CMD - Radio Monitor Command (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_RAD_MON : public TSBK {
+            class DVM_COMMON_API IOSP_RAD_MON : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_RAD_MON class.
diff --git a/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h b/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h
index aeeb7e0c..21b01001 100644
--- a/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h
+++ b/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h
@@ -34,7 +34,7 @@ namespace p25
              *  STS UPDT - Status Update (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_STS_UPDT : public TSBK {
+            class DVM_COMMON_API IOSP_STS_UPDT : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_STS_UPDT class.
diff --git a/src/common/p25/lc/tsbk/IOSP_UU_ANS.h b/src/common/p25/lc/tsbk/IOSP_UU_ANS.h
index aa1b2a50..cf796916 100644
--- a/src/common/p25/lc/tsbk/IOSP_UU_ANS.h
+++ b/src/common/p25/lc/tsbk/IOSP_UU_ANS.h
@@ -34,7 +34,7 @@ namespace p25
              *  UU ANS REQ - Unit-to-Unit Answer Request (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_UU_ANS : public TSBK {
+            class DVM_COMMON_API IOSP_UU_ANS : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_UU_ANS class.
diff --git a/src/common/p25/lc/tsbk/IOSP_UU_VCH.h b/src/common/p25/lc/tsbk/IOSP_UU_VCH.h
index f3fe22d7..9a598e39 100644
--- a/src/common/p25/lc/tsbk/IOSP_UU_VCH.h
+++ b/src/common/p25/lc/tsbk/IOSP_UU_VCH.h
@@ -34,7 +34,7 @@ namespace p25
              *  UU VCH GRANT - Unit-to-Unit Voice Channel Grant (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_UU_VCH : public TSBK {
+            class DVM_COMMON_API IOSP_UU_VCH : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_UU_VCH class.
diff --git a/src/common/p25/lc/tsbk/IOSP_U_REG.h b/src/common/p25/lc/tsbk/IOSP_U_REG.h
index 0929e14d..0825884a 100644
--- a/src/common/p25/lc/tsbk/IOSP_U_REG.h
+++ b/src/common/p25/lc/tsbk/IOSP_U_REG.h
@@ -34,7 +34,7 @@ namespace p25
              *  U REG RSP - Unit Registration Response (OSP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API IOSP_U_REG : public TSBK {
+            class DVM_COMMON_API IOSP_U_REG : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the IOSP_U_REG class.
diff --git a/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h b/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h
index 847991a3..62c5996b 100644
--- a/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h
+++ b/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements AUTH FNE RST - Authentication FNE Result
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_AUTH_FNE_RST : public TSBK {
+            class DVM_COMMON_API ISP_AUTH_FNE_RST : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_AUTH_FNE_RST class.
diff --git a/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h b/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h
index 10f0e746..c703e42a 100644
--- a/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h
+++ b/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements AUTH RESP - Authentication Response
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_AUTH_RESP : public TSBK {
+            class DVM_COMMON_API ISP_AUTH_RESP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_AUTH_RESP class.
diff --git a/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h b/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h
index 9fac5a56..1a064da2 100644
--- a/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h
+++ b/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements AUTH SU DMD - Authentication SU Demand
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_AUTH_SU_DMD : public TSBK {
+            class DVM_COMMON_API ISP_AUTH_SU_DMD : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_AUTH_SU_DMD class.
diff --git a/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h b/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h
index 11aa441e..d378e0c0 100644
--- a/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements CAN SRV REQ - Cancel Service Request
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_CAN_SRV_REQ : public TSBK {
+            class DVM_COMMON_API ISP_CAN_SRV_REQ : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_CAN_SRV_REQ class.
diff --git a/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h b/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h
index 61a0b460..3b115c70 100644
--- a/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements EMERG ALRM REQ - Emergency Alarm Request
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_EMERG_ALRM_REQ : public TSBK {
+            class DVM_COMMON_API ISP_EMERG_ALRM_REQ : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_EMERG_ALRM_REQ class.
diff --git a/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h b/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h
index 0c883908..09592d40 100644
--- a/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h
+++ b/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements GRP AFF Q RSP - Group Affiliation Query Response
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_GRP_AFF_Q_RSP : public TSBK {
+            class DVM_COMMON_API ISP_GRP_AFF_Q_RSP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_GRP_AFF_Q_RSP class.
diff --git a/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h b/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h
index de147ecf..329c67a0 100644
--- a/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements LOC REG REQ - Location Registration Request
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_LOC_REG_REQ : public TSBK {
+            class DVM_COMMON_API ISP_LOC_REG_REQ : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_LOC_REG_REQ class.
diff --git a/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h b/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h
index 0ff5b45a..30db1ba0 100644
--- a/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SNDCP CH REQ - SNDCP Data Channel Request (ISP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_SNDCP_CH_REQ : public TSBK {
+            class DVM_COMMON_API ISP_SNDCP_CH_REQ : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_SNDCP_CH_REQ class.
diff --git a/src/common/p25/lc/tsbk/ISP_SNDCP_REC_REQ.h b/src/common/p25/lc/tsbk/ISP_SNDCP_REC_REQ.h
index b90824af..187f66d4 100644
--- a/src/common/p25/lc/tsbk/ISP_SNDCP_REC_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_SNDCP_REC_REQ.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SNDCP REC REQ - SNDCP Reconnect Request (ISP)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_SNDCP_REC_REQ : public TSBK {
+            class DVM_COMMON_API ISP_SNDCP_REC_REQ : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_SNDCP_REC_REQ class.
diff --git a/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h b/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h
index 2cf47d9c..f90e01c1 100644
--- a/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements U DE REG REQ - Unit De-Registration Request
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API ISP_U_DEREG_REQ : public TSBK {
+            class DVM_COMMON_API ISP_U_DEREG_REQ : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the ISP_U_DEREG_REQ class.
diff --git a/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h
index 9dedb604..f4c227d8 100644
--- a/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements ADJ STS BCAST - Adjacent Site Status Broadcast
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_ADJ_STS_BCAST : public TSBK {
+            class DVM_COMMON_API OSP_ADJ_STS_BCAST : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_ADJ_STS_BCAST class.
diff --git a/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h b/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h
index 880104f5..26218032 100644
--- a/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h
+++ b/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements AUTH FNE RESP - Authentication FNE Response
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_AUTH_FNE_RESP : public TSBK {
+            class DVM_COMMON_API OSP_AUTH_FNE_RESP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_AUTH_FNE_RESP class.
diff --git a/src/common/p25/lc/tsbk/OSP_DENY_RSP.h b/src/common/p25/lc/tsbk/OSP_DENY_RSP.h
index 6d140783..f6b4c87c 100644
--- a/src/common/p25/lc/tsbk/OSP_DENY_RSP.h
+++ b/src/common/p25/lc/tsbk/OSP_DENY_RSP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements DENY RSP - Queued Response
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_DENY_RSP : public TSBK {
+            class DVM_COMMON_API OSP_DENY_RSP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_DENY_RSP class.
diff --git a/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h b/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h
index 7ed2da8e..7b086b7b 100644
--- a/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h
+++ b/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements CALL TERM - Call Termination or Cancellation
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_DVM_LC_CALL_TERM : public TSBK {
+            class DVM_COMMON_API OSP_DVM_LC_CALL_TERM : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_DVM_LC_CALL_TERM class.
diff --git a/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h b/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h
index e99f8557..7004ebd0 100644
--- a/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h
+++ b/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements GRP AFF Q - Group Affiliation Query
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_GRP_AFF_Q : public TSBK {
+            class DVM_COMMON_API OSP_GRP_AFF_Q : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_GRP_AFF_Q class.
diff --git a/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h b/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h
index ec71aae7..d6444822 100644
--- a/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h
+++ b/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements GRP VCH GRANT UPD - Group Voice Channel Grant Update
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_GRP_VCH_GRANT_UPD : public TSBK {
+            class DVM_COMMON_API OSP_GRP_VCH_GRANT_UPD : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_GRP_VCH_GRANT_UPD class.
diff --git a/src/common/p25/lc/tsbk/OSP_IDEN_UP.h b/src/common/p25/lc/tsbk/OSP_IDEN_UP.h
index 0d321abb..620d4fc2 100644
--- a/src/common/p25/lc/tsbk/OSP_IDEN_UP.h
+++ b/src/common/p25/lc/tsbk/OSP_IDEN_UP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements IDEN UP - Channel Identifier Update
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_IDEN_UP : public TSBK {
+            class DVM_COMMON_API OSP_IDEN_UP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_IDEN_UP class.
diff --git a/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h b/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h
index 1469104b..2bb40738 100644
--- a/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h
+++ b/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements IDEN UP VU - Channel Identifier Update for VHF/UHF Bands
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_IDEN_UP_VU : public TSBK {
+            class DVM_COMMON_API OSP_IDEN_UP_VU : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_IDEN_UP_VU class.
diff --git a/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h b/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h
index e828ba4d..7b30477a 100644
--- a/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h
+++ b/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements LOC REG RSP - Location Registration Response
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_LOC_REG_RSP : public TSBK {
+            class DVM_COMMON_API OSP_LOC_REG_RSP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_LOC_REG_RSP class.
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h b/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h
index 4ef1e51e..e3983942 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements MOT CC BSI - Motorola / Control Channel Base Station Identifier
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_MOT_CC_BSI : public TSBK {
+            class DVM_COMMON_API OSP_MOT_CC_BSI : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_MOT_CC_BSI class.
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h
index 322c7566..f9dea039 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements MOT GRG ADD - Motorola / Group Regroup Add (Patch Supergroup)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_MOT_GRG_ADD : public TSBK {
+            class DVM_COMMON_API OSP_MOT_GRG_ADD : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_MOT_GRG_ADD class.
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h
index 8a5aa143..e15734c8 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements MOT GRG DEL - Motorola / Group Regroup Delete (Unpatch Supergroup)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_MOT_GRG_DEL : public TSBK {
+            class DVM_COMMON_API OSP_MOT_GRG_DEL : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_MOT_GRG_DEL class.
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h
index 7f10baef..e740aacd 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements MOT GRG GROUP VCH GRANT / Group Regroup Voice Channel Grant
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_MOT_GRG_VCH_GRANT : public TSBK {
+            class DVM_COMMON_API OSP_MOT_GRG_VCH_GRANT : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_MOT_GRG_VCH_GRANT class.
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h
index ff6947f6..ff5ef1a3 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements MOT GRG DEL - Motorola / Group Regroup Delete (Unpatch Supergroup)
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_MOT_GRG_VCH_UPD : public TSBK {
+            class DVM_COMMON_API OSP_MOT_GRG_VCH_UPD : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_MOT_GRG_VCH_UPD class.
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h b/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h
index 449a1fd2..e41bf4ab 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements MOT PSH CCH - Motorola / Planned Control Channel Shutdown
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_MOT_PSH_CCH : public TSBK {
+            class DVM_COMMON_API OSP_MOT_PSH_CCH : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_MOT_PSH_CCH class.
diff --git a/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h
index fd4818b1..585b537a 100644
--- a/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements NET STS BCAST - Network Status Broadcast
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_NET_STS_BCAST : public TSBK {
+            class DVM_COMMON_API OSP_NET_STS_BCAST : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_NET_STS_BCAST class.
diff --git a/src/common/p25/lc/tsbk/OSP_QUE_RSP.h b/src/common/p25/lc/tsbk/OSP_QUE_RSP.h
index 941ec0a7..0a2cc5db 100644
--- a/src/common/p25/lc/tsbk/OSP_QUE_RSP.h
+++ b/src/common/p25/lc/tsbk/OSP_QUE_RSP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements QUE RSP - Queued Response
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_QUE_RSP : public TSBK {
+            class DVM_COMMON_API OSP_QUE_RSP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_QUE_RSP class.
diff --git a/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h
index ef85de03..5fc4e0e1 100644
--- a/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements RFSS STS BCAST - RFSS Status Broadcast
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_RFSS_STS_BCAST : public TSBK {
+            class DVM_COMMON_API OSP_RFSS_STS_BCAST : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_RFSS_STS_BCAST class.
diff --git a/src/common/p25/lc/tsbk/OSP_SCCB.h b/src/common/p25/lc/tsbk/OSP_SCCB.h
index 771f6dee..600b5e37 100644
--- a/src/common/p25/lc/tsbk/OSP_SCCB.h
+++ b/src/common/p25/lc/tsbk/OSP_SCCB.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SCCB - Secondary Control Channel Broadcast
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_SCCB : public TSBK {
+            class DVM_COMMON_API OSP_SCCB : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_SCCB class.
diff --git a/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h b/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h
index 53fe2003..dd9efb30 100644
--- a/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h
+++ b/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SCCB - Secondary Control Channel Broadcast - Explicit
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_SCCB_EXP : public TSBK {
+            class DVM_COMMON_API OSP_SCCB_EXP : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_SCCB_EXP class.
diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h
index bc3a17c4..0c74c141 100644
--- a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h
+++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SNDCP CH ANN - SNDCP Data Channel Announcement.
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_SNDCP_CH_ANN : public TSBK {
+            class DVM_COMMON_API OSP_SNDCP_CH_ANN : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_SNDCP_CH_ANN class.
diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h
index 2729b53f..689071ed 100644
--- a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h
+++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SNDCP CH GNT - SNDCP Data Channel Grant
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_SNDCP_CH_GNT : public TSBK {
+            class DVM_COMMON_API OSP_SNDCP_CH_GNT : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_SNDCP_CH_GNT class.
diff --git a/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h b/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h
index 3afc6674..c56b6e55 100644
--- a/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SYNC BCAST - Synchronization Broadcast
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_SYNC_BCAST : public TSBK {
+            class DVM_COMMON_API OSP_SYNC_BCAST : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_SYNC_BCAST class.
diff --git a/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h b/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h
index dc7e1300..10f5a3f9 100644
--- a/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements SYS SRV BCAST - System Service Broadcast
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_SYS_SRV_BCAST : public TSBK {
+            class DVM_COMMON_API OSP_SYS_SRV_BCAST : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_SYS_SRV_BCAST class.
diff --git a/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h b/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h
index b29c9a0e..3bbc8888 100644
--- a/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h
+++ b/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements TIME DATE ANN - Time and Date Announcement
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_TIME_DATE_ANN : public TSBK {
+            class DVM_COMMON_API OSP_TIME_DATE_ANN : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_TIME_DATE_ANN class.
diff --git a/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h b/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h
index c6fb8f1b..8db158fe 100644
--- a/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h
+++ b/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements a mechanism to generate raw TSBK data from bytes.
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_TSBK_RAW : public TSBK {
+            class DVM_COMMON_API OSP_TSBK_RAW : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_TSBK_RAW class.
diff --git a/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h b/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h
index 8ea58672..4989dcef 100644
--- a/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h
+++ b/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements UU VCH GRANT UPD - Unit-to-Unit Voice Channel Grant Update.
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_UU_VCH_GRANT_UPD : public TSBK {
+            class DVM_COMMON_API OSP_UU_VCH_GRANT_UPD : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_UU_VCH_GRANT_UPD class.
diff --git a/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h b/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h
index 3bdb6b87..6fe6bce6 100644
--- a/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h
+++ b/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements U DE REG ACK - Unit De-Registration Acknowledge
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_U_DEREG_ACK : public TSBK {
+            class DVM_COMMON_API OSP_U_DEREG_ACK : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_U_DEREG_ACK class.
diff --git a/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h b/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h
index d474e7fc..a02561c0 100644
--- a/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h
+++ b/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements U DE REG ACK - Unit De-Registration Acknowledge
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API OSP_U_REG_CMD : public TSBK {
+            class DVM_COMMON_API OSP_U_REG_CMD : public TSBK {
             public:
                 /**
                  * @brief Initializes a new instance of the OSP_U_REG_CMD class.
diff --git a/src/common/p25/lc/tsbk/TSBKFactory.h b/src/common/p25/lc/tsbk/TSBKFactory.h
index a9e88585..5614a357 100644
--- a/src/common/p25/lc/tsbk/TSBKFactory.h
+++ b/src/common/p25/lc/tsbk/TSBKFactory.h
@@ -114,7 +114,7 @@ namespace p25
              * @brief Helper class to instantiate an instance of a TSBK.
              * @ingroup p25_tsbk
              */
-            class HOST_SW_API TSBKFactory {
+            class DVM_COMMON_API TSBKFactory {
             public:
                 /**
                  * @brief Initializes a new instance of the TSBKFactory class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h
index 6684040e..37ea5861 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h
@@ -35,7 +35,7 @@ namespace p25
              *  ACK RSP FNE - Acknowledge Response - FNE (OSP) 
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_IOSP_ACK_RSP : public AMBT {
+            class DVM_COMMON_API MBT_IOSP_ACK_RSP : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_IOSP_ACK_RSP class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h
index 06161d53..8300f510 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h
@@ -35,7 +35,7 @@ namespace p25
              *  CALL ALRT - Call Alert (OSP)
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_IOSP_CALL_ALRT : public AMBT {
+            class DVM_COMMON_API MBT_IOSP_CALL_ALRT : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_IOSP_CALL_ALRT class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h
index 6570bfeb..fff47df6 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h
@@ -35,7 +35,7 @@ namespace p25
              *  EXT FNCT CMD - Extended Function Command (OSP)
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_IOSP_EXT_FNCT : public AMBT {
+            class DVM_COMMON_API MBT_IOSP_EXT_FNCT : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_IOSP_EXT_FNCT class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h
index 7fa661c7..d2d75bc2 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h
@@ -34,7 +34,7 @@ namespace p25
              *  GRP AFF RSP - Group Affiliation Response (OSP)
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_IOSP_GRP_AFF : public AMBT {
+            class DVM_COMMON_API MBT_IOSP_GRP_AFF : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_IOSP_GRP_AFF class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h
index 3e289bfe..3a635329 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h
@@ -35,7 +35,7 @@ namespace p25
              *  MSG UPDT - Message Update (OSP)
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_IOSP_MSG_UPDT : public AMBT {
+            class DVM_COMMON_API MBT_IOSP_MSG_UPDT : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_IOSP_MSG_UPDT class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h
index e240a1d7..6efc492f 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h
@@ -34,7 +34,7 @@ namespace p25
              *  STS UPDT - Status Update (OSP)
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_IOSP_STS_UPDT : public AMBT {
+            class DVM_COMMON_API MBT_IOSP_STS_UPDT : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_IOSP_STS_UPDT class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h
index f57dd402..1d09b662 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements AUTH RESP M - Authentication Response Mutual
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_ISP_AUTH_RESP_M : public AMBT {
+            class DVM_COMMON_API MBT_ISP_AUTH_RESP_M : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_ISP_AUTH_RESP_M class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h
index c174dd46..134fbadd 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements AUTH SU DMD - Authentication SU Demand
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_ISP_AUTH_SU_DMD : public AMBT {
+            class DVM_COMMON_API MBT_ISP_AUTH_SU_DMD : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_ISP_AUTH_SU_DMD class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h b/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h
index e87b5776..60fe6fbf 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements CAN SRV REQ - Cancel Service Request
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_ISP_CAN_SRV_REQ : public AMBT {
+            class DVM_COMMON_API MBT_ISP_CAN_SRV_REQ : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_ISP_CAN_SRV_REQ class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_ISP_GRP_AFF_Q_RSP.h b/src/common/p25/lc/tsbk/mbt/MBT_ISP_GRP_AFF_Q_RSP.h
index 17a3e710..2cc99bc8 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_ISP_GRP_AFF_Q_RSP.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_ISP_GRP_AFF_Q_RSP.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements GRP AFF Q RSP - Group Affiliation Query Response
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_ISP_GRP_AFF_Q_RSP : public AMBT {
+            class DVM_COMMON_API MBT_ISP_GRP_AFF_Q_RSP : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_ISP_GRP_AFF_Q_RSP class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h
index bba893dc..664baf15 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements ADJ STS BCAST - Adjacent Site Status Broadcast
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_OSP_ADJ_STS_BCAST : public AMBT {
+            class DVM_COMMON_API MBT_OSP_ADJ_STS_BCAST : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_OSP_ADJ_STS_BCAST class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h
index 11272224..e476e062 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements AUTH DMD - Authentication Demand
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_OSP_AUTH_DMD : public AMBT {
+            class DVM_COMMON_API MBT_OSP_AUTH_DMD : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_OSP_AUTH_DMD class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_GRP_VCH_GRANT.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_GRP_VCH_GRANT.h
index 37dba29c..51bb82bc 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_GRP_VCH_GRANT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_GRP_VCH_GRANT.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements GRP VCH GRANT - Group Voice Channel Grant (OSP).
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_OSP_GRP_VCH_GRANT : public AMBT {
+            class DVM_COMMON_API MBT_OSP_GRP_VCH_GRANT : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_OSP_GRP_VCH_GRANT class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h
index 1003f1f3..fa614a24 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements NET STS BCAST - Network Status Broadcast
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_OSP_NET_STS_BCAST : public AMBT {
+            class DVM_COMMON_API MBT_OSP_NET_STS_BCAST : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_OSP_NET_STS_BCAST class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h
index 6dcc1126..2b81059e 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements RFSS STS BCAST - RFSS Status Broadcast
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_OSP_RFSS_STS_BCAST : public AMBT {
+            class DVM_COMMON_API MBT_OSP_RFSS_STS_BCAST : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_OSP_RFSS_STS_BCAST class.
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_UU_VCH_GRANT.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_UU_VCH_GRANT.h
index 63e38f08..6638b6ad 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_UU_VCH_GRANT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_UU_VCH_GRANT.h
@@ -33,7 +33,7 @@ namespace p25
              * @brief Implements UU VCH GRANT - Unit-to-Unit Voice Channel Grant (OSP).
              * @ingroup p25_ambt
              */
-            class HOST_SW_API MBT_OSP_UU_VCH_GRANT : public AMBT {
+            class DVM_COMMON_API MBT_OSP_UU_VCH_GRANT : public AMBT {
             public:
                 /**
                  * @brief Initializes a new instance of the MBT_OSP_UU_VCH_GRANT class.
diff --git a/src/common/p25/sndcp/SNDCPCtxActAccept.h b/src/common/p25/sndcp/SNDCPCtxActAccept.h
index bf3b03ad..997e8508 100644
--- a/src/common/p25/sndcp/SNDCPCtxActAccept.h
+++ b/src/common/p25/sndcp/SNDCPCtxActAccept.h
@@ -34,7 +34,7 @@ namespace p25
          * @brief Represents a SNDCP PDU context accept response.
          * @ingroup p25_sndcp
          */
-        class HOST_SW_API SNDCPCtxActAccept : public SNDCPPacket {
+        class DVM_COMMON_API SNDCPCtxActAccept : public SNDCPPacket {
         public:
             /**
              * @brief Initializes a new instance of the SNDCPCtxActAccept class.
diff --git a/src/common/p25/sndcp/SNDCPCtxActReject.h b/src/common/p25/sndcp/SNDCPCtxActReject.h
index cc4f7294..00a150cb 100644
--- a/src/common/p25/sndcp/SNDCPCtxActReject.h
+++ b/src/common/p25/sndcp/SNDCPCtxActReject.h
@@ -34,7 +34,7 @@ namespace p25
          * @brief Represents a SNDCP PDU context activation reject response.
          * @ingroup p25_sndcp
          */
-        class HOST_SW_API SNDCPCtxActReject : public SNDCPPacket {
+        class DVM_COMMON_API SNDCPCtxActReject : public SNDCPPacket {
         public:
             /**
              * @brief Initializes a new instance of the SNDCPCtxActReject class.
diff --git a/src/common/p25/sndcp/SNDCPCtxActRequest.h b/src/common/p25/sndcp/SNDCPCtxActRequest.h
index 39c99fb9..50bfd744 100644
--- a/src/common/p25/sndcp/SNDCPCtxActRequest.h
+++ b/src/common/p25/sndcp/SNDCPCtxActRequest.h
@@ -34,7 +34,7 @@ namespace p25
          * @brief Represents a SNDCP PDU context activation request.
          * @ingroup p25_sndcp
          */
-        class HOST_SW_API SNDCPCtxActRequest : public SNDCPPacket {
+        class DVM_COMMON_API SNDCPCtxActRequest : public SNDCPPacket {
         public:
             /**
              * @brief Initializes a new instance of the SNDCPCtxActRequest class.
diff --git a/src/common/p25/sndcp/SNDCPCtxDeactivation.h b/src/common/p25/sndcp/SNDCPCtxDeactivation.h
index f2aed3fc..d4552ff1 100644
--- a/src/common/p25/sndcp/SNDCPCtxDeactivation.h
+++ b/src/common/p25/sndcp/SNDCPCtxDeactivation.h
@@ -34,7 +34,7 @@ namespace p25
          * @brief Represents a SNDCP PDU context deactivation.
          * @ingroup p25_sndcp
          */
-        class HOST_SW_API SNDCPCtxDeactivation : public SNDCPPacket {
+        class DVM_COMMON_API SNDCPCtxDeactivation : public SNDCPPacket {
         public:
             /**
              * @brief Initializes a new instance of the SNDCPCtxDeactivation class.
diff --git a/src/common/p25/sndcp/SNDCPFactory.h b/src/common/p25/sndcp/SNDCPFactory.h
index 482f09c7..4a80d820 100644
--- a/src/common/p25/sndcp/SNDCPFactory.h
+++ b/src/common/p25/sndcp/SNDCPFactory.h
@@ -36,7 +36,7 @@ namespace p25
          * @brief Helper class to instantiate an instance of a SNDCP packet.
          * @ingroup p25_sndcp
          */
-        class HOST_SW_API SNDCPFactory {
+        class DVM_COMMON_API SNDCPFactory {
         public:
             /**
              * @brief Initializes a new instance of the SNDCPFactory class.
diff --git a/src/common/p25/sndcp/SNDCPPacket.h b/src/common/p25/sndcp/SNDCPPacket.h
index beac1570..f40e529c 100644
--- a/src/common/p25/sndcp/SNDCPPacket.h
+++ b/src/common/p25/sndcp/SNDCPPacket.h
@@ -37,7 +37,7 @@ namespace p25
          * @brief Represents a SNDCP PDU packet header.
          * @ingroup p25_sndcp
          */
-        class HOST_SW_API SNDCPPacket {
+        class DVM_COMMON_API SNDCPPacket {
         public:
             /**
              * @brief Initializes a copy instance of the SNDCPPacket class.
diff --git a/src/common/restapi/http/HTTPLexer.h b/src/common/restapi/http/HTTPLexer.h
index 8f62d63c..04c80cf2 100644
--- a/src/common/restapi/http/HTTPLexer.h
+++ b/src/common/restapi/http/HTTPLexer.h
@@ -39,7 +39,7 @@ namespace restapi
         /**
          * @brief This class implements the lexer for incoming payloads.
          */
-        class HTTPLexer {
+        class DVM_COMMON_API HTTPLexer {
         public:
             /**
              * @brief Lexing result.
diff --git a/src/common/restapi/http/HTTPRequestHandler.h b/src/common/restapi/http/HTTPRequestHandler.h
index 6bbc73a9..8ad91934 100644
--- a/src/common/restapi/http/HTTPRequestHandler.h
+++ b/src/common/restapi/http/HTTPRequestHandler.h
@@ -39,7 +39,7 @@ namespace restapi
          * @brief This class implements the common handler for all incoming requests.
          * @ingroup http
          */
-        class HTTPRequestHandler {
+        class DVM_COMMON_API HTTPRequestHandler {
         public:
             auto operator=(HTTPRequestHandler&) -> HTTPRequestHandler& = delete;
             HTTPRequestHandler(HTTPRequestHandler&) = delete;
diff --git a/src/common/yaml/Yaml.h b/src/common/yaml/Yaml.h
index 4a986736..cc5cad7e 100644
--- a/src/common/yaml/Yaml.h
+++ b/src/common/yaml/Yaml.h
@@ -42,7 +42,7 @@ namespace yaml
     //  Class Prototypes
     // ---------------------------------------------------------------------------
 
-    class HOST_SW_API Node;
+    class Node;
 
     // ---------------------------------------------------------------------------
     //  Helper classes and functions
@@ -178,7 +178,7 @@ namespace yaml
      * @brief Exception General YAML Exception.
      * @ingroup yaml
      */
-    class HOST_SW_API Exception : public std::runtime_error {
+    class DVM_COMMON_API Exception : public std::runtime_error {
     public:
         /**
          * @brief Enumeration of exception types.
@@ -221,7 +221,7 @@ namespace yaml
      * @brief InternalException YAML Internal Exception.
      * @ingroup yaml
      */
-    class HOST_SW_API InternalException : public Exception {
+    class DVM_COMMON_API InternalException : public Exception {
     public:
         /**
          * @brief Initializes a new instance of the InternalException class.
@@ -238,7 +238,7 @@ namespace yaml
      * @brief ParsingException YAML Parsing Exception.
      * @ingroup yaml
      */
-    class HOST_SW_API ParsingException : public Exception {
+    class DVM_COMMON_API ParsingException : public Exception {
     public:
         /**
          * @brief Initializes a new instance of the ParsingException class.
@@ -256,7 +256,7 @@ namespace yaml
      * @brief OperationException YAML Operation Exception.
      * @ingroup yaml
      */
-    class HOST_SW_API OperationException : public Exception {
+    class DVM_COMMON_API OperationException : public Exception {
     public:
         /**
          * @brief Initializes a new instance of the OperationException class.
@@ -273,7 +273,7 @@ namespace yaml
      * @brief Iterator Helper class used to iterate through YAML files.
      * @ingroup yaml
      */
-    class HOST_SW_API Iterator {
+    class DVM_COMMON_API Iterator {
     public:
         friend class Node;
 
@@ -344,7 +344,7 @@ namespace yaml
      * @brief ConstIterator Helper class used to iterate through YAML files.
      * @ingroup yaml
      */
-    class HOST_SW_API ConstIterator {
+    class DVM_COMMON_API ConstIterator {
     public:
         friend class Node;
 
@@ -414,7 +414,7 @@ namespace yaml
      * @brief Node Represents a node/element within a YAML file.
      * @ingroup yaml
      */
-    class HOST_SW_API Node {
+    class DVM_COMMON_API Node {
     public:
         friend class Iterator;
 
@@ -602,28 +602,28 @@ namespace yaml
      * @param root Root node to populate.
      * @param filename Path of input file.
      */
-    bool Parse(Node& root, const char* filename);
+    DVM_COMMON_API bool Parse(Node& root, const char* filename);
     /**
      * @brief Populate given root node with deserialized data.
      * @ingroup yaml
      * @param root Root node to populate.
      * @param stream Input stream.
      */
-    bool Parse(Node& root, std::iostream& stream);
+    DVM_COMMON_API bool Parse(Node& root, std::iostream& stream);
     /**
      * @brief Populate given root node with deserialized data.
      * @ingroup yaml
      * @param root Root node to populate.
      * @param string String of input data.
      */
-    bool Parse(Node& root, const std::string& string);
+    DVM_COMMON_API bool Parse(Node& root, const std::string& string);
     /**
      * @brief Populate given root node with deserialized data.
      * @ingroup yaml
      * @param buffer Character array of input data.
      * @param size Buffer size.
      */
-    bool Parse(Node& root, const char* buffer, const size_t size);
+    DVM_COMMON_API bool Parse(Node& root, const char* buffer, const size_t size);
 
     // ---------------------------------------------------------------------------
     //  Structure Declaration
@@ -657,7 +657,7 @@ namespace yaml
      * @param filename Path of output file.
      * @param config Serialization configuration.
      */
-    void Serialize(const Node& root, const char* filename, const SerializeConfig& config = {2, 64, false, false});
+    DVM_COMMON_API void Serialize(const Node& root, const char* filename, const SerializeConfig& config = {2, 64, false, false});
     /**
      * @brief Serialize node data.
      * @ingroup yaml
@@ -665,7 +665,7 @@ namespace yaml
      * @param stream Output stream.
      * @param config Serialization configuration.
      */
-    void Serialize(const Node& root, std::iostream& stream, const SerializeConfig& config = {2, 64, false, false});
+    DVM_COMMON_API void Serialize(const Node& root, std::iostream& stream, const SerializeConfig& config = {2, 64, false, false});
     /**
      * @brief Serialize node data.
      * @ingroup yaml
@@ -673,7 +673,7 @@ namespace yaml
      * @param string String of output data.
      * @param config Serialization configuration.
      */
-    void Serialize(const Node& root, std::string& string, const SerializeConfig& config = {2, 64, false, false});
+    DVM_COMMON_API void Serialize(const Node& root, std::string& string, const SerializeConfig& config = {2, 64, false, false});
 } // namespace yaml
 
 #endif // __YAML_H__
diff --git a/src/common/zlib/Compression.h b/src/common/zlib/Compression.h
index 74519b7d..dfd46a4e 100644
--- a/src/common/zlib/Compression.h
+++ b/src/common/zlib/Compression.h
@@ -32,7 +32,7 @@ namespace compress
      * @brief zlib Compression Helper.
      * @ingroup compression
      */
-    class HOST_SW_API Compression {
+    class DVM_COMMON_API Compression {
     public:
         /**
          * @brief Compress the given input buffer using zlib compression.
diff --git a/src/vocoder/MBEDecoder.h b/src/vocoder/MBEDecoder.h
index e55eedef..88c0d88a 100644
--- a/src/vocoder/MBEDecoder.h
+++ b/src/vocoder/MBEDecoder.h
@@ -74,7 +74,7 @@ namespace vocoder
     /**
      * @brief Implements MBE audio decoding.
      */
-    class HOST_SW_API MBEDecoder
+    class VOCODER_API MBEDecoder
     {
     public:
         /**
diff --git a/src/vocoder/MBEEncoder.h b/src/vocoder/MBEEncoder.h
index c1612b0e..55fa02b5 100644
--- a/src/vocoder/MBEEncoder.h
+++ b/src/vocoder/MBEEncoder.h
@@ -44,7 +44,7 @@ namespace vocoder
     /**
      * @brief Implements MBE audio encoding.
      */
-    class HOST_SW_API MBEEncoder {
+    class VOCODER_API MBEEncoder {
     public:
         /**
          * @brief Initializes a new instance of the MBEEncoder class.