classes.cpp header include cleanup
condition.cpp header include cleanup
database.cpp & .h header include cleanup and forward declaration