diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix
index 4b6595d25..610daa225 100644
--- a/src/libCom/Makefile.Unix
+++ b/src/libCom/Makefile.Unix
@@ -3,11 +3,14 @@ include $(TOP)/config/CONFIG_BASE
 CMPLR = STRICT
 
 USR_CFLAGS = -D_NO_PROTO
+USR_INCLUDES = -I$(TOP)/src/include/os/$(T_A)
 USR_LDLIBS += -lCom
 USR_LDFLAGS += -L.
 #USR_CFLAGS = -v -g
 #CC = $(PURIFYHOME)/purify $(C_$(CMPLR))
 
+VPATH = ../os/generic
+
 DEPLIBS_BASE = $(INSTALL_LIB)
 DEPLIBS += $(DEPLIBS_BASE)/libCom.a
 
@@ -52,9 +55,10 @@ SRCS.c += ../tsSubr.c
 SRCS.c += ../assertUNIX.c
 #SRCS.c += ../fdManager.cc
 #SRCS.c += ../osiTimer.cc
-#SRCS.c += ../osiTimeOSD.cc
 SRCS.c += ../macCore.c
 SRCS.c += ../macUtil.c
+SRCS.c += ../os/generic/ipAddrToA.c
+SRCS.c += ../os/generic/osdTime.cc
 SRCS.c += ../impLib.c
 SRCS.c += ../impExpand.c
 
@@ -79,9 +83,10 @@ LIBOBJS += tsSubr.o
 LIBOBJS += assertUNIX.o
 #LIBOBJS += fdManager.o
 #LIBOBJS += osiTimer.o
-#LIBOBJS += osiTimeOSD.o
 LIBOBJS += macCore.o
 LIBOBJS += macUtil.o
+LIBOBJS += ipAddrToA.o
+LIBOBJS += osdTime.o
 LIBOBJS += impLib.o
 LIBOBJS += impExpand.o
 
diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx
index a7b4a9b20..7143b759b 100644
--- a/src/libCom/Makefile.Vx
+++ b/src/libCom/Makefile.Vx
@@ -2,6 +2,10 @@ TOP = ../../..
 include $(TOP)/config/CONFIG_BASE
 USR_CFLAGS += -Wall -pedantic
 
+USR_INCLUDES = -I$(TOP)/src/include/os/vxWorks
+
+VPATH = ../os/vxWorks
+
 SRCS.c += ../calcPerform.c
 SRCS.c += ../cvtFast.c
 SRCS.c += ../gpHashLib.c
@@ -22,6 +26,9 @@ SRCS.c += ../errPrintfVX.c
 SRCS.c += ../assertVX.c
 SRCS.c += ../macCore.c
 SRCS.c += ../macUtil.c
+#SRCS.c += ../osiTimer.cc
+#SRCS.c += ../os/vxWorks/osdTime.cc
+SRCS.c += ../os/vxWorks/ipAddrToA.c
 SRCS.c += ../impLib.c
 
 LIBOBJS += calcPerform.o
@@ -43,6 +50,9 @@ LIBOBJS += errPrintfVX.o
 LIBOBJS += assertVX.o
 LIBOBJS += macCore.o
 LIBOBJS += macUtil.o
+#LIBOBJS += osiTimer.o
+#LIBOBJS += osdTime.o
+LIBOBJS += ipAddrToA.o
 LIBOBJS += impLib.o
 
 LIBNAME = libCom
@@ -73,7 +83,7 @@ clean::
 #	should work on all archs, but I decided to
 #	keep the "originals" for now.  -kuk-
 ifeq ($(HOST_ARCH),WIN32)
-TOOLDIR=../WIN32
+TOOLDIR=../os/WIN32
 else
 TOOLDIR=..
 endif
@@ -86,6 +96,6 @@ errSymTbl.o: errSymTbl.c
 	$(COMPILE.c) -o $@ $<
 
 errSymTbl.c: $(ERR_S_FILES)
-	@$(RM) errSymTbl.c ;\
+	$(RM) errSymTbl.c ;\
 	$(TOOLDIR)/makeStatTbl  $(ERR_S_FILES) >errSymTbl.c