Simplify local includes of Header Files.

No need to encode the whole path in local includes,
switch to single name reference and let the Makefile
cope with the necessary include path.
Sort include entries and refer to the Makefile.inc
via ${CURDIR}.
Merge pull request #1 from h5b/cleanup

Simplify local includes of Header Files.