Mac to work with tcl/tk 8.4.5; pd extension added automatically in saveas

bug fix writing aiff gfiles
bug fix (tcl error messages when starting open dialogs)

svn path=/trunk/; revision=3385

1 files changed, 218 insertions, 319 deletions

diff --git a/pd/src/makefile.dependencies b/pd/src/makefile.dependencies
index 770c2ce3..e51d1f4e 100644
--- a/pd/src/makefile.dependencies
+++ b/pd/src/makefile.dependencies
@@ -11,10 +11,8 @@ g_canvas.o: g_canvas.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h m_pd.h m_imp.h s_stuff.h g_canvas.h \
-  /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h g_all_guis.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \
+  m_imp.h s_stuff.h g_canvas.h /usr/include/string.h g_all_guis.h
 g_graph.o: g_graph.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -30,8 +28,7 @@ g_graph.o: g_graph.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h
+  /usr/include/string.h
 g_text.o: g_text.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -47,11 +44,8 @@ g_text.o: g_text.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/math.h /usr/include/bits/huge_val.h \
-  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h
+  /usr/include/string.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 g_rtext.o: g_rtext.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -62,13 +56,11 @@ g_rtext.o: g_rtext.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h s_stuff.h \
-  g_canvas.h t_tk.h
+  /usr/include/ctype.h m_pd.h s_stuff.h g_canvas.h t_tk.h
 g_array.o: g_array.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -79,14 +71,12 @@ g_array.o: g_array.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h m_pd.h g_canvas.h /usr/include/math.h \
-  /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \
-  /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \
+  g_canvas.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 g_template.o: g_template.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -97,20 +87,15 @@ g_template.o: g_template.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h m_pd.h s_stuff.h g_canvas.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \
+  s_stuff.h g_canvas.h
 g_io.o: g_io.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h g_canvas.h \
   /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/gnu/stubs.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/bits/types.h \
-  /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
-  /usr/include/stdlib.h
+  /usr/include/gnu/stubs.h
 g_scalar.o: g_scalar.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -121,12 +106,11 @@ g_scalar.o: g_scalar.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h m_pd.h g_canvas.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \
+  g_canvas.h
 g_traversal.o: g_traversal.c /usr/include/stdlib.h \
   /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h \
@@ -138,12 +122,11 @@ g_traversal.o: g_traversal.c /usr/include/stdlib.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h m_pd.h g_canvas.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \
+  g_canvas.h
 g_guiconnect.o: g_guiconnect.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h g_canvas.h
 g_readwrite.o: g_readwrite.c /usr/include/stdlib.h \
@@ -160,9 +143,8 @@ g_readwrite.o: g_readwrite.c /usr/include/stdlib.h \
   /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h m_pd.h g_canvas.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \
+  g_canvas.h /usr/include/string.h
 g_editor.o: g_editor.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -176,10 +158,8 @@ g_editor.o: g_editor.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h m_pd.h m_imp.h s_stuff.h g_canvas.h \
-  /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \
+  m_imp.h s_stuff.h g_canvas.h /usr/include/string.h
 g_all_guis.o: g_all_guis.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -190,17 +170,15 @@ g_all_guis.o: g_all_guis.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_bang.o: g_bang.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -211,17 +189,15 @@ g_bang.o: g_bang.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_hdial.o: g_hdial.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -232,17 +208,15 @@ g_hdial.o: g_hdial.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_hslider.o: g_hslider.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -253,17 +227,15 @@ g_hslider.o: g_hslider.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_mycanvas.o: g_mycanvas.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -274,17 +246,15 @@ g_mycanvas.o: g_mycanvas.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_numbox.o: g_numbox.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -295,17 +265,15 @@ g_numbox.o: g_numbox.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_toggle.o: g_toggle.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -316,17 +284,15 @@ g_toggle.o: g_toggle.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_vdial.o: g_vdial.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -337,15 +303,13 @@ g_vdial.o: g_vdial.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
