Fixing some inclusion issues