2 files changed, 4 insertions, 8 deletions
diff --git a/include/ast.h b/include/ast.h
index b14c26d..ef06257 100644
--- a/include/ast.h
+++ b/include/ast.h
@@ -43,15 +43,12 @@ struct LhsExpr {
 };
 
 Ast ast_none();
-void ast_deinit(Ast *ast);
 
-void funcdecl_init(FunctionDecl *self);
-void funcdecl_deinit(FunctionDecl *self);
+CHECK_RESULT int funcdecl_init(FunctionDecl *self, ScopedAllocator *allocator);
 CHECK_RESULT int funcdecl_add_to_body(FunctionDecl *self, Ast ast);
 
 void funccall_init(FunctionCall *self, BufferView name);
 
 void lhsexpr_init(LhsExpr *self, int isConst, BufferView var_name);
-void lhsexpr_deinit(LhsExpr *self);
 
 #endif
diff --git a/include/buffer.h b/include/buffer.h
index c45fbde..700ae7b 100644
--- a/include/buffer.h
+++ b/include/buffer.h
@@ -1,20 +1,19 @@
 #ifndef AMALGAM_BUFFER_H
 #define AMALGAM_BUFFER_H
 
-#include "types.h"
-#include "misc.h"
+#include "scoped_allocator.h"
 
 #define BUFFER_OK 0
 #define BUFFER_ALLOC_FAIL -1
 
 typedef struct {
+    ScopedAllocator *allocator;
     char* data;
     usize size;
     usize capacity;
 } Buffer;
 
-void buffer_init(Buffer *self);
-void buffer_deinit(Buffer *self);
+CHECK_RESULT int buffer_init(Buffer *self, ScopedAllocator *allocator, usize initial_capacity);
 
 CHECK_RESULT int buffer_append(Buffer *self, void *data, usize size);
 void* buffer_get(Buffer *self, usize index, usize type_size);