diff --git a/Jamconfig.in b/Jamconfig.in
index 6273e64..cfc0451 100644
--- a/Jamconfig.in
+++ b/Jamconfig.in
@@ -105,11 +105,6 @@ FLTKINCLUDE      ?= @FLTK_CFLAGS@ ;
 FLTKLIB          ?= @FLTK_LIBS@ ;
 FLTKLIB_NOIMAGES ?= @FLTK_LIBS_NOIMAGES@ ;
 
-# backward; efltk libraries path
-EFLTKINCLUDE      ?= @EFLTK_CFLAGS@ ;
-EFLTKLIB          ?= @EFLTK_LIBS@ ;
-EFLTKLIB_NOIMAGES ?= @EFLTK_LIBS_NOIMAGES@ ;
-
 # Xcomposite
 COMPOSITEINCLUDE ?= @COMPOSITE_CFLAGS@ ;
 COMPOSITELIB     ?= @COMPOSITE_LIBS@ ;
diff --git a/configure.in b/configure.in
index a9634a6..51f4ffd 100644
--- a/configure.in
+++ b/configure.in
@@ -165,12 +165,6 @@ else
 	AC_MSG_ERROR([You don't have FLTK installed. To compile EDE, you will need it.])
 fi
 
-if test "x$with_efltk_path" = "x"; then
-	AC_PATH_PROG(EFLTK_CONFIG, efltk-config)
-else
-	AC_PATH_PROG(EFLTK_CONFIG, efltk-config,, "$with_efltk_path/bin")
-fi
-
 EDE_CHECK_LIBXPM
 if test "$have_libxpm" = "yes"; then
 	FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS"
@@ -249,9 +243,6 @@ AC_SUBST(EDE_DEBUG_FLAGS)
 AC_SUBST(FLTK_CFLAGS)
 AC_SUBST(FLTK_LIBS)
 AC_SUBST(FLTK_LIBS_NOIMAGES)
-AC_SUBST(EFLTK_CFLAGS)
-AC_SUBST(EFLTK_LIBS_NOIMAGES)
-AC_SUBST(EFLTK_LIBS)
 AC_SUBST(EDELIB_API_INDEX)
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
diff --git a/efiler/Fl_Icon_Browser.h b/efiler/Fl_Icon_Browser.h
index 987316d..8e987a3 100644
--- a/efiler/Fl_Icon_Browser.h
+++ b/efiler/Fl_Icon_Browser.h
@@ -34,8 +34,8 @@
 #ifndef Fl_Icon_Browser_H
 #define Fl_Icon_Browser_H
 
-#include <Fl/Fl_Browser_.H>
-#include <Fl/Fl_Image.H>
+#include <FL/Fl_Browser_.H>
+#include <FL/Fl_Image.H>
 
 #include <stdio.h> 
 
diff --git a/m4/pekwm.m4 b/m4/pekwm.m4
index 56c2e7d..8b4e03b 100644
--- a/m4/pekwm.m4
+++ b/m4/pekwm.m4
@@ -15,7 +15,7 @@ AC_LANG_CPLUSPLUS
 
 dnl Stupid way to find iconv; on linux, iconv is part of glibc, for others
 dnl try to search binary, then adjust paths
-if test "x$`uname`" = "xLinux"; then
+if test "x`uname`" = "xLinux"; then
  	LIBICONV=""
  	INCICONV=""
 else
@@ -36,7 +36,7 @@ AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you the i
 
 dnl Assume we have X libs
 PEKWM_CXXFLAGS="$PEKWM_CXXFLAGS $X_CFLAGS"
-PEKWM_LIBS="$PEKWM_LIBS $X_LIBS $X_EXTRA_LIBS"
+PEKWM_LIBS="$PEKWM_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS"
 
 dnl Check for Xinerama support
 AC_MSG_CHECKING([whether to build support for the Xinerama extension])