1 files changed, 14 insertions, 3 deletions
diff --git a/x2p/a2p.h b/x2p/a2p.h
index a51db47a6e..a6dfd1d2ad 100644
--- a/x2p/a2p.h
+++ b/x2p/a2p.h
@@ -8,7 +8,6 @@
  * $Log:	a2p.h,v $
  */
 
-#include "../embed.h"
 #define VOIDUSED 1
 #include "../config.h"
 
@@ -31,7 +30,6 @@
 #  include <sys/types.h>
 #endif
 
-
 #ifdef USE_NEXT_CTYPE
 
 #if NX_CURRENT_COMPILER_RELEASE >= 400
@@ -46,6 +44,15 @@
 
 #define MEM_SIZE Size_t
 
+#ifdef STANDARD_C
+#   include <stdlib.h>
+#else
+    Malloc_t malloc _((MEM_SIZE nbytes));
+    Malloc_t calloc _((MEM_SIZE elements, MEM_SIZE size));
+    Malloc_t realloc _((Malloc_t where, MEM_SIZE nbytes));
+    Free_t   free _((Malloc_t where));
+#endif
+
 #if defined(I_STRING) || defined(__cplusplus)
 #   include <string.h>
 #else
@@ -105,7 +112,11 @@ char *strchr(), *strrchr();
 char *strcpy(), *strcat();
 #endif /* ! STANDARD_C */
 
-#include "handy.h"
+#include "../handy.h"
+
+#undef Nullfp
+#define Nullfp Null(FILE*)
+
 #define Nullop 0
 
 #define OPROG		1