*sigh* move these files into the directories i meant for them to exist in.
start actually porting to gcc 4.5 in the process.