Get simulator working. Resolved header file dependencies.