diff --git a/src/gdd/Makefile.Vx b/src/gdd/Makefile.Vx
new file mode 100644
index 000000000..08a78f150
--- /dev/null
+++ b/src/gdd/Makefile.Vx
@@ -0,0 +1,49 @@
+#
+# Author: Jeff Hill 
+# Date: 8/96
+#
+# $Id$
+#
+# $Log$
+
+VPATH=.:..
+
+TOP= ../../..
+
+include $(TOP)/config/CONFIG_BASE
+
+DEPENDS_RULE.cc = -$(COMPILE.cc) -xM $(SRCS.cc) >> .DEPENDS
+
+USR_LDFLAGS = -L$(EPICS_EXTENSIONS_LIB) -L.
+USR_CFLAGS = -L$(EPICS_EXTENSIONS_LIB) -L.
+
+SRCS.cc = ../aitGen.c ../aitTypes.c ../aitHelpers.cc \
+          ../gdd.cc ../gddAppDefs.cc ../gddAppTable.cc ../gddNewDel.cc \
+          ../gddTest.cc ../dbMapper.cc 
+
+LIBOBJS = gdd.o gddAppTable.o gddNewDel.o gddAppDefs.o \
+		  aitTypes.o aitConvert.o aitHelpers.o dbMapper.o
+
+LIBNAME = libgdd.o
+
+include $(TOP)/config/RULES.Vx
+
+# cannot generate dependencies for aitConvert automatically
+
+aitConvert.o: aitConvert.cc aitConvert.h aitConvertGenerated.cc aitTypes.h
+
+aitConvertGenerated.cc: ../O.$(HOST_ARCH)/aitGen aitTypes.h
+	../O.$(HOST_ARCH)/aitGen 
+
+# cannot generate dependencies for dbMapper.o automatically
+
+dbMapper.o: ../dbMapper.cc gdd.h gddAppTable.h dbMapper.h gddApps.h aitTypes.h
+	$(COMPILE.cc) $<
+
+gddApps.h: ../O.$(HOST_ARCH)/genApps
+	../O.$(HOST_ARCH)/genApps $@
+
+clean::
+	/bin/rm -f aitConvertGenerated.cc aitGen 
+
+
diff --git a/src/include/os/solaris/osiSock.h b/src/include/os/solaris/osiSock.h
new file mode 100644
index 000000000..ee9338921
--- /dev/null
+++ b/src/include/os/solaris/osiSock.h
@@ -0,0 +1,28 @@
+
+/*
+ * Solaris specifif socket include
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+ 
+#ifdef __cplusplus
+}
+#endif
+ 
+typedef int                     SOCKET;
+#define SOCKERRNO               errno
+#define socket_close(S)         close(S)
+#define socket_ioctl(A,B,C)     ioctl(A,B,C)
+
+
diff --git a/src/include/os/sun4/osiSock.h b/src/include/os/sun4/osiSock.h
new file mode 100644
index 000000000..46134cb7f
--- /dev/null
+++ b/src/include/os/sun4/osiSock.h
@@ -0,0 +1,80 @@
+/*
+ * sun4 specific socket include
+ */
+
+#ifndef SUNOS4
+#errro this is a SUNOS4 specific socket include
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+ 
+int ioctl (int fd, int req, ...);
+int close (int fd);
+int gettimeofday (struct timeval *tp, struct timezone *tzp);
+int gethostname (char *name, int namelen); 
+
+/*
+ * sun's CC defines at least a few of these under sunos4
+ */
+#if defined(__SUNPRO_CC) 
+#	include <arpa/inet.h>
+#else
+
+int listen (int socket, int backlog);
+int accept (int socket, struct sockaddr *addr, int *addrlen);
+int shutdown (int socket, int how);
+int getpeername (int socket, struct sockaddr *name, int *namelen);
+int connect (int socket, struct sockaddr *name, int namelen);
+int setsockopt (int socket, int level, int optname,
+                char *optval, int optlen);
+void bzero (char *b, int length);
+int sendto (int socket, const char *buf, int len,
+        int flags, struct sockaddr *to, int tolen);
+int select (int width, fd_set *readfds, fd_set *writefds,
+        fd_set *exceptfds, struct timeval *timeout);
+
+int bind (int socket, struct sockaddr *name, int namelen);
+int send (int socket, const char *buf, int len, int flags);
+int recv (int socket, char *buf, int len, int flags);
+int getsockopt (int socket, int level, int optname,
+                char *optval, int *optlen);
+int socket (int domain, int type, int protocol);
+int recvfrom (int socket, char *buf, int len,
+        int flags, struct sockaddr *from, int *fromlen);
+int getsockname (int socket, struct sockaddr *name, int *namelen);
+
+/*
+ * from /usr/include/arpa/inet.h
+ * (which under sunos4 does not include arguments for C++)
+ * (__SUNPRO_CC supplies this file but g++ does not supply an ansi protottype)
+ */
+unsigned long inet_addr (char *);
+char * inet_ntoa (struct in_addr in);
+
+/*
+ * from /usr/include/netdb.h
+ * (which under sunos4 does not include arguments for C++)
+ * (__SUNPRO_CC supplies this file but g++ does not)
+ */
+struct hostent *gethostbyaddr(char *addr, int len, int type);
+
+#endif /* !defined(__SUNPRO_CC) */
+
+
+#ifdef __cplusplus
+}
+#endif
+ 
+typedef int                     SOCKET;
+#define SOCKERRNO               errno
+#define socket_close(S)         close(S)
+#define socket_ioctl(A,B,C)     ioctl(A,B,C)
+
+
diff --git a/src/include/os/vxWorks/osiSock.h b/src/include/os/vxWorks/osiSock.h
new file mode 100644
index 000000000..e74885a14
--- /dev/null
+++ b/src/include/os/vxWorks/osiSock.h
@@ -0,0 +1,26 @@
+/*
+ * vxWorks specific socket include
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/socket.h>
+#include <sockLib.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+
+#ifdef __cplusplus
+}
+#endif
+ 
+typedef int                     SOCKET;
+#define SOCKERRNO               errno
+#define socket_close(S)         close(S)
+#define socket_ioctl(A,B,C)     ioctl(A,B,(int)C)
+
+
diff --git a/src/libCom/osi/os/solaris/osdSock.h b/src/libCom/osi/os/solaris/osdSock.h
new file mode 100644
index 000000000..ee9338921
--- /dev/null
+++ b/src/libCom/osi/os/solaris/osdSock.h
@@ -0,0 +1,28 @@
+
+/*
+ * Solaris specifif socket include
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+ 
+#ifdef __cplusplus
+}
+#endif
+ 
+typedef int                     SOCKET;
+#define SOCKERRNO               errno
+#define socket_close(S)         close(S)
+#define socket_ioctl(A,B,C)     ioctl(A,B,C)
+
+
diff --git a/src/libCom/osi/os/sun4/osdSock.h b/src/libCom/osi/os/sun4/osdSock.h
new file mode 100644
index 000000000..46134cb7f
--- /dev/null
+++ b/src/libCom/osi/os/sun4/osdSock.h
@@ -0,0 +1,80 @@
+/*
+ * sun4 specific socket include
+ */
+
+#ifndef SUNOS4
+#errro this is a SUNOS4 specific socket include
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+ 
+int ioctl (int fd, int req, ...);
+int close (int fd);
+int gettimeofday (struct timeval *tp, struct timezone *tzp);
+int gethostname (char *name, int namelen); 
+
+/*
+ * sun's CC defines at least a few of these under sunos4
+ */
+#if defined(__SUNPRO_CC) 
+#	include <arpa/inet.h>
+#else
+
+int listen (int socket, int backlog);
+int accept (int socket, struct sockaddr *addr, int *addrlen);
+int shutdown (int socket, int how);
+int getpeername (int socket, struct sockaddr *name, int *namelen);
+int connect (int socket, struct sockaddr *name, int namelen);
+int setsockopt (int socket, int level, int optname,
+                char *optval, int optlen);
+void bzero (char *b, int length);
+int sendto (int socket, const char *buf, int len,
+        int flags, struct sockaddr *to, int tolen);
+int select (int width, fd_set *readfds, fd_set *writefds,
+        fd_set *exceptfds, struct timeval *timeout);
+
+int bind (int socket, struct sockaddr *name, int namelen);
+int send (int socket, const char *buf, int len, int flags);
+int recv (int socket, char *buf, int len, int flags);
+int getsockopt (int socket, int level, int optname,
+                char *optval, int *optlen);
+int socket (int domain, int type, int protocol);
+int recvfrom (int socket, char *buf, int len,
+        int flags, struct sockaddr *from, int *fromlen);
+int getsockname (int socket, struct sockaddr *name, int *namelen);
+
+/*
+ * from /usr/include/arpa/inet.h
+ * (which under sunos4 does not include arguments for C++)
+ * (__SUNPRO_CC supplies this file but g++ does not supply an ansi protottype)
+ */
+unsigned long inet_addr (char *);
+char * inet_ntoa (struct in_addr in);
+
+/*
+ * from /usr/include/netdb.h
+ * (which under sunos4 does not include arguments for C++)
+ * (__SUNPRO_CC supplies this file but g++ does not)
+ */
+struct hostent *gethostbyaddr(char *addr, int len, int type);
+
+#endif /* !defined(__SUNPRO_CC) */
+
+
+#ifdef __cplusplus
+}
+#endif
+ 
+typedef int                     SOCKET;
+#define SOCKERRNO               errno
+#define socket_close(S)         close(S)
+#define socket_ioctl(A,B,C)     ioctl(A,B,C)
+
+
diff --git a/src/libCom/osi/os/vxWorks/osdSock.h b/src/libCom/osi/os/vxWorks/osdSock.h
new file mode 100644
index 000000000..e74885a14
--- /dev/null
+++ b/src/libCom/osi/os/vxWorks/osdSock.h
@@ -0,0 +1,26 @@
+/*
+ * vxWorks specific socket include
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/socket.h>
+#include <sockLib.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+
+#ifdef __cplusplus
+}
+#endif
+ 
+typedef int                     SOCKET;
+#define SOCKERRNO               errno
+#define socket_close(S)         close(S)
+#define socket_ioctl(A,B,C)     ioctl(A,B,(int)C)
+
+