diff --git a/trick_source/data_products/makefile b/trick_source/data_products/makefile
index ccaa420d..6122ad3d 100644
--- a/trick_source/data_products/makefile
+++ b/trick_source/data_products/makefile
@@ -8,7 +8,8 @@ LIB_DIR = lib_${TRICK_HOST_CPU}
 
 LIBDIRS = Var \
     Log \
-    EQParse
+    EQParse \
+    units
 
 ifneq ("$(wildcard fermi-ware)","")
 LIBDIRS += fermi-ware
diff --git a/trick_source/data_products/units/include b/trick_source/data_products/units/include
deleted file mode 120000
index d7b5ce82..00000000
--- a/trick_source/data_products/units/include
+++ /dev/null
@@ -1 +0,0 @@
-../../trick_utils/units/include
\ No newline at end of file
diff --git a/trick_source/data_products/units/makefile b/trick_source/data_products/units/makefile
index 23763a28..1d0f0483 100644
--- a/trick_source/data_products/units/makefile
+++ b/trick_source/data_products/units/makefile
@@ -1,4 +1,6 @@
 
+include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+
 CC  = cc
 CPP = c++
 
@@ -13,7 +15,7 @@ endif
 OBJ_DIR   = object_${TRICK_HOST_CPU}
 LIBDIR    = ../lib_${TRICK_HOST_CPU}
 LIBNAME   = libtrick_units.a
-INCLUDE_DIRS = -Iinclude 
+INCLUDE_DIRS = -I${TRICK_HOME}/include
 DP_CFLAGS = -g ${INCLUDE_DIRS} -fPIC
 
 CPP_OBJECTS = $(OBJ_DIR)/UCFn.o \
@@ -38,18 +40,8 @@ $(LIBDIR):
 
 OBJECTS: $(CPP_OBJECTS) 
 
-ifeq ($(TRICK_FORCE_32BIT), 1)
 $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIB_DIR)
 	ar crs $(LIBDIR)/$(LIBNAME) $?
-else
-ifeq ($(TRICK_HOME),)
-$(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIB_DIR)
-	ar crs $(LIBDIR)/$(LIBNAME) $?
-else
-$(LIBDIR)/$(LIBNAME): $(LIBDIR)
-	ln -sf ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick_units.a $(LIBDIR)/$(LIBNAME)
-endif
-endif
 
 depend:
 	@ echo "No depend rule for this directory"