diff --git a/userspace/units/posix-bitops/Makefile.interface.tmk b/userspace/units/posix-bitops/Makefile.interface.tmk
index de40c00de..4e3e56824 100644
--- a/userspace/units/posix-bitops/Makefile.interface.tmk
+++ b/userspace/units/posix-bitops/Makefile.interface.tmk
@@ -12,11 +12,9 @@
 #
 ###############################################################################
 
-ifdef NV_INTERFACE_FLAG_SHARED_LIBRARY_SECTION
-NV_INTERFACE_NAME             := posix-bitops
-NV_INTERFACE_EXPORTS          := posix-bitops
-NV_INTERFACE_PUBLIC_INCLUDES  := . include
-endif
+NVGPU_UNIT_NAME=posix-bitops
+
+include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk
 
 # Local Variables:
 # indent-tabs-mode: t
diff --git a/userspace/units/posix-bitops/Makefile.tmk b/userspace/units/posix-bitops/Makefile.tmk
index b70bd7bb9..94683a9a9 100644
--- a/userspace/units/posix-bitops/Makefile.tmk
+++ b/userspace/units/posix-bitops/Makefile.tmk
@@ -12,31 +12,9 @@
 #
 ###############################################################################
 
-ifdef NV_COMPONENT_FLAG_SHARED_LIBRARY_SECTION
-include $(NV_BUILD_START_COMPONENT)
+NVGPU_UNIT_NAME=posix-bitops
 
-
-
-NV_COMPONENT_NAME		:= posix-bitops
-NV_COMPONENT_OWN_INTERFACE_DIR	:= .
-
-NV_COMPONENT_SOURCES		:= \
-                                posix-bitops.c
-
-NV_COMPONENT_CFLAGS		+= -D__NVGPU_POSIX__
-
-NV_COMPONENT_NEEDED_INTERFACE_DIRS := \
-                                $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu \
-                                $(NV_SOURCE)/kernel/nvgpu/userspace
-
-NV_COMPONENT_SYSTEMIMAGE_DIR    := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit/units
-systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR)
-$(NV_COMPONENT_SYSTEMIMAGE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)
-	$(MKDIR_P) $@
-
-include $(NV_BUILD_SHARED_LIBRARY)
-
-endif
+include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk
 
 # Local Variables:
 # indent-tabs-mode: t
diff --git a/userspace/units/posix-bitops/posix-bitops.export b/userspace/units/posix-bitops/posix-bitops.export
deleted file mode 100644
index b039dd364..000000000
--- a/userspace/units/posix-bitops/posix-bitops.export
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
-
-__unit_module__