Added directory includes and fixed some warnings.
Revert "Added directory includes and fixed some warnings."

This reverts commit 37584c8279c8ca61ba9981b205de9600fd1e76f6.