diff --git a/osi/core/Makefile.tmk b/osi/core/Makefile.tmk
index d6389ff..ecb6fcf 100644
--- a/osi/core/Makefile.tmk
+++ b/osi/core/Makefile.tmk
@@ -30,18 +30,16 @@ NV_COMPONENT_STRICT_WARNINGS_qnx_64 := 1
 NV_COMPONENT_NAME              := nvethernetrm
 NV_COMPONENT_OWN_INTERFACE_DIR := .
 NV_COMPONENT_SOURCES           := \
-	eqos_core.c \
-	eqos_mmc.c \
-	osi_core.c \
-	vlan_filter.c \
-	osi_hal.c \
-	ivc_core.c \
-	frp.c \
-	mgbe_core.c \
-	xpcs.c \
-	mgbe_mmc.c \
-	debug.c \
-	core_common.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/eqos_core.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/eqos_mmc.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/osi_core.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/osi_hal.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/ivc_core.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/frp.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/mgbe_core.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/xpcs.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/mgbe_mmc.c \
+	$(NV_SOURCE)/nvethernetrm/osi/core/core_common.c \
 	$(NV_SOURCE)/nvethernetrm/osi/common/osi_common.c \
 	$(NV_SOURCE)/nvethernetrm/osi/common/eqos_common.c \
 	$(NV_SOURCE)/nvethernetrm/osi/common/mgbe_common.c \
@@ -53,6 +51,15 @@ NV_COMPONENT_INCLUDES          := \
 
 include $(NV_SOURCE)/nvethernetrm/include/config.tmk
 
+ifeq ($(OSI_DEBUG),1)
+NV_COMPONENT_SOURCES		+= $(NV_SOURCE)/nvethernetrm/osi/core/debug.c
+endif
+
+ifeq ($(OSI_STRIPPED_LIB),0)
+NV_COMPONENT_SOURCES		+= \
+	$(NV_SOURCE)/nvethernetrm/osi/core/vlan_filter.c
+endif
+
 include $(NV_BUILD_STATIC_LIBRARY)
 endif
 
diff --git a/osi/core/eqos_core.c b/osi/core/eqos_core.c
index 32c076c..2af3580 100644
--- a/osi/core/eqos_core.c
+++ b/osi/core/eqos_core.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,6 @@
 #include "eqos_core.h"
 #include "eqos_mmc.h"
 #include "core_local.h"
-#include "vlan_filter.h"
 #include "core_common.h"
 #include "macsec.h"
 
diff --git a/osi/core/mgbe_core.c b/osi/core/mgbe_core.c
index f7ade6a..a2e1a5b 100644
--- a/osi/core/mgbe_core.c
+++ b/osi/core/mgbe_core.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,7 +28,6 @@
 #include "core_local.h"
 #include "xpcs.h"
 #include "mgbe_mmc.h"
-#include "vlan_filter.h"
 #include "core_common.h"
 #include "macsec.h"
 
diff --git a/osi/core/osi_hal.c b/osi/core/osi_hal.c
index ea6cc12..b3916d4 100644
--- a/osi/core/osi_hal.c
+++ b/osi/core/osi_hal.c
@@ -24,7 +24,6 @@
 #include <ivc_core.h>
 #include "core_local.h"
 #include "../osi/common/common.h"
-#include "vlan_filter.h"
 #include "core_common.h"
 #include "eqos_core.h"
 #include "mgbe_core.h"
@@ -32,7 +31,9 @@
 #ifdef OSI_DEBUG
 #include "debug.h"
 #endif /* OSI_DEBUG */
-
+#ifndef OSI_STRIPPED_LIB
+#include "vlan_filter.h"
+#endif
 /**
  * @brief g_ops - Static core operations array.
  */
diff --git a/osi/core/vlan_filter.c b/osi/core/vlan_filter.c
index 03ea908..9f8fdaf 100644
--- a/osi/core/vlan_filter.c
+++ b/osi/core/vlan_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,10 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef OSI_STRIPPED_LIB
 #include "../osi/common/common.h"
 #include "vlan_filter.h"
 
-#ifndef OSI_STRIPPED_LIB
 /**
  * @brief get_vlan_filter_idx - Get VLAN HW filter index which match vlan_id
  *