diff --git a/src/bin/Disk.hx b/src/bin/Disk.hx
index 00671f3..6118de6 100644
--- a/src/bin/Disk.hx
+++ b/src/bin/Disk.hx
@@ -6,6 +6,7 @@ import kernel.peripherals.Peripherals.Peripheral;
 using tink.CoreApi;
 using Lambda;
 
+@:build(macros.Binstore.includeBin("Disk", ["disk"]))
 class Disk extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("ls", (args) -> {
diff --git a/src/bin/GPS.hx b/src/bin/GPS.hx
index 18a0712..4ca1dde 100644
--- a/src/bin/GPS.hx
+++ b/src/bin/GPS.hx
@@ -7,6 +7,7 @@ import lib.Vec.Vec3;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("GPS", ["gps"]))
 class GPS extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("set", (args) -> {
diff --git a/src/bin/HelloWorld.hx b/src/bin/HelloWorld.hx
index 6e5ef93..6336497 100644
--- a/src/bin/HelloWorld.hx
+++ b/src/bin/HelloWorld.hx
@@ -6,18 +6,13 @@ import kernel.ps.Process;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("Hello world", ["hello"]))
 class HelloWorld implements Process {
 	public function new() {}
 
 	public function run(handle:ProcessHandle) {
 		handle.write("Hello World!");
 
-		var c = new HelloWorldServiceRPC(0);
-
-		c.getNumber(2, 3).handle((res) -> {
-			Log.debug("Got number: " + res);
-		});
-
 		handle.close();
 	}
 }
diff --git a/src/bin/ID.hx b/src/bin/ID.hx
index 0f48e93..a0bcefd 100644
--- a/src/bin/ID.hx
+++ b/src/bin/ID.hx
@@ -3,6 +3,7 @@ package bin;
 import kernel.ps.ProcessHandle;
 import kernel.ps.Process;
 
+@:build(macros.Binstore.includeBin("ID", ["id"]))
 class ID implements Process {
 	public function new() {}
 
diff --git a/src/bin/KSettings.hx b/src/bin/KSettings.hx
index dce2467..e3fbe0f 100644
--- a/src/bin/KSettings.hx
+++ b/src/bin/KSettings.hx
@@ -3,6 +3,7 @@ package bin;
 import kernel.KernelSettings;
 import lib.CLIAppBase;
 
+@:build(macros.Binstore.includeBin("Kernel settings", ["ksettings", "kset"]))
 class KSettings extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("get", (args) -> {
diff --git a/src/bin/KernelLog.hx b/src/bin/KernelLog.hx
index d164049..9c4a5c4 100644
--- a/src/bin/KernelLog.hx
+++ b/src/bin/KernelLog.hx
@@ -10,6 +10,7 @@ import lib.ui.UIApp;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("Log", ["log"]))
 class KernelLog implements Process {
 	private var handle:ProcessHandle;
 	private var ctx:WindowContext;
diff --git a/src/bin/LSPS.hx b/src/bin/LSPS.hx
index 059afbe..fb62bea 100644
--- a/src/bin/LSPS.hx
+++ b/src/bin/LSPS.hx
@@ -4,6 +4,7 @@ import kernel.ps.ProcessManager;
 import kernel.ps.ProcessHandle;
 import kernel.ps.Process;
 
+@:build(macros.Binstore.includeBin("LSPS", ["lsps"]))
 class LSPS implements Process {
 	public function new() {}
 
diff --git a/src/bin/Net.hx b/src/bin/Net.hx
index 0896760..b6a8bec 100644
--- a/src/bin/Net.hx
+++ b/src/bin/Net.hx
@@ -6,6 +6,7 @@ import kernel.net.Routing;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("Net", ["net"]))
 class Net extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("route", (args) -> {
diff --git a/src/bin/Perf.hx b/src/bin/Perf.hx
index 7cdcf81..e4e4ac0 100644
--- a/src/bin/Perf.hx
+++ b/src/bin/Perf.hx
@@ -3,6 +3,7 @@ package bin;
 import kernel.peripherals.Peripherals.Peripheral;
 import lib.CLIAppBase;
 
+@:build(macros.Binstore.includeBin("Peripheral", ["ph", "peripheral"]))
 class Perf extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("inspect", (args) -> {
diff --git a/src/bin/Redstone.hx b/src/bin/Redstone.hx
index e4de191..020fec5 100644
--- a/src/bin/Redstone.hx
+++ b/src/bin/Redstone.hx
@@ -5,6 +5,7 @@ import kernel.peripherals.Peripherals.Peripheral;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("Redstone", ["redstone", "rs"]))
 class Redstone extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("on", (args) -> {
diff --git a/src/bin/Service.hx b/src/bin/Service.hx
index 67dcc8b..fd92bfe 100644
--- a/src/bin/Service.hx
+++ b/src/bin/Service.hx
@@ -5,6 +5,7 @@ import lib.CLIAppBase;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("Service", ["srv"]))
 class Service extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("start", (args) -> {
diff --git a/src/bin/Terminal.hx b/src/bin/Terminal.hx
index 43346af..5c7bb6f 100644
--- a/src/bin/Terminal.hx
+++ b/src/bin/Terminal.hx
@@ -10,6 +10,7 @@ import kernel.ui.WindowContext;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("Terminal", ["terminal"]))
 class Terminal implements Process {
 	private static inline final MAX_BACKLOG:Int = 100;
 
diff --git a/src/bin/Turtle.hx b/src/bin/Turtle.hx
index c1e46a4..41056df 100644
--- a/src/bin/Turtle.hx
+++ b/src/bin/Turtle.hx
@@ -4,6 +4,7 @@ import lib.CLIAppBase;
 
 using tink.CoreApi;
 
+@:build(macros.Binstore.includeBin("Turtle", ["turtle", "t"]))
 class Turtle extends CLIAppBase {
 	public function new() {
 		registerSyncSubcommand("forward", (args) -> {