diff --git a/xpp/Makefile.am b/xpp/Makefile.am
index 1645a78..f83fc43 100644
--- a/xpp/Makefile.am
+++ b/xpp/Makefile.am
@@ -1,25 +1,11 @@
 
-LEGACY_MAKE	= \
-	 $(MAKE) -f $(srcdir)/Makefile.legacy \
-		top_srcdir=$(top_srcdir) \
-		srcdir=$(srcdir)
-
 all-local: $(perl_checks)
-	$(LEGACY_MAKE)  all
-
-clean-local:
-	$(LEGACY_MAKE)  clean
-
-install-exec-hook:
-	$(LEGACY_MAKE)  install
-
-# Cannot allow this yet
-distclean:
-maintainer-clean:
 
 SUBDIRS		=
 
-GLOBAL_CFLAGS	= -I$(srcdir) -I$(srcdir)/xtalk
+# FIXME: try to improve code, so we can use $(PEDANTIC)
+#PEDANTIC	= -ansi -pedantic -std=c99
+GLOBAL_CFLAGS	= -I$(srcdir) -I$(srcdir)/xtalk $(PEDANTIC)
 
 if PERL
 SUBDIRS		+= perl_modules
diff --git a/xpp/Makefile.legacy b/xpp/Makefile.legacy
deleted file mode 100644
index 2095c25..0000000
--- a/xpp/Makefile.legacy
+++ /dev/null
@@ -1,22 +0,0 @@
-PEDANTIC	= -ansi -pedantic -std=c99
-
-#
-# Ugly hack to find kernel directories before/after the split
-# to kernel/user-space.
-#
-# These variables should be passed to us. But until then...
-#
-DAHDI_TOOLSDIR	?= ..
-DAHDI_KERNELDIR	=
-
--include $(DAHDI_TOOLSDIR)/makeopts
-
-# Variables that should be defined above, but need sane defaults:
-# FIXME: Are those values really sane?
-HOSTCC		?= $(CC)
-
-all:
-
-install: all
-
-clean: