diff --git a/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/AuthLib.proj b/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/AuthLib.proj
index 8186f7eea4..893ca653e4 100644
Binary files a/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/AuthLib.proj and b/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/AuthLib.proj differ
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/besure_auth.c b/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/besure_auth.c
index cccb6b3c1e..a94170c6f5 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/besure_auth.c
+++ b/src/tests/add-ons/kernel/file_systems/beserved/AuthLib/besure_auth.c
@@ -27,7 +27,7 @@ typedef struct
 
 
 static uint32 genUniqueId(char *str);
-static void strlwr(char *str);
+//static void strlwr(char *str);
 static void removeFiles(char *folder, char *file);
 static void recvAlarm(int signal);
 static key_value *GetNextKey(FILE *fp);
@@ -406,13 +406,13 @@ bool getGroupDesc(char *group, char *desc, int bufSize)
 }
 
 // strlwr()
-//
+/*
 static void strlwr(char *str)
 {
 	char *p;
 	for (p = str; *p; p++)
 		*p = tolower(*p);
-}
+}*/
 
 // genUniqueId()
 //
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/BeManager_Zeta.proj b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/BeManager_Zeta.proj
new file mode 100644
index 0000000000..0c6ff2b1af
Binary files /dev/null and b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/BeManager_Zeta.proj differ
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/GroupProperties.h b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/GroupProperties.h
index cc904fdef4..6aafea011f 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/GroupProperties.h
+++ b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/GroupProperties.h
@@ -10,6 +10,7 @@ class MemberItem : public ListItem
 		void ItemDeselected();
 };
 
