Decouple zone calls, cleanup logic

zone/data_bucket.cpp

@@ -2,6 +2,7 @@
 #include <utility>
 #include "../common/string_util.h"
 #include "zonedb.h"
+#include "zone_store.h"
 #include <ctime>
 #include <cctype>
 #include <algorithm>
@@ -172,4 +173,4 @@ uint32 DataBucket::ParseStringTimeToInt(std::string time_string)
 		duration = unit * 31556926;
 
 	return duration;
-}
+}