diff --git a/GNUbase.mk b/GNUbase.mk
index 5f0a6ca2..cbfe183e 100644
--- a/GNUbase.mk
+++ b/GNUbase.mk
@@ -45,7 +45,7 @@ $(OBJDIR)/%.o: %.m $(xHFILES) | $$(dir $$@).phony
 .PRECIOUS: %/.phony
 
 ui.h: ui.idl
-	idl2h -extern _UI_EXTERN < ui.idl > ui.h
+	idl2h -extern _UI_EXTERN -guard __UI_UI_H__ < ui.idl > ui.h
 
 clean:
 	rm -rf $(OUTDIR) $(OBJDIR) ui.h
diff --git a/ui.idl b/ui.idl
index 76d6fee6..6de4e4a5 100644
--- a/ui.idl
+++ b/ui.idl
@@ -6,11 +6,6 @@
 
 package ui {
 
-// TODO autogenerate this somehow
-// TODO alternatively, move AFTER typedefs
-raw "#ifndef __UI_UI_H__";
-raw "#define __UI_UI_H__";
-
 raw "#include <stdint.h>";
 
 raw "#ifndef _UI_EXTERN";
@@ -133,6 +128,4 @@ interface MenuItem {
 	func SetChecked(checked int);
 };
 
-raw "#endif";
-
 };