+class BTextControl;
 
 class GroupPropertiesView : public BView
 {
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/ServerProperties.h b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/ServerProperties.h
index 40a1d45079..7cbc5112a3 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/ServerProperties.h
+++ b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/ServerProperties.h
@@ -1,3 +1,5 @@
+class BCheckBox;
+
 class ServerPropertiesView : public BView
 {
 	public:
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.cpp b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.cpp
index 55dc3b787a..017027019d 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.cpp
+++ b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.cpp
@@ -262,7 +262,7 @@ void UserPropertiesPanel::MessageReceived(BMessage *msg)
 
 	switch (msg->what)
 	{
-		case MSG_USER_BROWSE:
+		case MSG_USER_BROWSE:{
 			BMessenger messenger(this);
 			filePanel = new BFilePanel(B_OPEN_PANEL, &messenger, &entryRef,
 				B_DIRECTORY_NODE, false);
@@ -271,6 +271,7 @@ void UserPropertiesPanel::MessageReceived(BMessage *msg)
 			filePanel->Window()->SetTitle("User Home");
 			filePanel->SetButtonLabel(B_DEFAULT_BUTTON, "Select");
 			break;
+		}
 
 		case B_REFS_RECEIVED:
 			msg->FindRef("refs", &entryRef);
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.h b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.h
index ce88debdc8..1078a05578 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.h
+++ b/src/tests/add-ons/kernel/file_systems/beserved/BeManager/UserProperties.h
@@ -1,3 +1,11 @@
+#ifndef _UserProperties_h_
+#define _UserProperties_h_
+
+class BTextControl;
+class BCheckBox;
+class BMenu;
+class BMenuField;
+
 class UserPropertiesView : public BView
 {
 	public:
@@ -67,3 +75,4 @@ class UserPropertiesPanel : public BWindow
 		bool newUser;
 		bool cancelled;
 };
+#endif
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/BeSure/BeSureServer_ZETA.proj b/src/tests/add-ons/kernel/file_systems/beserved/BeSure/BeSureServer_ZETA.proj
new file mode 100644
index 0000000000..643aa2180b
Binary files /dev/null and b/src/tests/add-ons/kernel/file_systems/beserved/BeSure/BeSureServer_ZETA.proj differ
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/BeSure/besure_server.c b/src/tests/add-ons/kernel/file_systems/beserved/BeSure/besure_server.c
index b619404026..99eb7bea2f 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/BeSure/besure_server.c
+++ b/src/tests/add-ons/kernel/file_systems/beserved/BeSure/besure_server.c
@@ -67,7 +67,7 @@ void btUnlock(sem_id semaphore, int32 *atomic);
 
 int generateTicket(const char *client, const char *server, unsigned char *key, char *ticket);
 void recordLogin(char *server, char *share, char *client, bool authenticated);
-void strlwr(char *str);
+//void strlwr(char *str);
 
 int cmdAuthenticate(unsigned int addr, char *client, char *token, char *response);
 int cmdReadUsers(DIR **dir, char *user, char *fullName);
@@ -720,13 +720,13 @@ int generateTicket(const char *client, const char *server, unsigned char *key, c
 }
 
 // strlwr()
-//
+/*
 void strlwr(char *str)
 {
 	char *p;
 	for (p = str; *p; p++)
 		*p = tolower(*p);
-}
+}*/
 
 ////////////////////////////////////////////////////////////////////
 
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/FileSharing/FileSharing_Zeta.proj b/src/tests/add-ons/kernel/file_systems/beserved/FileSharing/FileSharing_Zeta.proj
new file mode 100644
index 0000000000..fdf8027c3f
Binary files /dev/null and b/src/tests/add-ons/kernel/file_systems/beserved/FileSharing/FileSharing_Zeta.proj differ
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/MyNetView.h b/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/MyNetView.h
index e2e5525a84..340bdb47fc 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/MyNetView.h
+++ b/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/MyNetView.h
@@ -11,6 +11,8 @@
 
 #include "IconListItem.h"
 
+class BStatusBar;
+
 
 class MyNetView : public BView
 {
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/fsproto.h b/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/fsproto.h
index a6072837d5..a8719158b8 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/fsproto.h
+++ b/src/tests/add-ons/kernel/file_systems/beserved/MyNetwork/fsproto.h
@@ -220,24 +220,24 @@ typedef struct vnode_ops {
 	op_read_query			(*read_query);
 } vnode_ops;
 
-extern _IMPEXP_KERNEL int	new_path(const char *path, char **copy);
-extern _IMPEXP_KERNEL void	free_path(char *p);
+extern int	new_path(const char *path, char **copy);
+extern void	free_path(char *p);
 
-extern _IMPEXP_KERNEL int	notify_listener(int op, nspace_id nsid,
+extern int	notify_listener(int op, nspace_id nsid,
 									vnode_id vnida,	vnode_id vnidb,
 									vnode_id vnidc, const char *name);
-extern _IMPEXP_KERNEL void	notify_select_event(selectsync *sync, uint32 ref);
-extern _IMPEXP_KERNEL int	send_notification(port_id port, long token,
+extern void	notify_select_event(selectsync *sync, uint32 ref);
+extern int	send_notification(port_id port, long token,
 									ulong what, long op, nspace_id nsida,
 									nspace_id nsidb, vnode_id vnida,
 									vnode_id vnidb, vnode_id vnidc,
 									const char *name);
-extern _IMPEXP_KERNEL int	get_vnode(nspace_id nsid, vnode_id vnid, void **data);
-extern _IMPEXP_KERNEL int	put_vnode(nspace_id nsid, vnode_id vnid);
-extern _IMPEXP_KERNEL int	new_vnode(nspace_id nsid, vnode_id vnid, void *data);
-extern _IMPEXP_KERNEL int	remove_vnode(nspace_id nsid, vnode_id vnid);
-extern _IMPEXP_KERNEL int	unremove_vnode(nspace_id nsid, vnode_id vnid);
-extern _IMPEXP_KERNEL int	is_vnode_removed(nspace_id nsid, vnode_id vnid);
+extern int	get_vnode(nspace_id nsid, vnode_id vnid, void **data);
+extern int	put_vnode(nspace_id nsid, vnode_id vnid);
+extern int	new_vnode(nspace_id nsid, vnode_id vnid, void *data);
+extern int	remove_vnode(nspace_id nsid, vnode_id vnid);
+extern int	unremove_vnode(nspace_id nsid, vnode_id vnid);
+extern int	is_vnode_removed(nspace_id nsid, vnode_id vnid);
 
 
 extern _EXPORT vnode_ops	fs_entry;
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/bt_fs/makefile b/src/tests/add-ons/kernel/file_systems/beserved/bt_fs/makefile
index f89113ddea..8de7e1c996 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/bt_fs/makefile
+++ b/src/tests/add-ons/kernel/file_systems/beserved/bt_fs/makefile
@@ -91,7 +91,7 @@ endif
 	OBJ_DIR		:= obj.$(CPU)
 
 # 	specify that the binary should be created in the object directory
-	TARGET		:= $(OBJ_DIR)/$(NAME)
+	TARGET		:= ../Release/$(NAME)
 
 #	specify the mimeset tool
 	MIMESET		:= mimeset
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/bt_fs/makefile.bone b/src/tests/add-ons/kernel/file_systems/beserved/bt_fs/makefile.bone
deleted file mode 100644
index f89113ddea..0000000000
--- a/src/tests/add-ons/kernel/file_systems/beserved/bt_fs/makefile.bone
+++ /dev/null
@@ -1,316 +0,0 @@
-## BeOS Generic Makefile ##
-
-## Fill in the top section of this makefile to define exactly what sort of
-## binary you are creating, and what sources, resources and libraries are
-## needed to create it.  The makefile will then determine the proper
-## platform specific options.
-
-## Fill in the top section to define the binary being created and the makefile
-## will make sure that all of the hard work is taken care of for you, for both
-## PowerPC and Intel versions of the BeOS.
-
-## Application Specific Settings ---------------------------------------------
-
-# specify the name of the binary
-NAME= beserved_client
-
-# specify the type of binary
-#	APP:	Application
-#	SHARED:	Shared library or add-on
-#	STATIC:	Static library archive
-#	DRIVER: Kernel Driver
-TYPE= DRIVER
-
-# specify the source files to use
-#	full paths or paths relative to the makefile can be included
-# 	all files, regardless of directory, will have their object
-#	files created in the common object directory.
-#	Note that this means this makefile will not work correctly
-#	if two source files with the same name (source.c or source.cpp)
-#	are included from different directories.  Also note that spaces
-#	in folder names do not work well with this makefile.
-SRCS= nfs_add_on.c btClient.c readerWriter.c
-
-# specify the resource files to use
-#	full path or a relative path to the resource file can be used.
-RSRCS= 
-
-#specify additional libraries to link against
-#	if libName.so or libName.a is the name of the library to link against
-# 	then simply specify Name in the LIBS list
-# 	if there is another naming scheme use the full binary
-#	name: my_library.so or my_lib.a
-#	libroot.so never needs to be specified here, although libbe.so does
-LIBS=
-
-#	specify the paths to directories where additional
-# 	libraries are to be found.  /boot/develop/lib/PLATFORM/ is
-#	already set.  The paths can be full or relative to this
-#	makefile.  The paths included may not be recursive, so
-#	specify all of the needed paths explicitly
-#	Directories containing source-files are automatically added.
-LIBPATHS=
-
-#	specify additional directories where header files can be found
-# 	directories where sources are found are included automatically
-#	included.
-INCPATHS= /boot/develop/headers/be/bone/sys
-
-#	specify the level of optimization that you desire
-#	NONE, SOME, FULL
-OPTIMIZE= FULL
-
-#	specify any symbols to be defined.  The symbols will be
-#	set to a value of 1.  For example specify DEBUG if you want
-#	DEBUG=1 to be set when compiling.
-DEFINES= 
-
-#	specify special warning levels
-#	if unspecified default warnings will be used
-#	NONE = supress all warnings
-#	ALL = enable all warnings
-WARNINGS = 
-
-#	specify symbols
-#	if TRUE debug symbols will be created
-SYMBOLS = 
-
-
-## Generic Makefile Rules ---------------------------
-##	DO NOT MODIFY BENEATH THIS LINE -----------------
-
-#	determine wheather running on x86 or ppc
-MACHINE=$(shell uname -m)
-ifeq ($(MACHINE), BePC)
-	CPU = x86
-else
-	CPU = ppc
-endif
-
-#	set the directory where object files and binaries will be created
-	OBJ_DIR		:= obj.$(CPU)
-
-# 	specify that the binary should be created in the object directory
-	TARGET		:= $(OBJ_DIR)/$(NAME)
-
-#	specify the mimeset tool
-	MIMESET		:= mimeset
-
-# specify the tools for adding and removing resources
-	XRES		= xres
-
-# 	SETTING: define debug symbols if desired
-ifeq ($(SYMBOLS), TRUE)
-	CFLAGS += -g
-endif
-
-
-# 	platform specific settings
-
-#	x86 Settings
-ifeq ($(CPU), x86)
-#	set the compiler and compiler flags
-	CC		=	gcc
-	##!! change next time : drivers get -no-fpic and -fpic goes away !!
-	CFLAGS	+=	-fpic
-
-#	SETTING: set the proper optimization level
-	ifeq ($(OPTIMIZE), FULL)
-		OPTIMIZER	= -O3
-	else
-	ifeq ($(OPTIMIZE), SOME)
-		OPTIMIZER	= -O1
-	else
-	ifeq ($(OPTIMIZE), NONE)
-		OPTIMIZER	=
-	endif
-	endif
-	endif
-
-	CFLAGS += $(OPTIMIZER)
-	
-#	SETTING: set warning level
-	ifeq ($(WARNINGS), ALL)
-		CFLAGS += -Wall -Wno-multichar -Wno-ctor-dtor-privacy
-	else
-	ifeq ($(WARNINGS), NONE)
-	
-	endif
-	endif
-
-#	set the linker and linker flags
-	LD			= gcc
-	LDFLAGS		=
-
-#	SETTING: set linker flags for each binary type
-	ifeq ($(TYPE), APP)
-		LDFLAGS += -Xlinker -soname=_APP_
-	else
-	ifeq ($(TYPE), SHARED)
-		LDFLAGS += -addon -Xlinker -soname=$(NAME)
-	else
-	ifeq ($(TYPE), DRIVER)
-		LDFLAGS += -nostdlib  /boot/develop/lib/x86/_KERNEL_
-	endif 
-	endif 
-	endif 
-
-else
-
-#	ppc Settings
-ifeq ($(CPU), ppc)
-#	set the compiler and compiler flags
-	CC		=	mwcc
-	CFLAGS	+=	
-
-#	SETTING: set the proper optimization level
-	ifeq ($(OPTIMIZE), FULL)
-		OPTIMIZER	= -O7
-	else
-	ifeq ($(OPTIMIZE), SOME)
-		OPTIMIZER	= -O3
-	else
-	ifeq ($(OPTIMIZE), NONE)
-		OPTIMIZER	=
-	endif
-	endif
-	endif
-
-	CFLAGS += $(OPTIMIZER)
-	
-#	SETTING: set warning level
-	ifeq ($(WARNINGS), ALL)
-		CFLAGS += -w all
-	else
-	ifeq ($(WARNINGS), NONE)
-		CFLAGS += -w 0
-	endif
-	endif
-
-	# clear the standard environment variable
-	# now there are no standard libraries to link against
-	BELIBFILES=
-
-#	set the linker and linker flags
-	LD			= mwldppc
-
-	ifeq ($(TYPE), APP)
-		LDFLAGS += 
-	else
-	ifeq ($(TYPE), SHARED)
-		LDFLAGS += 	-xms 
-	endif
-	endif
-
-	ifeq ($(TYPE), DRIVER)
-		LDFLAGS += -nodefaults \
-					-export all \
-					-G \
-					/boot/develop/lib/ppc/glue-noinit.a \
-					/boot/develop/lib/ppc/_KERNEL_
-	else
-		# override the standard environment variable
-		LDFLAGS +=	-export pragma \
-					-init _init_routine_ \
-					-term _term_routine_ \
-					-lroot \
-					/boot/develop/lib/ppc/glue-noinit.a \
-					/boot/develop/lib/ppc/init_term_dyn.o \
-					/boot/develop/lib/ppc/start_dyn.o 
-					
-	endif
-	
-
-endif
-endif
-
-
-# psuedo-function for converting a list of source files in SRCS variable
-# to a corresponding list of object files in $(OBJ_DIR)/xxx.o
-# The "function" strips off the src file suffix (.ccp or .c or whatever)
-# and then strips of the directory name, leaving just the root file name.
-# It then appends the .o suffix and prepends the $(OBJ_DIR)/ path
-define SRCS_LIST_TO_OBJS
-	$(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(SRCS), \
-	$(basename $(notdir $(file))))))
-endef
-
-OBJS = $(SRCS_LIST_TO_OBJS)
-
-# create a unique list of paths to our sourcefiles
-SRC_PATHS += $(sort $(foreach file, $(SRCS), $(dir $(file))))
-
-# add source paths to VPATH if not already present
-VPATH :=
-VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SRC_PATHS))))
-
-# add source paths and include paths to INLCUDES if not already present
-INCLUDES = $(foreach path, $(INCPATHS) $(SRC_PATHS), $(addprefix -I, $(path)))
-
-
-# SETTING: add the -L prefix to all library paths to search
-LINK_PATHS = $(foreach path, $(LIBPATHS) $(SRC_PATHS) , \
-	$(addprefix -L, $(path)))
-
-# SETTING: add the -l prefix to all libs to be linked against
-LINK_LIBS = $(foreach lib, $(LIBS), $(addprefix -l, $(lib)))
-
-# add to the linker flags 
-LDFLAGS += $(LINK_PATHS) $(LINK_LIBS)
-
-#	SETTING: add the defines to the compiler flags
-CFLAGS += $(foreach define, $(DEFINES), $(addprefix -D, $(define)))
-
-#	SETTING: use the archive tools if building a static library
-#	otherwise use the linker
-ifeq ($(TYPE), STATIC)
-	BUILD_LINE = ar -cru $(NAME) $(OBJS)
-else
-	BUILD_LINE = $(LD) -o $@ $(OBJS) $(LDFLAGS)
-endif
-
-#	create the resource instruction
-	ifeq ($(RSRCS), )
-		DO_RSRCS :=
-	else
-		DO_RSRCS := $(XRES) -o $(TARGET) $(RSRCS)
-	endif
-
-
-#	define the actual work to be done	
-default: $(TARGET)
-
-$(TARGET):	$(OBJ_DIR) $(OBJS) $(RSRCS)
-		$(BUILD_LINE)
-		$(DO_RSRCS)
-		$(MIMESET) -f $@
-
-
-#	rule to create the object file directory if needed
-$(OBJ_DIR)::
-	@[ -d $(OBJ_DIR) ] || mkdir $(OBJ_DIR) > /dev/null 2>&1
-
-$(OBJ_DIR)/%.o : %.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-$(OBJ_DIR)/%.o : %.cpp
-	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-$(OBJ_DIR)/%.o : %.cp
-	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-$(OBJ_DIR)/%.o : %.C
-	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-$(OBJ_DIR)/%.o : %.CC
-	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-$(OBJ_DIR)/%.o : %.CPP
-	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-
-
-#	empty rule. Things that depend on this rule will always get triggered
-FORCE:
-
-#	The generic clean command. Delete everything in the object folder.
-clean :: FORCE
-	-rm -rf $(OBJ_DIR)
-
-#	remove just the application from the object folder
-rmapp ::
-	-rm -f $(TARGET)
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/documentation/files.txt b/src/tests/add-ons/kernel/file_systems/beserved/documentation/files.txt
new file mode 100644
index 0000000000..366e077fe6
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/beserved/documentation/files.txt
@@ -0,0 +1,14 @@
+AuthLib 		(lib)
+BeManager 	(app, gui)
+BeSure		(app, server)
+bt_fs 			(make, driver)
+FileSharing		(app, gui)
+FileSharing-Windows (for Windows)
+lshosts		(app, bin)
+Menus 		(test, can be removed..)
+mounthost		(make, bin)
+MyNetwork	(app, gui)
+server		(app, server, old)
+server-1.2.6	(app, server, new)
+server-Windows (for Windows)
+transport		(lib)
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/lshosts/lshosts_BONE.proj b/src/tests/add-ons/kernel/file_systems/beserved/lshosts/lshosts_BONE.proj
index 6c6c5baacc..52d99237fe 100644
Binary files a/src/tests/add-ons/kernel/file_systems/beserved/lshosts/lshosts_BONE.proj and b/src/tests/add-ons/kernel/file_systems/beserved/lshosts/lshosts_BONE.proj differ
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/betalk.h b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/betalk.h
index af38d0d926..7f2edc112c 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/betalk.h
+++ b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/betalk.h
@@ -19,7 +19,11 @@
 #include "sys/stat.h"
 #include "fcntl.h"
 #include "errno.h"