-  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 g_vslider.o: g_vslider.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -356,17 +320,15 @@ g_vslider.o: g_vslider.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 g_vumeter.o: g_vumeter.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -377,17 +339,15 @@ g_vumeter.o: g_vumeter.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \
-  g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h
 m_pd.o: m_pd.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -412,8 +372,7 @@ m_class.o: m_class.c m_pd.h \
   /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
   /usr/include/getopt.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h
+  /usr/include/string.h
 m_obj.o: m_obj.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_imp.h
 m_atom.o: m_atom.c m_pd.h \
@@ -425,9 +384,7 @@ m_atom.o: m_atom.c m_pd.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h
+  /usr/include/string.h
 m_memory.o: m_memory.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -438,7 +395,7 @@ m_memory.o: m_memory.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h m_pd.h m_imp.h
+  m_pd.h m_imp.h
 m_binbuf.o: m_binbuf.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -453,11 +410,9 @@ m_binbuf.o: m_binbuf.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \
-  /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/fcntl.h \
+  /usr/include/bits/fcntl.h /usr/include/string.h
 m_conf.o: m_conf.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h
 m_glob.o: m_glob.c m_pd.h \
@@ -490,14 +445,12 @@ s_main.o: s_main.c m_pd.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/stdlib.h /usr/include/stdio.h /usr/include/libio.h \
-  /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \
-  /usr/include/gconv.h \
+  /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
+  /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/fcntl.h \
-  /usr/include/bits/fcntl.h /usr/include/alloca.h /usr/include/unistd.h \
+  /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/stdlib.h \
+  /usr/include/alloca.h /usr/include/unistd.h \
   /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
   /usr/include/getopt.h
 s_inter.o: s_inter.c m_pd.h \
@@ -534,34 +487,31 @@ s_inter.o: s_inter.c m_pd.h \
   /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
   /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/errno.h \
   /usr/include/bits/errno.h /usr/include/linux/errno.h \
-  /usr/include/asm/errno.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/include/gconv.h /usr/include/bits/stdio_lim.h \
-  /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
-  /usr/include/sched.h
+  /usr/include/asm/errno.h /usr/include/string.h /usr/include/stdio.h \
+  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+  /usr/include/gconv.h /usr/include/bits/stdio_lim.h \
+  /usr/include/bits/sys_errlist.h /usr/include/sched.h
 s_file.o: s_file.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \
   /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/gnu/stubs.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/bits/types.h \
-  /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
-  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
-  /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h /usr/include/bits/time.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/stdio.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/include/bits/wchar.h /usr/include/gconv.h \
+  /usr/include/gnu/stubs.h /usr/include/stdlib.h /usr/include/sys/types.h \
+  /usr/include/bits/types.h /usr/include/bits/wordsize.h \
+  /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
+  /usr/include/bits/endian.h /usr/include/sys/select.h \
+  /usr/include/bits/select.h /usr/include/bits/sigset.h \
+  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+  /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+  /usr/include/alloca.h /usr/include/stdio.h /usr/include/libio.h \
+  /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \
+  /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/errno.h \
-  /usr/include/bits/errno.h /usr/include/linux/errno.h \
-  /usr/include/asm/errno.h /usr/include/sys/stat.h \
-  /usr/include/bits/stat.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \
-  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
-  /usr/include/bits/confname.h /usr/include/getopt.h
+  /usr/include/errno.h /usr/include/bits/errno.h \
+  /usr/include/linux/errno.h /usr/include/asm/errno.h \
+  /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/fcntl.h \
+  /usr/include/bits/fcntl.h /usr/include/unistd.h \
+  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
+  /usr/include/getopt.h
 s_print.o: s_print.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
@@ -577,9 +527,7 @@ s_print.o: s_print.c m_pd.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/errno.h /usr/include/bits/errno.h \
+  /usr/include/string.h /usr/include/errno.h /usr/include/bits/errno.h \
   /usr/include/linux/errno.h /usr/include/asm/errno.h s_stuff.h
 s_loader.o: s_loader.c /usr/include/dlfcn.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
