--- src/mod/rijndael.mod/aes.h	2007-10-18 23:58:44 +0200
+++ src/mod/rijndael.mod/aes.h.new	2007-10-18 23:58:14 +0200
@@ -248,7 +248,7 @@
 } c_name(aes);
 
 cf_dec c_name(set_key)(const byte key[], const word n_bytes, const enum aes_key f, c_name(aes) *cx);
-cf_dec c_name(encrypt)(const byte in_blk[], byte out_blk[], const c_name(aes) *cx);
+cf_dec c_name(encrypted)(const byte in_blk[], byte out_blk[], const c_name(aes) *cx);
 cf_dec c_name(decrypt)(const byte in_blk[], byte out_blk[], const c_name(aes) *cx);
 cf_dec c_name(set_blk)(const word n_bytes, c_name(aes) *cx);
 
@@ -271,8 +271,8 @@
 #endif
     aes_ret set_key(const byte key[], const word n_bytes, const aes_key f)
             { return c_name(set_key)(key, n_bytes, f, &cx); }
-    aes_ret encrypt(const byte in_blk[], byte out_blk[]) const
-            { return c_name(encrypt)(in_blk, out_blk, &cx); }
+    aes_ret encrypted(const byte in_blk[], byte out_blk[]) const
+            { return c_name(encrypted)(in_blk, out_blk, &cx); }
     aes_ret decrypt(const byte in_blk[], byte out_blk[]) const
             { return c_name(decrypt)(in_blk, out_blk, &cx); }
 };
--- src/mod/rijndael.mod/rijndael.c	2007-10-19 00:00:34 +0200
+++ src/mod/rijndael.mod/rijndael.c.new	2007-10-19 00:00:40 +0200
@@ -57,7 +57,7 @@
 {
 	char output[BLOCK_SIZE/8];
 
-	encrypt(input, output, &aes_cx);
+	encrypted(input, output, &aes_cx);
 	memcpy(input, output, BLOCK_SIZE/8);
 }
 
--- src/mod/megahal.mod/megahal.c	2007-10-18 03:39:43 +0200
+++ src/mod/megahal.mod/megahal.c.new	2007-10-18 17:01:28 +0200
@@ -150,9 +150,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #ifndef __APPLE__
-#include <malloc.h>
+#include <stdlib.h>
 #else
-#include <sys/malloc.h>
+#include <sys/stdlib.h>
 #endif
 #include <string.h>
 #include <signal.h>