diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 0259c41067..80ed084671 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,14 @@
+2012-08-19  Vincent Torri  <doursse at users dot sf dot net>
+
+	* configure.ac:
+	* src/bin/Makefile.am:
+	* src/lib/Makefile.am:
+	* src/lib/dlfcn/:
+	Less automake stuff.
+
+	* src/lib/gdtoa/gdtoaimp.h:
+	fix redundant declarations.
+
 2012-07-21  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/Makefile.am:
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index 8a9bd5325b..0682c70d59 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -139,8 +139,6 @@ doc/Makefile
 src/Makefile
 src/bin/Makefile
 src/lib/Makefile
-src/lib/dlfcn/Makefile
-src/lib/gdtoa/Makefile
 ])
 
 AC_OUTPUT
diff --git a/legacy/evil/src/bin/Makefile.am b/legacy/evil/src/bin/Makefile.am
index c0120336e0..9748cdea59 100644
--- a/legacy/evil/src/bin/Makefile.am
+++ b/legacy/evil/src/bin/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/bin \
 -I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/dlfcn \
 @win32_cppflags@
 
 AM_CFLAGS = @win32_cflags@
@@ -46,7 +45,7 @@ evil_suite_SOURCES +=  memcpy_glibc_arm.S
 
 endif
 
-evil_suite_LDADD = $(top_builddir)/src/lib/dlfcn/libdl.la $(top_builddir)/src/lib/libevil.la -lm
+evil_suite_LDADD = $(top_builddir)/src/lib/libdl.la $(top_builddir)/src/lib/libevil.la -lm
 evil_suite_LDFLAGS = -Wl,--enable-auto-import
 
 test_evil_SOURCES = test_evil.c
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index 7c16667b22..bbcb1729ed 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -1,9 +1,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = gdtoa . dlfcn
-
-lib_LTLIBRARIES = libevil.la
+lib_LTLIBRARIES = libevil.la libdl.la
 
 install_evilheadersdir = $(includedir)/evil-@VMAJ@
 dist_install_evilheaders_DATA = \
@@ -24,7 +22,7 @@ evil_unistd.h \
 evil_util.h
 
 stdheadersdir = $(includedir)/evil-@VMAJ@
-nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h
+nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h
 
 if EVIL_HAVE_WINCE
 
@@ -32,7 +30,36 @@ nobase_dist_stdheaders_DATA += mingw32ce/errno.h
 
 endif
 
+# gdtoa
 libevil_la_SOURCES = \
+gdtoa/arithchk.c \
+gdtoa/dmisc.c \
+gdtoa/dtoa.c \
+gdtoa/gd_arith.h \
+gdtoa/g_dfmt.c \
+gdtoa/gd_qnan.h \
+gdtoa/gdtoa.c \
+gdtoa/gdtoa_fltrnds.h \
+gdtoa/gdtoa.h \
+gdtoa/gdtoaimp.h \
+gdtoa/gethex.c \
+gdtoa/g_ffmt.c \
+gdtoa/g__fmt.c \
+gdtoa/gmisc.c \
+gdtoa/g_xfmt.c \
+gdtoa/hd_init.c \
+gdtoa/hexnan.c \
+gdtoa/misc.c \
+gdtoa/qnan.c \
+gdtoa/smisc.c \
+gdtoa/strtodg.c \
+gdtoa/strtof.c \
+gdtoa/strtopx.c \
+gdtoa/sum.c \
+gdtoa/ulp.c
+
+#evil
+libevil_la_SOURCES += \
 evil_dirent.c \
 evil_fcntl.c \
 evil_fnmatch.c \
@@ -71,7 +98,7 @@ endif
 libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD
 libevil_la_CFLAGS = @win32_cflags@
 libevil_la_CXXFLAGS = @win32_cxxflags@
-libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS)
+libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS)
 libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
 
 if EVIL_HAVE_WINCE
@@ -84,5 +111,14 @@ libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
 
 endif
 
+libdl_la_SOURCES = dlfcn.c
+
+libdl_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1
+libdl_la_CFLAGS = @win32_cflags@
+libdl_la_LIBADD = $(top_builddir)/src/lib/libevil.la $(EFL_MPATROL_LIBS) @win32_dl_libs@
+libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
+
+EXTRA_DIST = gdtoa/README gdtoa/README.mingw
+
 install-data-hook:
-	rm -f $(libdir)/$(lib_LTLIBRARIES)
+	rm -f $(libdir)/libevil.la $(libdir)/libdl.la
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.c b/legacy/evil/src/lib/dlfcn.c
similarity index 99%
rename from legacy/evil/src/lib/dlfcn/dlfcn.c
rename to legacy/evil/src/lib/dlfcn.c
index 126b68c3ed..818cabf014 100644
--- a/legacy/evil/src/lib/dlfcn/dlfcn.c
+++ b/legacy/evil/src/lib/dlfcn.c
@@ -20,7 +20,7 @@
 # include <psapi.h> /*  EnumProcessModules(Ex) */
 #endif
 
-#include "../Evil.h"
+#include "Evil.h"
 
 #include "dlfcn.h"
 
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.h b/legacy/evil/src/lib/dlfcn.h
similarity index 100%
rename from legacy/evil/src/lib/dlfcn/dlfcn.h
rename to legacy/evil/src/lib/dlfcn.h
diff --git a/legacy/evil/src/lib/gdtoa/Makefile.am b/legacy/evil/src/lib/gdtoa/Makefile.am
deleted file mode 100644
index b008151ba6..0000000000
--- a/legacy/evil/src/lib/gdtoa/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-noinst_LTLIBRARIES = libgdtoa.la
-
-libgdtoa_la_SOURCES = \
-arithchk.c \
-dmisc.c \
-dtoa.c \
-gd_arith.h \
-g_dfmt.c \
-gd_qnan.h \
-gdtoa.c \
-gdtoa_fltrnds.h \
-gdtoa.h \
-gdtoaimp.h \
-gethex.c \
-g_ffmt.c \
-g__fmt.c \
-gmisc.c \
-g_xfmt.c \
-hd_init.c \
-hexnan.c \
-misc.c \
-qnan.c \
-smisc.c \
-strtodg.c \
-strtof.c \
-strtopx.c \
-sum.c \
-ulp.c
-
-libgdtoa_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import
-
-EXTRA_DIST = README README.mingw
\ No newline at end of file
diff --git a/legacy/evil/src/lib/gdtoa/gdtoaimp.h b/legacy/evil/src/lib/gdtoa/gdtoaimp.h
index 49b9ce05b3..3a06c2072f 100644
--- a/legacy/evil/src/lib/gdtoa/gdtoaimp.h
+++ b/legacy/evil/src/lib/gdtoa/gdtoaimp.h
@@ -570,10 +570,14 @@ extern Bigint *diff (Bigint*, Bigint*);
 extern int gethex (const char**, FPI*, Long*, Bigint**, int);
 extern void hexdig_init_D2A(void);
 extern int hexnan (const char**, FPI*, ULong*);
+#ifndef __GNUC__
 extern int hi0bits_D2A (ULong);
+#endif
 extern Bigint *i2b (int);
 extern Bigint *increment (Bigint*);
+#ifndef __GNUC__
 extern int lo0bits (ULong*);
+#endif
 extern Bigint *lshift (Bigint*, int);
 extern int match (const char**, char*);
 extern Bigint *mult (Bigint*, Bigint*);