Index: b/usr/src/lib/libdiskmgt/Makefile.com
===================================================================
--- a/usr/src/lib/libdiskmgt/Makefile.com	2014-03-10 12:36:45.832206397 +0400
+++ b/usr/src/lib/libdiskmgt/Makefile.com	2014-03-10 12:37:26.611448056 +0400
@@ -29,20 +29,28 @@
 		entry.o cache.o drive.o controller.o alias.o path.o \
                 media.o slice.o partition.o findevs.o events.o \
                 bus.o inuse_mnt.o inuse_svm.o inuse_lu.o inuse_fs.o \
-                inuse_vxvm.o inuse_dump.o inuse_zpool.o
+                inuse_vxvm.o inuse_dump.o inuse_zpool.o \
+                rdwr_vtoc.o fulldevnm.o
 
 include ../../Makefile.lib
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 i386_LDLIBS =   -lfdisk
 sparc_LDLIBS =
-LDLIBS +=       -ldevinfo -ladm -ldevid -lkstat -lsysevent \
+LDLIBS +=       -ldevinfo -ldevid -lkstat -lsysevent \
                 -lnvpair -lefi -lc $($(MACH)_LDLIBS)
-DYNFLAGS +=	-R/opt/VRTSvxvm/lib
 
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
+pics/rdwr_vtoc.o: ../../../lib/libadm/common/rdwr_vtoc.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
+pics/fulldevnm.o: ../../../lib/libadm/common/fulldevnm.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-parentheses
Index: b/usr/src/lib/libdiskmgt/common/disks_private.h
===================================================================
--- a/usr/src/lib/libdiskmgt/common/disks_private.h	2014-03-10 12:36:45.832165291 +0400
+++ b/usr/src/lib/libdiskmgt/common/disks_private.h	2014-03-10 12:37:26.613660941 +0400
@@ -32,6 +32,7 @@
 
 #include <libdevinfo.h>
 #include <sys/dkio.h>
+#include <sys/vtoc.h>
 #include <devid.h>
 
 #define	DM_DEBUG	"DM_LIBDISKMGT_DEBUG"
@@ -143,6 +144,11 @@
 } dm_event_type_t;
 
 
+int read_vtoc(int, struct vtoc *);
+int write_vtoc(int, struct vtoc *);
+int read_extvtoc(int, struct extvtoc *);
+int write_extvtoc(int, struct extvtoc *);
+
 /* private internal functions */
 descriptor_t	**alias_get_descriptors(int filter[], int *errp);
 descriptor_t	**alias_get_assoc_descriptors(descriptor_t *desc,
Index: b/usr/src/lib/libadm/common/fulldevnm.c
===================================================================
--- a/usr/src/lib/libadm/common/fulldevnm.c	2014-03-10 12:36:45.832109801 +0400
+++ b/usr/src/lib/libadm/common/fulldevnm.c	2014-03-10 12:37:26.615483966 +0400
@@ -40,7 +40,6 @@
 #include <sys/lofi.h>
 #include <sys/ramdisk.h>
 #include <sys/fssnap_if.h>
-#include "libadm.h"
 
 /*
  * Globals: