From 98731302d80db5603b3483ea6697a775cd89d86d Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Wed, 14 Jan 2015 10:15:15 +0100
Subject: [PATCH] fssh_api_wrapper: fix build on non-Haiku.

* I'm not sure why strings.h needs to be included before <new>, but it
wouldn't work otherwise.
---
 headers/private/fs_shell/fssh_api_wrapper.h | 4 ++++
 src/system/kernel/fs/rootfs.cpp             | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h
index 6a9e601ffa..337648f2e2 100644
--- a/headers/private/fs_shell/fssh_api_wrapper.h
+++ b/headers/private/fs_shell/fssh_api_wrapper.h
@@ -6,6 +6,10 @@
 #define _FSSH_API_WRAPPER_H
 
 
+#include <string.h>
+#ifdef __cplusplus
+#include <new>
+#endif
 #include <stdlib.h>
 
 #include "fssh_dirent.h"
diff --git a/src/system/kernel/fs/rootfs.cpp b/src/system/kernel/fs/rootfs.cpp
index 90526ec554..9d00152d76 100644
--- a/src/system/kernel/fs/rootfs.cpp
+++ b/src/system/kernel/fs/rootfs.cpp
@@ -10,10 +10,6 @@
 #if FS_SHELL
 #	include "fssh_api_wrapper.h"
 
-#	undef size_t
-#	include <new>
-#	define size_t fssh_size_t
-
 #	include "KOpenHashTable.h"
 #	include "list.h"
 #else