diff --git a/test/Makefile.am b/test/Makefile.am
index 99c2c4f..ac7bae1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS=. lsb
 
 check_PROGRAMS=control pcm pcm_min latency seq \
 	       playmidi1 timer rawmidi midiloop \
-	       oldapi queue_timer namehint client_event_filter \
+	       queue_timer namehint client_event_filter \
 	       chmap audio_time user-ctl-element-set pcm-multi-thread
 
 control_LDADD=../src/libasound.la
@@ -16,7 +16,6 @@ playmidi1_LDADD=../src/libasound.la
 timer_LDADD=../src/libasound.la
 rawmidi_LDADD=../src/libasound.la
 midiloop_LDADD=../src/libasound.la
-oldapi_LDADD=../src/libasound.la
 queue_timer_LDADD=../src/libasound.la
 namehint_LDADD=../src/libasound.la
 client_event_filter_LDADD=../src/libasound.la
diff --git a/test/Makefile.in b/test/Makefile.in
index d096226..699ae45 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -90,7 +90,7 @@ host_triplet = @host@
 check_PROGRAMS = control$(EXEEXT) pcm$(EXEEXT) pcm_min$(EXEEXT) \
 	latency$(EXEEXT) seq$(EXEEXT) playmidi1$(EXEEXT) \
 	timer$(EXEEXT) rawmidi$(EXEEXT) midiloop$(EXEEXT) \
-	oldapi$(EXEEXT) queue_timer$(EXEEXT) namehint$(EXEEXT) \
+	queue_timer$(EXEEXT) namehint$(EXEEXT) \
 	client_event_filter$(EXEEXT) chmap$(EXEEXT) \
 	audio_time$(EXEEXT) user-ctl-element-set$(EXEEXT) \
 	pcm-multi-thread$(EXEEXT)
@@ -136,9 +136,6 @@ midiloop_DEPENDENCIES = ../src/libasound.la
 namehint_SOURCES = namehint.c
 namehint_OBJECTS = namehint.$(OBJEXT)
 namehint_DEPENDENCIES = ../src/libasound.la
-oldapi_SOURCES = oldapi.c
-oldapi_OBJECTS = oldapi.$(OBJEXT)
-oldapi_DEPENDENCIES = ../src/libasound.la
 pcm_SOURCES = pcm.c
 pcm_OBJECTS = pcm.$(OBJEXT)
 pcm_DEPENDENCIES = ../src/libasound.la
@@ -222,11 +219,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = audio_time.c chmap.c client_event_filter.c control.c \
-	latency.c midiloop.c namehint.c oldapi.c pcm.c \
+	latency.c midiloop.c namehint.c pcm.c \
 	pcm-multi-thread.c pcm_min.c playmidi1.c queue_timer.c \
 	rawmidi.c seq.c timer.c user-ctl-element-set.c
 DIST_SOURCES = audio_time.c chmap.c client_event_filter.c control.c \
-	latency.c midiloop.c namehint.c oldapi.c pcm.c \
+	latency.c midiloop.c namehint.c pcm.c \
 	pcm-multi-thread.c pcm_min.c playmidi1.c queue_timer.c \
 	rawmidi.c seq.c timer.c user-ctl-element-set.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -439,7 +436,6 @@ playmidi1_LDADD = ../src/libasound.la
 timer_LDADD = ../src/libasound.la
 rawmidi_LDADD = ../src/libasound.la
 midiloop_LDADD = ../src/libasound.la
-oldapi_LDADD = ../src/libasound.la
 queue_timer_LDADD = ../src/libasound.la
 namehint_LDADD = ../src/libasound.la
 client_event_filter_LDADD = ../src/libasound.la
@@ -524,10 +520,6 @@ namehint$(EXEEXT): $(namehint_OBJECTS) $(namehint_DEPENDENCIES) $(EXTRA_namehint
 	@rm -f namehint$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(namehint_OBJECTS) $(namehint_LDADD) $(LIBS)
 
-oldapi$(EXEEXT): $(oldapi_OBJECTS) $(oldapi_DEPENDENCIES) $(EXTRA_oldapi_DEPENDENCIES) 
-	@rm -f oldapi$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(oldapi_OBJECTS) $(oldapi_LDADD) $(LIBS)
-
 pcm$(EXEEXT): $(pcm_OBJECTS) $(pcm_DEPENDENCIES) $(EXTRA_pcm_DEPENDENCIES) 
 	@rm -f pcm$(EXEEXT)
 	$(AM_V_CCLD)$(pcm_LINK) $(pcm_OBJECTS) $(pcm_LDADD) $(LIBS)
@@ -577,7 +569,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latency.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midiloop.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namehint.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldapi.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm-multi-thread.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm_min.Po@am__quote@ # am--include-marker