diff --git a/libctru/include/3ds/util/rbtree.h b/libctru/include/3ds/util/rbtree.h
index 5b27892..838642e 100644
--- a/libctru/include/3ds/util/rbtree.h
+++ b/libctru/include/3ds/util/rbtree.h
@@ -4,7 +4,12 @@
  */
 #pragma once
 
+#ifdef _3DS
 #include <3ds/synchronization.h>
+#else
+#include <pthread.h>
+#endif
+#include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/libctru/source/util/rbtree/rbtree_remove.c b/libctru/source/util/rbtree/rbtree_remove.c
index 2de1cbd..df1cd6a 100644
--- a/libctru/source/util/rbtree/rbtree_remove.c
+++ b/libctru/source/util/rbtree/rbtree_remove.c
@@ -1,4 +1,5 @@
 #include <3ds/util/rbtree.h>
+#include <3ds/svc.h>
 #include "rbtree_internal.h"
 
 static void
diff --git a/libctru/source/util/rbtree/test/Makefile b/libctru/source/util/rbtree/test/Makefile
index 87835e0..d19eadb 100644
--- a/libctru/source/util/rbtree/test/Makefile
+++ b/libctru/source/util/rbtree/test/Makefile
@@ -4,7 +4,12 @@ CXXFILES := $(wildcard *.cpp)
 OFILES   := $(patsubst ../%,%,$(CFILES:.c=.c.o))
 OXXFILES := $(CXXFILES:.cpp=.cpp.o)
 
-CPPFLAGS := -Wall -g -I../../../../include -O2
+CPPFLAGS := -Wall -g -I../../../../include -O2 \
+            -D"LightLock=pthread_mutex_t" \
+            -D"LightLock_Init(x)=pthread_mutex_init(x, NULL)" \
+            -D"LightLock_Lock(x)=pthread_mutex_lock(x)" \
+            -D"LightLock_Unlock(x)=pthread_mutex_unlock(x)"
+
 CFLAGS   := $(CPPFLAGS)
 CXXFLAGS := $(CPPFLAGS) -std=c++11
 
diff --git a/libctru/source/util/rbtree/test/main.cpp b/libctru/source/util/rbtree/test/main.cpp
index ed45f06..6e2627e 100644
--- a/libctru/source/util/rbtree/test/main.cpp
+++ b/libctru/source/util/rbtree/test/main.cpp
@@ -76,6 +76,7 @@ void printTree(const rbtree_t *tree)
 
 void svcBreak(UserBreakType breakReason)
 {
+  std::abort();
 }
 
 int main(int argc, char *argv[])