@@ -593,13 +541,11 @@ s_loader.o: s_loader.c /usr/include/dlfcn.h /usr/include/features.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/unistd.h \
   /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h m_pd.h s_stuff.h /usr/include/stdio.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/include/bits/wchar.h /usr/include/gconv.h \
+  /usr/include/getopt.h /usr/include/string.h m_pd.h s_stuff.h \
+  /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
+  /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 s_path.o: s_path.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -612,14 +558,12 @@ s_path.o: s_path.c /usr/include/stdlib.h /usr/include/features.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/unistd.h \
   /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
   /usr/include/getopt.h /usr/include/sys/stat.h /usr/include/bits/stat.h \
-  /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h m_pd.h m_imp.h s_stuff.h \
-  /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
+  /usr/include/string.h m_pd.h m_imp.h s_stuff.h /usr/include/stdio.h \
+  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+  /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/fcntl.h \
-  /usr/include/bits/fcntl.h /usr/include/ctype.h
+  /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/ctype.h
 s_entry.o: s_entry.c
 s_audio.o: s_audio.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \
@@ -630,17 +574,16 @@ s_audio.o: s_audio.c m_pd.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h /usr/include/sys/time.h /usr/include/time.h \
-  /usr/include/bits/time.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/sys/resource.h /usr/include/bits/resource.h \
-  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h \
+  /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+  /usr/include/sys/select.h /usr/include/bits/select.h \
+  /usr/include/bits/sigset.h /usr/include/sys/resource.h \
+  /usr/include/bits/resource.h /usr/include/stdlib.h \
+  /usr/include/sys/types.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
-  /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/errno.h \
+  /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h \
   /usr/include/bits/errno.h /usr/include/linux/errno.h \
   /usr/include/asm/errno.h
 s_midi.o: s_midi.c m_pd.h \
@@ -652,19 +595,16 @@ s_midi.o: s_midi.c m_pd.h \
   /usr/include/bits/confname.h /usr/include/getopt.h \
   /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
   /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \
-  /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
+  /usr/include/bits/sigset.h /usr/include/string.h /usr/include/stdio.h \
+  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+  /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/signal.h \
-  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
-  /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
-  /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \
-  /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
-  /usr/include/bits/sigthread.h
+  /usr/include/signal.h /usr/include/bits/signum.h \
+  /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \
+  /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+  /usr/include/bits/sigstack.h /usr/include/bits/pthreadtypes.h \
+  /usr/include/bits/sched.h /usr/include/bits/sigthread.h
 d_ugen.o: d_ugen.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_imp.h \
   /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
@@ -681,8 +621,7 @@ d_ctl.o: d_ctl.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
-  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 d_arithmetic.o: d_arithmetic.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h
 d_osc.o: d_osc.c m_pd.h \
@@ -690,20 +629,18 @@ d_osc.o: d_osc.c m_pd.h \
   /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/types.h \
-  /usr/include/bits/types.h /usr/include/bits/wordsize.h \
-  /usr/include/bits/typesizes.h /usr/include/time.h \
-  /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h /usr/include/bits/time.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/bits/sched.h
+  /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/sys/types.h /usr/include/bits/types.h \
+  /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
+  /usr/include/time.h /usr/include/sys/select.h \
+  /usr/include/bits/select.h /usr/include/bits/sigset.h \
+  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+  /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
 d_filter.o: d_filter.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
-  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 d_dac.o: d_dac.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h
 d_misc.o: d_misc.c m_pd.h \
@@ -715,15 +652,12 @@ d_misc.o: d_misc.c m_pd.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h
+  /usr/include/string.h
 d_math.o: d_math.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
-  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 d_fft.o: d_fft.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h
 d_mayer_fft.o: d_mayer_fft.c m_pd.h \
