diff --git a/apps/backend/Makefile.in b/apps/backend/Makefile.in
index 585bc059..2147bb81 100644
--- a/apps/backend/Makefile.in
+++ b/apps/backend/Makefile.in
@@ -64,23 +64,27 @@ LIBS    	= -L$(top_srcdir)/lib/src @LIBS@ $(top_srcdir)/lib/src/$(CLIXON_LIB) -l
 CPPFLAGS  	= @CPPFLAGS@ -fPIC
 INCLUDES	= -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
 
-# Not accessible from plugin
-APPSRC  = backend_main.c backend_socket.c backend_client.c \
-	backend_commit.c backend_plugin.c 
-
-APPOBJ  = $(APPSRC:.c=.o)
+# Name of application
 APPL	= clixon_backend
 
-#SHLIB	= clixon_backend
-MYNAME		= clixon_backend
-MYLIBLINK       = lib$(MYNAME)$(SH_SUFFIX)
-MYLIB           = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
-MYLIBSO         = $(MYLIBLINK).$(CLIXON_MAJOR)
+# Not accessible from plugin
+APPSRC  = backend_main.c
+APPSRC += backend_socket.c
+APPSRC += backend_client.c
+APPSRC += backend_commit.c
+APPSRC += backend_plugin.c
+APPOBJ  = $(APPSRC:.c=.o)
 
 # Accessible from plugin
 LIBSRC	= clixon_backend_transaction.c clixon_backend_handle.c
 LIBOBJ	= $(LIBSRC:.c=.o)
 
+# Name of lib
+MYNAME		= clixon_backend
+MYLIBLINK       = lib$(MYNAME)$(SH_SUFFIX)
+MYLIB           = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
+MYLIBSO         = $(MYLIBLINK).$(CLIXON_MAJOR)
+
 all:	  $(MYLIB) $(APPL) test
 
 clean:
@@ -127,7 +131,7 @@ test: 	test.c $(LIBOBJ)
 	$(CC) $(INCLUDES) $(LDFLAGS) $< $(LIBOBJ) -L. $(MYLIB) $(LIBS) -o $@
 
 $(APPL) : $(APPOBJ) $(MYLIBLINK) $(LIBDEPS)
-	$(CC) $(LDFLAGS) $(APPOBJ) $(OBJS) -L. $(MYLIB) $(LIBS) -o $@
+	$(CC) $(LDFLAGS) $(APPOBJ) -L. $(MYLIB) $(LIBS) -o $@
 
 $(MYLIB): $(LIBOBJ)
 ifeq ($(HOST_VENDOR),apple)
@@ -145,7 +149,7 @@ TAGS:
 	find . -name '*.[chyl]' -print | etags -
 
 depend:
-	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(SRC) $(APPSRC) > .depend
+	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(LIBSRC) $(APPSRC) > .depend
 
 #include .depend
 
diff --git a/apps/cli/Makefile.in b/apps/cli/Makefile.in
index 359038b0..78f9134a 100644
--- a/apps/cli/Makefile.in
+++ b/apps/cli/Makefile.in
@@ -68,22 +68,33 @@ LIBS          = -L$(top_srcdir)/lib/src @LIBS@  $(top_srcdir)/lib/src/$(CLIXON_L
 CPPFLAGS  	= @CPPFLAGS@ -fPIC
 INCLUDES	= -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
 
+# Name of application
 APPL		= clixon_cli
-SRC		= cli_main.c
-OBJS    	= $(SRC:.c=.o)
 
+# Not accessible from plugin
+APPSRC		= cli_main.c
+APPSRC	       += cli_generate.c
+APPOBJ		= $(APPSRC:.c=.o)
+
+# Accessible from plugin
+LIBSRC	        = cli_common.c
+LIBSRC	       += cli_show.c
+LIBSRC	       += cli_handle.c
+LIBSRC	       += cli_plugin.c
+LIBOBJ		= $(LIBSRC:.c=.o)
+
+# Name of lib
 MYNAME		= clixon_cli
 MYLIBLINK       = lib$(MYNAME)$(SH_SUFFIX)
 MYLIB           = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
 MYLIBSO         = $(MYLIBLINK).$(CLIXON_MAJOR)
 
-LIBSRC		= cli_plugin.c cli_common.c cli_show.c cli_handle.c cli_generate.c
-LIBOBJS		= $(LIBSRC:.c=.o)
+
 
 all:	 $(MYLIB) $(APPL) test
 
 clean:
-	rm -f $(OBJS) $(LIBOBJS) *.core $(APPL) $(MYLIB) $(MYLIBSO) $(MYLIBLINK)
+	rm -f $(LIBOBJ) $(APPOBJ) *.core $(APPL) $(MYLIB) $(MYLIBSO) $(MYLIBLINK)
 
 distclean: clean
 	rm -f Makefile *~ .depend test test.c
@@ -125,14 +136,14 @@ test.c	:
 test: 	test.c $(LIBOBJ) 
 	$(CC) $(INCLUDES) $(LDFLAGS) $< $(LIBOBJ) -L. $(MYLIB) $(LIBS) -o $@
 
-$(APPL): $(OBJS) $(MYLIBLINK) $(LIBDEPS)	
-	$(CC) $(LDFLAGS) $(OBJS) -L. $(MYLIB) $(LIBS) -o $@
+$(APPL): $(APPOBJ) $(MYLIBLINK) $(LIBDEPS)	
+	$(CC) $(LDFLAGS) $(APPOBJ) -L. $(MYLIB) $(LIBS) -o $@
 
-$(MYLIB) : $(LIBOBJS)
+$(MYLIB) : $(LIBOBJ)
 ifeq ($(HOST_VENDOR),apple)
-	$(CC) $(LDFLAGS) -shared -undefined dynamic_lookup -o $@ $(LIBOBJS) $(LIBS)
+	$(CC) $(LDFLAGS) -shared -undefined dynamic_lookup -o $@ $(LIBOBJ) $(LIBS)
 else
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO)
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJ) $(LIBS) -Wl,-soname=$(MYLIBSO)
 endif
 
 # link-name is needed for application linking, eg for clixon_cli and clixon_config
