Merge "Moved headers from include/ to appropriate libs"