@@ -738,9 +672,8 @@ d_fftroutine.o: d_fftroutine.c /usr/include/stdio.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/math.h \
-  /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \
-  /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \
+  /usr/include/math.h /usr/include/bits/huge_val.h \
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
   /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
   /usr/include/endian.h /usr/include/bits/endian.h \
   /usr/include/sys/select.h /usr/include/bits/select.h \
@@ -760,11 +693,7 @@ d_array.o: d_array.c m_pd.h \
 d_global.o: d_global.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/gnu/stubs.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/bits/types.h \
-  /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
-  /usr/include/stdlib.h
+  /usr/include/gnu/stubs.h
 d_delay.o: d_delay.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h
 d_resample.o: d_resample.c m_pd.h \
@@ -773,21 +702,16 @@ x_arithmetic.o: x_arithmetic.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
-  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 x_connective.o: x_connective.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/gnu/stubs.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/bits/types.h \
+  /usr/include/gnu/stubs.h /usr/include/stdio.h /usr/include/bits/types.h \
   /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
-  /usr/include/stdlib.h /usr/include/stdio.h /usr/include/libio.h \
-  /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \
-  /usr/include/gconv.h \
+  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+  /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 x_interface.o: x_interface.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h
 x_midi.o: x_midi.c m_pd.h \
@@ -797,22 +721,19 @@ x_misc.o: x_misc.c m_pd.h \
   /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
   /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h /usr/include/stdio.h \
-  /usr/include/bits/types.h /usr/include/bits/wordsize.h \
-  /usr/include/bits/typesizes.h /usr/include/libio.h \
-  /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \
-  /usr/include/gconv.h \
+  /usr/include/stdio.h /usr/include/bits/types.h \
+  /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
+  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+  /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \
-  /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
-  /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
-  /usr/include/sys/time.h /usr/include/sys/times.h \
-  /usr/include/sys/param.h \
+  /usr/include/string.h /usr/include/sys/types.h /usr/include/time.h \
+  /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/sys/select.h /usr/include/bits/select.h \
+  /usr/include/bits/sigset.h /usr/include/bits/time.h \
+  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+  /usr/include/bits/sched.h /usr/include/sys/time.h \
+  /usr/include/sys/times.h /usr/include/sys/param.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
@@ -829,14 +750,12 @@ x_time.o: x_time.c m_pd.h \
   /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 x_acoustics.o: x_acoustics.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \
-  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
-  /usr/include/bits/mathinline.h
+  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
 x_net.o: x_net.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \
   /usr/include/sys/types.h /usr/include/features.h \
@@ -847,9 +766,7 @@ x_net.o: x_net.c m_pd.h \
   /usr/include/bits/select.h /usr/include/bits/sigset.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
-  /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/stdlib.h \
-  /usr/include/sys/socket.h /usr/include/sys/uio.h \
+  /usr/include/string.h /usr/include/sys/socket.h /usr/include/sys/uio.h \
   /usr/include/bits/uio.h /usr/include/bits/socket.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \
@@ -864,18 +781,14 @@ x_net.o: x_net.c m_pd.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h
+  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 x_qlist.o: x_qlist.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/gnu/stubs.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/bits/types.h \
+  /usr/include/gnu/stubs.h /usr/include/unistd.h \
+  /usr/include/bits/posix_opt.h /usr/include/bits/types.h \
   /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
-  /usr/include/stdlib.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h
+  /usr/include/bits/confname.h /usr/include/getopt.h
 x_gui.o: x_gui.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
@@ -885,19 +798,13 @@ x_gui.o: x_gui.c m_pd.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \
-  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
-  /usr/include/bits/confname.h /usr/include/getopt.h
+  /usr/include/string.h /usr/include/unistd.h \
+  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
+  /usr/include/getopt.h
 x_list.o: x_list.c m_pd.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
-  /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/gnu/stubs.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/bits/types.h \
-  /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
-  /usr/include/stdlib.h
+  /usr/include/alloca.h /usr/include/features.h /usr/include/sys/cdefs.h \
+  /usr/include/gnu/stubs.h
 d_soundfile.o: d_soundfile.c /usr/include/unistd.h \
   /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/posix_opt.h \
