diff --git a/src/avian/lzma-util.h b/src/avian/lzma-util.h
index 16673e0f28..121b32f262 100644
--- a/src/avian/lzma-util.h
+++ b/src/avian/lzma-util.h
@@ -11,10 +11,10 @@
 #ifndef LZMA_UTIL_H
 #define LZMA_UTIL_H
 
-#include "avian/lzma.h"
-#include "C/Types.h"
+#include <avian/lzma.h>
+#include <C/Types.h>
 #include <avian/system/system.h>
-#include "avian/util/allocator.h"
+#include <avian/util/allocator.h>
 
 namespace vm {
 
@@ -22,13 +22,13 @@ const unsigned Padding = 16;
 
 class LzmaAllocator {
  public:
-  LzmaAllocator(Allocator* a): a(a) {
+  LzmaAllocator(avian::util::Allocator* a): a(a) {
     allocator.Alloc = allocate;
     allocator.Free = free;
   }
 
   ISzAlloc allocator;
-  Allocator* a;
+  avian::util::Allocator* a;
 
   static void* allocate(void* allocator, size_t size) {
     uint8_t* p = static_cast<uint8_t*>
diff --git a/src/lzma-decode.cpp b/src/lzma-decode.cpp
index 86c859e9eb..d9e4cb1218 100644
--- a/src/lzma-decode.cpp
+++ b/src/lzma-decode.cpp
@@ -29,7 +29,7 @@ read4(const uint8_t* in)
 namespace vm {
 
 uint8_t*
-decodeLZMA(System* s, Allocator* a, uint8_t* in, unsigned inSize,
+decodeLZMA(System* s, avian::util::Allocator* a, uint8_t* in, unsigned inSize,
            unsigned* outSize)
 {
   const unsigned PropHeaderSize = 5;