Moved init_connection to storage.c
Added include guards