@@ -47,12 +47,12 @@
 #include "tclreadline.h"
 static const char* tclrl_library = TCLRL_LIBRARY;
 static const char* tclrl_version_str = TCLRL_VERSION_STR;
 static const char* tclrl_patchlevel_str = TCLRL_PATCHLEVEL_STR;
 
-#define MALLOC(size) Tcl_Alloc((int) size)
-#define FREE(ptr) if (ptr) { Tcl_Free((char*) ptr); ptr = 0; }
+#define MALLOC(size) malloc((int) size)
+#define FREE(ptr) if (ptr) { free((char*) ptr); ptr = 0; }
 
 enum {
     _CMD_SET     = (1 << 0),
     _CMD_GET     = (1 << 1)
 };
@@ -743,11 +743,11 @@
 	}
 	Tcl_ResetResult(tclrl_interp); /* clear result space */
     }
 
     if (!matches && tclrl_use_builtin_completer) {
-	matches = completion_matches(text, TclReadline0generator);
+	matches = rl_completion_matches(text, (rl_compentry_func_t *)TclReadline0generator);
     }
 
     return matches;
 }