revision 2 really; uselib_noheaders added