Continued to reorganize headers to minimize number of includes necessary and increase modularity.