fix and cleanup

src/frontend/ContentGfxCache.cpp

@@ -7,7 +7,6 @@
 #include "content/Content.hpp"
 #include "content/ContentPack.hpp"
 #include "graphics/core/Atlas.hpp"
-#include "graphics/commons/Model.hpp"
 #include "maths/UVRegion.hpp"
 #include "voxels/Block.hpp"
 #include "core_defs.hpp"

src/frontend/ContentGfxCache.hpp

@@ -7,6 +7,7 @@
 #include <unordered_map>
 
 #include "maths/UVRegion.hpp"
+#include "graphics/commons/Model.hpp"
 
 class Content;
 class Assets;
@@ -15,10 +16,6 @@ class Block;
 struct UVRegion;
 struct GraphicsSettings;
 
-namespace model {
-    struct Model;
-}
-
 class ContentGfxCache {
     const Content& content;
     const Assets& assets;

src/frontend/locale.cpp

@@ -16,8 +16,8 @@ using namespace std::literals;
 using namespace langs;
 
 namespace {
-    static std::unique_ptr<langs::Lang> current;
-    static std::unordered_map<std::string, LocaleInfo> locales_info;
+    std::unique_ptr<langs::Lang> current;
+    std::unordered_map<std::string, LocaleInfo> locales_info;
 }
 
 langs::Lang::Lang(std::string locale) : locale(std::move(locale)) {