consolidate some of the include statements and combine database files.