diff --git a/queries.c b/queries.c
index e602f55..7eaff00 100644
--- a/queries.c
+++ b/queries.c
@@ -27,6 +27,10 @@
 #include <fcntl.h>
 #include <sys/utsname.h>
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 #include "include.h"
 #include "mtproto-client.h"
 #include "queries.h"
diff --git a/tree.h b/tree.h
index 2c86e1c..f75449b 100644
--- a/tree.h
+++ b/tree.h
@@ -21,9 +21,7 @@
 #include <stdio.h>
 
 #include <memory.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
+#include <tools.h>
 #include <assert.h>
 
 #define DEFINE_TREE(X_NAME, X_TYPE, X_CMP, X_UNSET) \
@@ -34,7 +32,7 @@ struct tree_ ## X_NAME { \
 };\
 \
 struct tree_ ## X_NAME *new_tree_node_ ## X_NAME (X_TYPE x, int y) {\
-  struct tree_ ## X_NAME *T = malloc (sizeof (*T));\
+  struct tree_ ## X_NAME *T = talloc (sizeof (*T));\
   T->x = x;\
   T->y = y;\
   T->left = T->right = 0;\