Fix recursive inclusion