Made the include files self sufficient.

21 files changed