Snow Leopard: Fix include objects for none libraries
Merge remote-tracking branch 'origin/master'