Adding missing includes

This branch adds a few missing includes in order to prevent "incomplete type" errors.