+#ifdef __BEOS__
+#include <bone/sys/socket.h>
+#else
 #include "socket.h"
+#endif
 #include "ctype.h"
 
 #ifndef NULL
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile
index 0775937489..b083e3d5f0 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile
+++ b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile
@@ -41,8 +41,8 @@ RSRCS=
 # 	if there is another naming scheme use the full binary
 #	name: my_library.so or my_lib.a
 #	libroot.so never needs to be specified here, although libbe.so does
-LIBS= be net besure
-		
+LIBS= be bind socket beserved
+
 
 #	specify the paths to directories where additional
 # 	libraries are to be found.  /boot/develop/lib/PLATFORM/ is
@@ -50,12 +50,12 @@ LIBS= be net besure
 #	makefile.  The paths included may not be recursive, so
 #	specify all of the needed paths explicitly
 #	Directories containing source-files are automatically added.
-LIBPATHS= 
+LIBPATHS= ../transport
 
 #	specify additional directories where header files can be found
 # 	directories where sources are found are included automatically
 #	included.
-INCPATHS=
+INCPATHS=/boot/develop/headers/be/bone/sys
 
 #	specify the level of optimization that you desire
 #	NONE, SOME, FULL
@@ -92,7 +92,7 @@ endif
 	OBJ_DIR		:= obj.$(CPU)
 
 # 	specify that the binary should be created in the object directory