@@ -144,7 +155,7 @@ TAGS:
 	find . -name '*.[chyl]' -print | etags -
 
 depend:
-	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(SRC) $(APPSRC) > .depend
+	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(LIBSRC) $(APPSRC) > .depend
 
 #include .depend
 
diff --git a/apps/netconf/Makefile.in b/apps/netconf/Makefile.in
index 17c09072..21b2d907 100644
--- a/apps/netconf/Makefile.in
+++ b/apps/netconf/Makefile.in
@@ -65,22 +65,32 @@ LIBS          = -L$(top_srcdir)/lib/src @LIBS@ $(top_srcdir)/lib/src/$(CLIXON_LI
 CPPFLAGS  	= @CPPFLAGS@ -fPIC
 INCLUDES	= -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
 
-APPL	= clixon_netconf
-SRC     = netconf_main.c
-OBJS    = $(SRC:.c=.o)
+# Name of application
+APPL	 = clixon_netconf
 
+# Not accessible from plugin
+APPSRC   = netconf_main.c
+APPSRC  += netconf_hello.c
+APPSRC  += netconf_rpc.c 
+APPSRC  += netconf_filter.c
+APPOBJ   = $(APPSRC:.c=.o)
+
+# Accessible from plugin
+LIBSRC   = netconf_lib.c 
+
+
+LIBOBJ   = $(LIBSRC:.c=.o)
+
+# Name of lib
 MYNAME		= clixon_netconf
 MYLIBLINK       = lib$(MYNAME)$(SH_SUFFIX)
 MYLIB           = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
 MYLIBSO         = $(MYLIBLINK).$(CLIXON_MAJOR)
 
-LIBSRC     = netconf_hello.c netconf_rpc.c netconf_filter.c netconf_lib.c 
-LIBOBJS    = $(LIBSRC:.c=.o)
-
 all:	 $(MYLIB) $(APPL)
 
 clean: 
-	rm -f $(OBJS) $(LIBOBJS) *.core $(APPL) $(MYLIB) $(MYLIBSO) $(MYLIBLINK)
+	rm -f $(APPL) $(APPOBJ) $(LIBOBJ) *.core  $(MYLIB) $(MYLIBSO) $(MYLIBLINK)
 
 distclean: clean
 	rm -f Makefile *~ .depend
@@ -114,14 +124,14 @@ uninstall:
 .c.o:
 	$(CC) $(INCLUDES) $(CPPFLAGS) -D__PROGRAM__=\"$(APPL)\" $(CFLAGS) -c $<
 
-$(APPL) : $(OBJS) $(MYLIBLINK) $(LIBDEPS)
-	$(CC) $(LDFLAGS) $(OBJS) -L. $(MYLIB) $(LIBS) -o $@
+$(APPL) : $(APPOBJ) $(MYLIBLINK) $(LIBDEPS)
+	$(CC) $(LDFLAGS) $(APPOBJ) -L. $(MYLIB) $(LIBS) -o $@
 
-$(MYLIB) : $(LIBOBJS)
+$(MYLIB) : $(LIBOBJ)
 ifeq ($(HOST_VENDOR),apple)
-	$(CC) $(LDFLAGS) -shared -undefined dynamic_lookup -o $@ $(LIBOBJS) $(LIBS)
+	$(CC) $(LDFLAGS) -shared -undefined dynamic_lookup -o $@ $(LIBOBJ) $(LIBS)
 else
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO)
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJ) $(LIBS) -Wl,-soname=$(MYLIBSO)
 endif
 
 # link-name is needed for application linking, eg for clixon_cli and clixon_config
