diff --git a/Makefile.am b/Makefile.am
index 4ff755b0d..9872a5797 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,10 @@
 if HAVE_AVICLASSES
 aviclasses_subdir=aviclasses
 endif
-if HAVE_AVILIB
-avilib_subdir=avilib
-endif
 if HAVE_AVILIB0_6_10
 avilib0_6_10_subdir=avilib-0.6.10
 endif
 
-SUBDIRS = $(avilib_subdir) $(aviclasses_subdir) $(avilib0_6_10_subdir) src doc
-DIST_SUBDIRS = $(avilib_subdir) $(aviclasses_subdir) $(avilib0_6_10_subdir) \
+SUBDIRS = $(aviclasses_subdir) $(avilib0_6_10_subdir) src doc
+DIST_SUBDIRS = $(aviclasses_subdir) $(avilib0_6_10_subdir) \
 	src doc
diff --git a/src/Makefile.am b/src/Makefile.am
index 86fb2c084..08a29a145 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,10 +14,9 @@ aviclasses_libdirs = -L$(top_srcdir)/aviclasses
 endif
 
 DEFAULT_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
-	$(avilib_incdirs) $(avilib0_6_10_incdirs) $(aviclasses_incdirs)
+	$(avilib0_6_10_incdirs) $(aviclasses_incdirs)
 
-LDFLAGS = @LDFLAGS@ $(avilib_libdirs) $(avilib0_6_10_libdirs) \
-	$(aviclasses_libdirs)
+LDFLAGS = @LDFLAGS@ $(avilib0_6_10_libdirs) $(aviclasses_libdirs)
 
 if HAVE_WXWINDOWS
 SUBDIRS = mmg
diff --git a/src/mmg/Makefile.am b/src/mmg/Makefile.am
index 20e61a0bf..de92a51e7 100644
--- a/src/mmg/Makefile.am
+++ b/src/mmg/Makefile.am
@@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS = dist-zip foreign
 
 bin_PROGRAMS = mmg
 
-DEFAULT_INCLUDES = -I$(top_srcdir) \
-			-I$(top_srcdir)/src
+DEFAULT_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 
 mmg_SOURCES = mmg.cpp mmg.h \
 			../chapters.cpp ../chapters.h \