diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/kprotos.h b/src/tests/add-ons/kernel/file_systems/fs_shell/kprotos.h
index ace5e0e907..64e3b41efc 100644
--- a/src/tests/add-ons/kernel/file_systems/fs_shell/kprotos.h
+++ b/src/tests/add-ons/kernel/file_systems/fs_shell/kprotos.h
@@ -1,6 +1,15 @@
+#ifndef KPROTOS_H
+#define KPROTOS_H
+
+#include "myfs.h"
+
 #define my_stat stat
 #define my_dirent dirent
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int sys_symlink(bool kernel, const char *oldpath, int nfd,
 			const char *newpath);
 ssize_t sys_readlink(bool kernel, int fd, const char *path, char *buf,
@@ -51,3 +60,9 @@ int sys_read_query(bool kernel, int fd, const char *path, void *cookie,struct di
 int init_vnode_layer(void);
 void *install_file_system(vnode_ops *ops, const char *name,
                           bool fixed, image_id aid);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* KPROTOS_H */
diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/lock.h b/src/tests/add-ons/kernel/file_systems/fs_shell/lock.h
index c8fe856a57..25c64f0791 100644
--- a/src/tests/add-ons/kernel/file_systems/fs_shell/lock.h
+++ b/src/tests/add-ons/kernel/file_systems/fs_shell/lock.h
@@ -1,6 +1,11 @@
 #ifndef _LOCK_H
 #define _LOCK_H
 
+#ifdef __cplusplus
+extern "C" {
+//#	define lock fsh_lock
+#endif
+
 typedef struct lock lock;
 typedef struct mlock mlock;
 
@@ -25,4 +30,8 @@ extern int  free_mlock(mlock *l);
 #define     LOCKM(l,cnt)    acquire_sem_etc(l.s, cnt, 0, 0.0)
 #define     UNLOCKM(l,cnt)  release_sem_etc(l.s, cnt, 0)
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _LOCK_H */