Rename inclusions properly
Run automake-1.11
Rename entries in VS2008 project

Tested with VS2008
Rename entries in VS2010 project

Not tested