@@ -916,9 +823,7 @@ d_soundfile.o: d_soundfile.c /usr/include/unistd.h \
   /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/stdlib.h /usr/include/errno.h /usr/include/bits/errno.h \
+  /usr/include/string.h /usr/include/errno.h /usr/include/bits/errno.h \
   /usr/include/linux/errno.h /usr/include/asm/errno.h m_pd.h
 s_midi_oss.o: s_midi_oss.c /usr/include/stdio.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
@@ -929,10 +834,10 @@ s_midi_oss.o: s_midi_oss.c /usr/include/stdio.h /usr/include/features.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \
-  /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h \
+  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
+  /usr/include/endian.h /usr/include/bits/endian.h \
   /usr/include/sys/select.h /usr/include/bits/select.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
@@ -952,15 +857,14 @@ s_audio_oss.o: s_audio_oss.c /usr/include/linux/soundcard.h \
   /usr/include/bits/wchar.h /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \
-  /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h \
+  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
+  /usr/include/endian.h /usr/include/bits/endian.h \
   /usr/include/sys/select.h /usr/include/bits/select.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
   /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/sys/time.h /usr/include/sys/stat.h \
   /usr/include/bits/stat.h /usr/include/sys/ioctl.h \
   /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \
@@ -978,33 +882,31 @@ s_audio_alsa.o: s_audio_alsa.c /usr/include/alsa/asoundlib.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/stdlib.h \
-  /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
-  /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
-  /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/fcntl.h \
-  /usr/include/bits/fcntl.h /usr/include/assert.h /usr/include/sys/poll.h \
-  /usr/include/bits/poll.h /usr/include/errno.h /usr/include/bits/errno.h \
-  /usr/include/linux/errno.h /usr/include/asm/errno.h \
-  /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \
-  /usr/include/alsa/global.h /usr/include/alsa/input.h \
-  /usr/include/alsa/output.h /usr/include/alsa/error.h \
-  /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \
-  /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \
-  /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \
-  /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \
-  /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \
-  /usr/include/alsa/seq_midi_event.h /usr/include/alsa/conv.h \
-  /usr/include/alsa/instr.h m_pd.h s_stuff.h /usr/include/sys/time.h \
-  /usr/include/sys/stat.h /usr/include/bits/stat.h \
-  /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \
-  /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h \
-  /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \
-  /usr/include/sched.h /usr/include/sys/mman.h /usr/include/bits/mman.h \
-  s_audio_alsa.h
+  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
+  /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/sys/select.h /usr/include/bits/select.h \
+  /usr/include/bits/sigset.h /usr/include/bits/time.h \
+  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+  /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
+  /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/assert.h \
+  /usr/include/sys/poll.h /usr/include/bits/poll.h /usr/include/errno.h \
+  /usr/include/bits/errno.h /usr/include/linux/errno.h \
+  /usr/include/asm/errno.h /usr/include/alsa/asoundef.h \
+  /usr/include/alsa/version.h /usr/include/alsa/global.h \
+  /usr/include/alsa/input.h /usr/include/alsa/output.h \
+  /usr/include/alsa/error.h /usr/include/alsa/conf.h \
+  /usr/include/alsa/pcm.h /usr/include/alsa/rawmidi.h \
+  /usr/include/alsa/timer.h /usr/include/alsa/hwdep.h \
+  /usr/include/alsa/control.h /usr/include/alsa/mixer.h \
+  /usr/include/alsa/seq_event.h /usr/include/alsa/seq.h \
+  /usr/include/alsa/seqmid.h /usr/include/alsa/seq_midi_event.h \
+  /usr/include/alsa/conv.h /usr/include/alsa/instr.h m_pd.h s_stuff.h \
+  /usr/include/sys/time.h /usr/include/sys/stat.h \
+  /usr/include/bits/stat.h /usr/include/sys/ioctl.h \
+  /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \
+  /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \
+  /usr/include/sys/ttydefaults.h /usr/include/sched.h \
+  /usr/include/sys/mman.h /usr/include/bits/mman.h s_audio_alsa.h
 s_audio_alsamm.o: s_audio_alsamm.c /usr/include/alsa/asoundlib.h \
   /usr/include/unistd.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/gnu/stubs.h /usr/include/bits/posix_opt.h \