-	TARGET		:= $(OBJ_DIR)/$(NAME)
+	TARGET		:= ../Release/$(NAME)
 
 #	specify the mimeset tool
 	MIMESET		:= mimeset
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile.net_server b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile.net_server
index 0775937489..2021c13149 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile.net_server
+++ b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/makefile.net_server
@@ -41,7 +41,7 @@ RSRCS=
 # 	if there is another naming scheme use the full binary
 #	name: my_library.so or my_lib.a
 #	libroot.so never needs to be specified here, although libbe.so does
-LIBS= be net besure
+LIBS= be net beserved
 		
 
 #	specify the paths to directories where additional
@@ -50,7 +50,7 @@ LIBS= be net besure
 #	makefile.  The paths included may not be recursive, so
 #	specify all of the needed paths explicitly
 #	Directories containing source-files are automatically added.
-LIBPATHS= 
+LIBPATHS= ../transport 
 
 #	specify additional directories where header files can be found
 # 	directories where sources are found are included automatically
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/mounthost.cpp b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/mounthost.cpp
index 336227ad72..df7ba56e86 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/mounthost/mounthost.cpp
+++ b/src/tests/add-ons/kernel/file_systems/beserved/mounthost/mounthost.cpp
@@ -9,7 +9,11 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <Roster.h>
+#ifdef __BEOS__
+#include <bone/sys/socket.h>
+#else
 #include "socket.h"
