include directory improvements