@@ -1016,32 +918,30 @@ s_audio_alsamm.o: s_audio_alsamm.c /usr/include/alsa/asoundlib.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/stdlib.h \
-  /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
-  /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
-  /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \
-  /usr/include/bits/string2.h /usr/include/fcntl.h \
-  /usr/include/bits/fcntl.h /usr/include/assert.h /usr/include/sys/poll.h \
-  /usr/include/bits/poll.h /usr/include/errno.h /usr/include/bits/errno.h \
-  /usr/include/linux/errno.h /usr/include/asm/errno.h \
-  /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \
-  /usr/include/alsa/global.h /usr/include/alsa/input.h \
-  /usr/include/alsa/output.h /usr/include/alsa/error.h \
-  /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \
-  /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \
-  /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \
-  /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \
-  /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \
-  /usr/include/alsa/seq_midi_event.h /usr/include/alsa/conv.h \
-  /usr/include/alsa/instr.h m_pd.h s_stuff.h /usr/include/sys/time.h \
-  /usr/include/sys/stat.h /usr/include/bits/stat.h \
-  /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \
-  /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h \
-  /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \
-  /usr/include/sched.h s_audio_alsa.h
+  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
+  /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/sys/select.h /usr/include/bits/select.h \
+  /usr/include/bits/sigset.h /usr/include/bits/time.h \
+  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+  /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \
+  /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/assert.h \
+  /usr/include/sys/poll.h /usr/include/bits/poll.h /usr/include/errno.h \
+  /usr/include/bits/errno.h /usr/include/linux/errno.h \
+  /usr/include/asm/errno.h /usr/include/alsa/asoundef.h \
+  /usr/include/alsa/version.h /usr/include/alsa/global.h \
+  /usr/include/alsa/input.h /usr/include/alsa/output.h \
+  /usr/include/alsa/error.h /usr/include/alsa/conf.h \
+  /usr/include/alsa/pcm.h /usr/include/alsa/rawmidi.h \
+  /usr/include/alsa/timer.h /usr/include/alsa/hwdep.h \
+  /usr/include/alsa/control.h /usr/include/alsa/mixer.h \
+  /usr/include/alsa/seq_event.h /usr/include/alsa/seq.h \
+  /usr/include/alsa/seqmid.h /usr/include/alsa/seq_midi_event.h \
+  /usr/include/alsa/conv.h /usr/include/alsa/instr.h m_pd.h s_stuff.h \
+  /usr/include/sys/time.h /usr/include/sys/stat.h \
+  /usr/include/bits/stat.h /usr/include/sys/ioctl.h \
+  /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \
+  /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \
+  /usr/include/sys/ttydefaults.h /usr/include/sched.h s_audio_alsa.h
 s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \
   /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \
@@ -1051,10 +951,10 @@ s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \
   /usr/include/gconv.h \
   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \
-  /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+  /usr/include/bits/confname.h /usr/include/getopt.h \
+  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
+  /usr/include/endian.h /usr/include/bits/endian.h \
   /usr/include/sys/select.h /usr/include/bits/select.h \
   /usr/include/bits/sigset.h /usr/include/bits/time.h \
   /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
@@ -1063,7 +963,6 @@ s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \
   /usr/include/errno.h /usr/include/bits/errno.h \
   /usr/include/linux/errno.h /usr/include/asm/errno.h \
   /usr/include/alsa/asoundlib.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/assert.h /usr/include/sys/poll.h /usr/include/bits/poll.h \
   /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \
   /usr/include/alsa/global.h /usr/include/alsa/input.h \