Get all the includes
Tweak usage
Merge remote-tracking branch 'remotes/soc/gsoc' into work

Conflicts:
	bindinate/bindinate.in