Architecture: Rename missing include paths.