+#endif
 
 #include "betalk.h"
 #include "rpc.h"
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/Server_BONE.proj b/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/Server_BONE.proj
index 1525835975..912ffbaa7b 100644
Binary files a/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/Server_BONE.proj and b/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/Server_BONE.proj differ
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/fsproto.h b/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/fsproto.h
index a6072837d5..a8719158b8 100644
--- a/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/fsproto.h
+++ b/src/tests/add-ons/kernel/file_systems/beserved/server-1.2.6/fsproto.h
@@ -220,24 +220,24 @@ typedef struct vnode_ops {
 	op_read_query			(*read_query);
 } vnode_ops;
 
-extern _IMPEXP_KERNEL int	new_path(const char *path, char **copy);
-extern _IMPEXP_KERNEL void	free_path(char *p);
+extern int	new_path(const char *path, char **copy);
+extern void	free_path(char *p);
 
-extern _IMPEXP_KERNEL int	notify_listener(int op, nspace_id nsid,
+extern int	notify_listener(int op, nspace_id nsid,
 									vnode_id vnida,	vnode_id vnidb,
 									vnode_id vnidc, const char *name);
-extern _IMPEXP_KERNEL void	notify_select_event(selectsync *sync, uint32 ref);
-extern _IMPEXP_KERNEL int	send_notification(port_id port, long token,
+extern void	notify_select_event(selectsync *sync, uint32 ref);
+extern int	send_notification(port_id port, long token,
 									ulong what, long op, nspace_id nsida,
 									nspace_id nsidb, vnode_id vnida,
 									vnode_id vnidb, vnode_id vnidc,
 									const char *name);
-extern _IMPEXP_KERNEL int	get_vnode(nspace_id nsid, vnode_id vnid, void **data);
-extern _IMPEXP_KERNEL int	put_vnode(nspace_id nsid, vnode_id vnid);
-extern _IMPEXP_KERNEL int	new_vnode(nspace_id nsid, vnode_id vnid, void *data);
-extern _IMPEXP_KERNEL int	remove_vnode(nspace_id nsid, vnode_id vnid);
-extern _IMPEXP_KERNEL int	unremove_vnode(nspace_id nsid, vnode_id vnid);
-extern _IMPEXP_KERNEL int	is_vnode_removed(nspace_id nsid, vnode_id vnid);
+extern int	get_vnode(nspace_id nsid, vnode_id vnid, void **data);
+extern int	put_vnode(nspace_id nsid, vnode_id vnid);
+extern int	new_vnode(nspace_id nsid, vnode_id vnid, void *data);
+extern int	remove_vnode(nspace_id nsid, vnode_id vnid);
+extern int	unremove_vnode(nspace_id nsid, vnode_id vnid);
+extern int	is_vnode_removed(nspace_id nsid, vnode_id vnid);
 
 
 extern _EXPORT vnode_ops	fs_entry;
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/transport/beserved_transport_ZETA-x86.proj b/src/tests/add-ons/kernel/file_systems/beserved/transport/beserved_transport_ZETA-x86.proj
new file mode 100644
index 0000000000..50d608d074
Binary files /dev/null and b/src/tests/add-ons/kernel/file_systems/beserved/transport/beserved_transport_ZETA-x86.proj differ