Fiddle some library order to link components.
Add missing include directory.
Remove things that are no more.