diff --git a/wrappers/include/TextTrackPluginWrapper.h b/wrappers/include/TextTrackPluginWrapper.h
index 10af9e330..00fa29841 100644
--- a/wrappers/include/TextTrackPluginWrapper.h
+++ b/wrappers/include/TextTrackPluginWrapper.h
@@ -19,13 +19,7 @@
 #ifndef FIREBOLT_RIALTO_WRAPPERS_TEXT_TRACK_PLUGIN_WRAPPER_H_
 #define FIREBOLT_RIALTO_WRAPPERS_TEXT_TRACK_PLUGIN_WRAPPER_H_
 
-#ifndef MODULE_NAME
-#define MODULE_NAME TextTrackClosedCaptionsStyleClient
-#endif
-
 #include "ITextTrackPluginWrapper.h"
-#include <com/com.h>
-#include <core/core.h>
 #ifdef RIALTO_ENABLE_TEXT_TRACK
 #include <interfaces/ITextTrack.h>
 #endif // RIALTO_ENABLE_TEXT_TRACK
diff --git a/wrappers/source/TextTrackPluginWrapper.cpp b/wrappers/source/TextTrackPluginWrapper.cpp
index 19a994616..f7cc6c9f9 100644
--- a/wrappers/source/TextTrackPluginWrapper.cpp
+++ b/wrappers/source/TextTrackPluginWrapper.cpp
@@ -17,10 +17,17 @@
  * limitations under the License.
  */
 
+#define MODULE_NAME TextTrackClosedCaptionsStyleClient
+
+#include <com/com.h>
+#include <core/core.h>
+
 #include "TextTrackPluginWrapper.h"
 #include "TextTrackPluginWrapperFactory.h"
 #include "TextTrackWrapper.h"
 
+MODULE_NAME_ARCHIVE_DECLARATION
+
 namespace firebolt::rialto::wrappers
 {
 std::shared_ptr<ITextTrackPluginWrapper> TextTrackPluginWrapperFactory::getTextTrackPluginWrapper()