@@ -133,7 +143,7 @@ TAGS:
 	find . -name '*.[chyl]' -print | etags -
 
 depend:
-	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(SRC) $(APPSRC) > .depend
+	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(LIBSRC) $(APPSRC) > .depend
 
 #include .depend
 
diff --git a/apps/restconf/Makefile.in b/apps/restconf/Makefile.in
index 1f7e3fff..e3b95cfb 100644
--- a/apps/restconf/Makefile.in
+++ b/apps/restconf/Makefile.in
@@ -66,26 +66,28 @@ CPPFLAGS  	= @CPPFLAGS@ -fPIC
 
 INCLUDES	= -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
 
-SRC     = restconf_methods.c
+# Name of application
+APPL	  = clixon_restconf
 
-OBJS    = $(SRC:.c=.o)
+# Not accessible from plugin
+APPSRC    = restconf_main.c
+APPSRC   += restconf_methods.c
+APPOBJ    = $(APPSRC:.c=.o)
 
-APPSRC  = restconf_main.c
-APPOBJ  = $(APPSRC:.c=.o)
-APPL	= clixon_restconf
+# Accessible from plugin
+LIBSRC    = restconf_lib.c
+LIBOBJ    = $(LIBSRC:.c=.o)
 
-MYNAME		= clixon_restconf
-MYLIBLINK       = lib$(MYNAME)$(SH_SUFFIX)
-MYLIB           = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
-MYLIBSO         = $(MYLIBLINK).$(CLIXON_MAJOR)
-
-LIBSRC     = restconf_lib.c
-LIBOBJS    = $(LIBSRC:.c=.o)
+# Name of lib
+MYNAME	  = clixon_restconf
+MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX)
+MYLIB     = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
+MYLIBSO   = $(MYLIBLINK).$(CLIXON_MAJOR)
 
 all:	 $(MYLIB) $(APPL)
 
 clean:
-	rm -f $(OBJS) $(LIBOBJS) *.core $(APPL) $(APPOBJ) $(MYLIB) $(MYLIBSO) $(MYLIBLINK)
+	rm -f $(LIBOBJ) *.core $(APPL) $(APPOBJ) $(MYLIB) $(MYLIBSO) $(MYLIBLINK)
 
 distclean: clean
 	rm -f Makefile *~ .depend
@@ -118,14 +120,14 @@ uninstall:
 .c.o:
 	$(CC) $(INCLUDES) -D__PROGRAM__=\"$(APPL)\" $(CPPFLAGS) $(CFLAGS) -c $<
 
-$(APPL) : $(APPOBJ) $(MYLIBLINK) $(OBJS) $(LIBDEPS)
-	$(CC) $(LDFLAGS) $(APPOBJ) $(OBJS) -L. $(MYLIB) $(LIBS) -o $@
+$(APPL) : $(APPOBJ) $(MYLIBLINK) $(LIBDEPS)
+	$(CC) $(LDFLAGS) $(APPOBJ) -L. $(MYLIB) $(LIBS) -o $@
 
-$(MYLIB) : $(LIBOBJS)
+$(MYLIB) : $(LIBOBJ)
 ifeq ($(HOST_VENDOR),apple)
-	$(CC) $(LDFLAGS) -shared -undefined dynamic_lookup -o $@ $(LIBOBJS) $(LIBS)
+	$(CC) $(LDFLAGS) -shared -undefined dynamic_lookup -o $@ $(LIBOBJ) $(LIBS)
 else
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO)
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJ) $(LIBS) -Wl,-soname=$(MYLIBSO)
 endif
 
 # link-name is needed for application linking, eg for clixon_cli and clixon_config
@@ -135,7 +137,7 @@ TAGS:
 	find . -name '*.[chyl]' -print | etags -
 
 depend:
-	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(SRC) $(APPSRC) > .depend
+	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(LIBSRC) $(APPSRC) > .depend
 
 #include .depend