Some fixes.
Improve sources include.