5 files changed, 10 insertions, 10 deletions
diff --git a/src/user/app/drawmouse/drawmouse.c b/src/user/app/drawmouse/drawmouse.c
index 6ddfc79..6e2a881 100644
--- a/src/user/app/drawmouse/drawmouse.c
+++ b/src/user/app/drawmouse/drawmouse.c
@@ -1,4 +1,4 @@
-#include <camellia/flags.h>
+#include <camellia.h>
 #include <camellia/syscalls.h>
 #include <shared/container/ring.h>
 #include <stdbool.h>
@@ -50,7 +50,7 @@ struct packet {
 
 int main(void) {
 	char buf[64];
-	handle_t fd = _syscall_open("/kdev/ps2/mouse", 15, OPEN_READ);
+	handle_t fd = camellia_open("/kdev/ps2/mouse", OPEN_READ);
 	if (fd < 0) {
 		eprintf("couldn't open mouse");
 		return 1;
diff --git a/src/user/app/iochk/iochk.c b/src/user/app/iochk/iochk.c
index 92975be..e4b0346 100644
--- a/src/user/app/iochk/iochk.c
+++ b/src/user/app/iochk/iochk.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include <camellia/flags.h>
+#include <camellia.h>
 #include <camellia/syscalls.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -85,7 +85,7 @@ int main(int argc, char **argv) {
 	for (; optind < argc; optind++) {
 		const char *path = argv[optind];
 		verbosef("checking %s...\n", path);
-		handle_t h = _syscall_open(path, strlen(path), OPEN_READ);
+		handle_t h = camellia_open(path, OPEN_READ);
 		if (h < 0) {
 			eprintf("couldn't open %s", path);
 			continue;
diff --git a/src/user/app/netdog/nd.c b/src/user/app/netdog/nd.c
index 8c16bb0..93e1d3a 100644
--- a/src/user/app/netdog/nd.c
+++ b/src/user/app/netdog/nd.c
@@ -1,4 +1,4 @@
-#include <camellia/flags.h>
+#include <camellia.h>
 #include <camellia/syscalls.h>
 #include <stdio.h>
 #include <string.h>
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
-	conn = _syscall_open(argv[1], strlen(argv[1]), OPEN_RW);
+	conn = camellia_open(argv[1], OPEN_RW);
 	if (conn < 0) {
 		eprintf("couldn't open '%s', err %u", argv[1], -conn);
 		return -conn;
diff --git a/src/user/app/netstack/netstack.c b/src/user/app/netstack/netstack.c
index c0934fd..852cd37 100644
--- a/src/user/app/netstack/netstack.c
+++ b/src/user/app/netstack/netstack.c
@@ -1,6 +1,6 @@
 #include "proto.h"
 #include "util.h"
-#include <camellia/flags.h>
+#include <camellia.h>
 #include <camellia/syscalls.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
 		eprintf("usage: netstack iface ip gateway");
 		return 1;
 	}
-	state.raw_h = _syscall_open(argv[1], strlen(argv[1]), OPEN_RW);
+	state.raw_h = camellia_open(argv[1], OPEN_RW);
 	if (state.raw_h < 0) {
 		eprintf("couldn't open %s", argv[1]);
 		return 1;
diff --git a/src/user/app/shell/builtins.c b/src/user/app/shell/builtins.c
index a23e501..6368633 100644
--- a/src/user/app/shell/builtins.c
+++ b/src/user/app/shell/builtins.c
@@ -1,6 +1,6 @@
 #include "builtins.h"
 #include "shell.h"
-#include <camellia/flags.h>
+#include <camellia.h>
 #include <camellia/path.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -61,7 +61,7 @@ void cmd_getsize(int argc, char **argv) {
 	}
 
 	for (int i = 1; i < argc; i++) {
-		handle_t h = _syscall_open(argv[i], strlen(argv[i]), OPEN_READ);
+		handle_t h = camellia_open(argv[i], OPEN_READ);
 		if (h < 0) {
 			eprintf("error opening %s", argv[i]);
 			continue;