diff --git a/fastbril/Makefile b/fastbril/Makefile
index 4b8529a5e..1635e59e9 100644
--- a/fastbril/Makefile
+++ b/fastbril/Makefile
@@ -74,7 +74,7 @@ $(GEN_TEX): $(configs) docgen.sh docgen.awk
 
 clean:
 	find . -name "*.aux" -o -name "*.log" -o -name "*.pdf" -o -name  "*~" -o \
-	-name "*.gcda" -o -name "*.gcno" | xargs rm || true
+	-name "*.gcda" -o -name "*.gcno" -o -name "*.o" | xargs rm || true
 	$(RM) $(GEN_HEAD)
 	$(RM) $(GEN_TEX)
 	$(RM) -r $(BUILD_DIR)
diff --git a/fastbril/lib/base.h b/fastbril/lib/base.h
deleted file mode 100644
index 0e487e6f8..000000000
--- a/fastbril/lib/base.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#define CONST 1
-#define ADD 2
-#define MUL 3
-#define SUB 4
-#define DIV 5
-#define EQ 6
-#define LT 7
-#define GT 8
-#define LE 9
-#define GE 10
-#define NOT 11
-#define AND 12
-#define OR 13
-#define JMP 14
-#define BR 15
-#define CALL 16
-#define RET 17
-#define PRINT 18
-#define LCONST 19
-#define NOP 20
-#define ID 21
diff --git a/fastbril/lib/float.h b/fastbril/lib/float.h
deleted file mode 100644
index 076e438f7..000000000
--- a/fastbril/lib/float.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define FADD 28
-#define FMUL 29
-#define FSUB 30
-#define FDIV 31
-#define FEQ 32
-#define FLT 33
-#define FLE 34
-#define FGT 35
-#define FGE 36
diff --git a/fastbril/lib/mem.h b/fastbril/lib/mem.h
deleted file mode 100644
index d65bb6089..000000000
--- a/fastbril/lib/mem.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ALLOC 23
-#define FREE 24
-#define STORE 25
-#define LOAD 26
-#define PTRADD 27
diff --git a/fastbril/lib/ssa.h b/fastbril/lib/ssa.h
deleted file mode 100644
index 7c38d2a90..000000000
--- a/fastbril/lib/ssa.h
+++ /dev/null
@@ -1 +0,0 @@
-#define PHI 22
diff --git a/fastbril/lib/types.h b/fastbril/lib/types.h
deleted file mode 100644
index 6ffd0adc3..000000000
--- a/fastbril/lib/types.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define BRILINT 0
-#define BRILBOOL 1
-#define BRILFLOAT 2
-#define BRILVOID 3
diff --git a/fastbril/src/.gitignore b/fastbril/src/.gitignore
new file mode 100644
index 000000000..8f192d813
--- /dev/null
+++ b/fastbril/src/.gitignore
@@ -0,0 +1,5 @@
+base.h
+float.h
+mem.h
+ssa.h
+types.h
diff --git a/fastbril/src/base.h b/fastbril/src/base.h
deleted file mode 100644
index 0e487e6f8..000000000
--- a/fastbril/src/base.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#define CONST 1
-#define ADD 2
-#define MUL 3
-#define SUB 4
-#define DIV 5
-#define EQ 6
-#define LT 7
-#define GT 8
-#define LE 9
-#define GE 10
-#define NOT 11
-#define AND 12
-#define OR 13
-#define JMP 14
-#define BR 15
-#define CALL 16
-#define RET 17
-#define PRINT 18
-#define LCONST 19
-#define NOP 20
-#define ID 21
diff --git a/fastbril/src/float.h b/fastbril/src/float.h
deleted file mode 100644
index 076e438f7..000000000
--- a/fastbril/src/float.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define FADD 28
-#define FMUL 29
-#define FSUB 30
-#define FDIV 31
-#define FEQ 32
-#define FLT 33
-#define FLE 34
-#define FGT 35
-#define FGE 36
diff --git a/fastbril/src/mem.h b/fastbril/src/mem.h
deleted file mode 100644
index d65bb6089..000000000
--- a/fastbril/src/mem.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ALLOC 23
-#define FREE 24
-#define STORE 25
-#define LOAD 26
-#define PTRADD 27
diff --git a/fastbril/src/ssa.h b/fastbril/src/ssa.h
deleted file mode 100644
index 7c38d2a90..000000000
--- a/fastbril/src/ssa.h
+++ /dev/null
@@ -1 +0,0 @@
-#define PHI 22
diff --git a/fastbril/src/types.h b/fastbril/src/types.h
deleted file mode 100644
index 6ffd0adc3..000000000
--- a/fastbril/src/types.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define BRILINT 0
-#define BRILBOOL 1
-#define BRILFLOAT 2
-#define BRILVOID 3
diff --git a/fastbril/srcgen.awk b/fastbril/srcgen.awk
index 96831bb18..981a4b063 100755
--- a/fastbril/srcgen.awk
+++ b/fastbril/srcgen.awk
@@ -1,4 +1,4 @@
-#!/usr/bin/env awk -f
+#!/usr/bin/env -S awk -f
 
 {
     if($0 != "")