Source include fixes