diff --git a/nx/Makefile b/nx/Makefile
index 7f49ea75..05c4fa20 100644
--- a/nx/Makefile
+++ b/nx/Makefile
@@ -24,7 +24,7 @@ VERSION	:=	$(LIBNX_MAJOR).$(LIBNX_MINOR).$(LIBNX_PATCH)
 #---------------------------------------------------------------------------------
 TARGET		:=	nx
 #BUILD		:=	build
-SOURCES		:=	source/arm source/runtime source/kernel source/runtime/devices source/services source/display source/nvidia source/nvidia/ioctl source/runtime/util/utf
+SOURCES		:=	source/arm source/kernel source/services source/display source/nvidia source/nvidia/gpu source/nvidia/ioctl source/runtime source/runtime/devices source/runtime/util/utf
 DATA		:=	data
 INCLUDES	:=	include
 
diff --git a/nx/include/switch.h b/nx/include/switch.h
index fd0d07fb..8213090b 100644
--- a/nx/include/switch.h
+++ b/nx/include/switch.h
@@ -52,6 +52,7 @@ extern "C" {
 #include "switch/nvidia/buffer.h"
 #include "switch/nvidia/address_space.h"
 #include "switch/nvidia/channel.h"
+#include "switch/nvidia/gpu/gpu.h"
 
 #include "switch/runtime/env.h"
 
diff --git a/nx/include/switch/nvidia/gpu/gpu.h b/nx/include/switch/nvidia/gpu/gpu.h
new file mode 100644
index 00000000..6c0d2d53
--- /dev/null
+++ b/nx/include/switch/nvidia/gpu/gpu.h
@@ -0,0 +1,7 @@
+typedef struct {
+    NvAddressSpace addr_space;
+    NvChannel gpu_channel;
+} NvGpu;
+
+Result nvgpuCreate(NvGpu* g);
+void   nvgpuClose(NvGpu* g);
diff --git a/nx/source/display/binder.c b/nx/source/display/binder.c
index be280a34..20a645db 100644
--- a/nx/source/display/binder.c
+++ b/nx/source/display/binder.c
@@ -68,7 +68,7 @@ Result binderInitSession(Binder* b, u32 unk0)
     return rc;
 }
 
-void binderExitSession(Binder* b)
+void binderClose(Binder* b)
 {
     if (!b->created)
         return;
diff --git a/nx/source/nvidia/gpu/gpu.c b/nx/source/nvidia/gpu/gpu.c
index 7ba6717c..726c0396 100644
--- a/nx/source/nvidia/gpu/gpu.c
+++ b/nx/source/nvidia/gpu/gpu.c
@@ -1,10 +1,5 @@
 #include <switch.h>
 
-typedef struct {
-    NvAddressSpace addr_space;
-    NvChannel gpu_channel;
-} NvGpu;
-
 Result nvgpuCreate(NvGpu* g)
 {
     Result rc;
diff --git a/nx/source/nvidia/ioctl/channel.c b/nx/source/nvidia/ioctl/nvchannel.c
similarity index 100%
rename from nx/source/nvidia/ioctl/channel.c
rename to nx/source/nvidia/ioctl/nvchannel.c