--- Eterm-0.9.6/src/command.h
+++ Eterm-0.9.6/src/command.h
@@ -353,7 +353,6 @@ _XFUNCPROTOBEGIN
 #ifdef HAVE_U_STACK_TRACE
 extern void U_STACK_TRACE(void);
 #endif
-extern char *ptsname();
 extern void privileges(int);
 extern char *sig_to_str(int);
 extern const char *event_type_to_name(int);
--- Eterm-0.9.6/src/feature.h
+++ Eterm-0.9.6/src/feature.h
@@ -319,4 +319,9 @@ inline void *memmove(void *, const void
 # undef UTMP_SUPPORT
 #endif
 
+/* LibAST 0.8 no longer provides MEMSET */
+#ifndef MEMSET
+# define MEMSET(s, c, n) memset((s), (c), (n))
+#endif
+
 #endif	/* _FEATURE_H_ */
--- Eterm-0.9.6/src/pixmap.c
+++ Eterm-0.9.6/src/pixmap.c
@@ -172,7 +172,7 @@ image_mode_any(unsigned char mode)
 
 #ifdef PIXMAP_SUPPORT
 const char *
-imlib_strerror(Imlib_Load_Error err)
+eterm_imlib_strerror(Imlib_Load_Error err)
 {
     switch (err) {
         case IMLIB_LOAD_ERROR_NONE:
@@ -1447,7 +1447,7 @@ load_image(const char *file, simage_t *s
         if (f) {
             im = imlib_load_image_with_error_return(f, &im_err);
             if (!im) {
-                libast_print_error("Unable to load image file \"%s\" -- %s\n", file, imlib_strerror(im_err));
+                libast_print_error("Unable to load image file \"%s\" -- %s\n", file, eterm_imlib_strerror(im_err));
                 return 0;
             } else {
                 reset_simage(simg, (RESET_IMLIB_IM | RESET_PMAP_PIXMAP | RESET_PMAP_MASK));
@@ -2178,7 +2178,7 @@ set_icon_pixmap(char *filename, XWMHints
 
             temp_im = imlib_load_image_with_error_return(icon_path, &im_err);
             if (!temp_im) {
-                libast_print_error("Unable to load icon file \"%s\" -- %s\n", icon_path, imlib_strerror(im_err));
+                libast_print_error("Unable to load icon file \"%s\" -- %s\n", icon_path, eterm_imlib_strerror(im_err));
             } else {
                 /* If we're going to render the image anyway, might as well be nice and give it to the WM in a size it likes. */
                 if (XGetIconSizes(Xdisplay, Xroot, &icon_sizes, &count)) {
--- Eterm-0.9.6/src/pixmap.h
+++ Eterm-0.9.6/src/pixmap.h
@@ -221,7 +221,7 @@ _XFUNCPROTOBEGIN
 extern const char *get_image_type(unsigned char);
 extern unsigned char image_mode_any(unsigned char);
 #ifdef PIXMAP_SUPPORT
-extern const char *imlib_strerror(Imlib_Load_Error);
+extern const char *eterm_imlib_strerror(Imlib_Load_Error);
 extern unsigned short parse_pixmap_ops(char *);
 extern unsigned short set_pixmap_scale(const char *, pixmap_t *);
 extern unsigned char check_image_ipc(unsigned char);
--- Eterm-0.9.6/src/screen.c
+++ Eterm-0.9.6/src/screen.c
@@ -2857,9 +2857,9 @@ selection_click(int clicks, int x, int y
 
 /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
 #ifdef CUTCHAR_OPTION
-#  define DELIMIT_TEXT(x) (strchr((rs_cutchars ? rs_cutchars : CUTCHARS), (x)))
+#  define DELIMIT_TEXT(x) (strchr((rs_cutchars ? rs_cutchars : CUTCHARS), (x)) != NULL)
 #else
-#  define DELIMIT_TEXT(x) (strchr(CUTCHARS, (x)))
+#  define DELIMIT_TEXT(x) (strchr(CUTCHARS, (x)) != NULL)
 #endif
 #ifdef MULTI_CHARSET
 #define DELIMIT_REND(x)	(((x) & RS_multiMask) ? 1 : 0)