3 files changed, 13 insertions, 9 deletions
diff --git a/src/ui/mapper/BrushMapper.cpp b/src/ui/mapper/BrushMapper.cpp
index 4f17bd12..6a3d7941 100644
--- a/src/ui/mapper/BrushMapper.cpp
+++ b/src/ui/mapper/BrushMapper.cpp
@@ -1,11 +1,11 @@
 #include "cru/ui/mapper/BrushMapper.h"
-#include "../Helper.h"
 #include "cru/base/StringUtil.h"
+#include "cru/base/xml/XmlNode.h"
 #include "cru/platform/Color.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/Factory.h"
+#include "cru/platform/gui/UiApplication.h"
 #include "cru/ui/mapper/MapperRegistry.h"
-#include "cru/base/xml/XmlNode.h"
 
 #include <memory>
 
@@ -35,6 +35,8 @@ std::shared_ptr<platform::graphics::IBrush> BrushMapper::DoMapFromXml(
     }
   }
 
-  return GetGraphicsFactory()->CreateSolidColorBrush(color);
+  return platform::gui::IUiApplication::GetInstance()
+      ->GetGraphicsFactory()
+      ->CreateSolidColorBrush(color);
 }
 }  // namespace cru::ui::mapper
diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp
index 6a08b788..6dfa942f 100644
--- a/src/ui/mapper/CursorMapper.cpp
+++ b/src/ui/mapper/CursorMapper.cpp
@@ -1,5 +1,4 @@
 #include "cru/ui/mapper/CursorMapper.h"
-#include "../Helper.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/platform/gui/UiApplication.h"
 
@@ -7,14 +6,15 @@ namespace cru::ui::mapper {
 using cru::platform::gui::ICursor;
 using cru::platform::gui::SystemCursorType;
 
-bool CursorMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
+bool CursorMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "Cursor") == 0;
 }
 
 std::shared_ptr<ICursor> CursorMapper::DoMapFromString(std::string str) {
   if (str.empty()) return nullptr;
 
-  auto cursor_manager = GetUiApplication()->GetCursorManager();
+  auto cursor_manager =
+      platform::gui::IUiApplication::GetInstance()->GetCursorManager();
 
   if (cru::string::CaseInsensitiveCompare(str, "arrow") == 0) {
     return cursor_manager->GetSystemCursor(SystemCursorType::Arrow);
@@ -27,7 +27,7 @@ std::shared_ptr<ICursor> CursorMapper::DoMapFromString(std::string str) {
   }
 }
 
-std::shared_ptr<ICursor> CursorMapper::DoMapFromXml(xml::XmlElementNode *node) {
+std::shared_ptr<ICursor> CursorMapper::DoMapFromXml(xml::XmlElementNode* node) {
   auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value");
   if (!value_attr) return nullptr;
   return DoMapFromString(*value_attr);
diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp
index 6ba37964..8f83116d 100644
--- a/src/ui/mapper/FontMapper.cpp
+++ b/src/ui/mapper/FontMapper.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/mapper/FontMapper.h"
-#include "../Helper.h"
 #include "cru/base/StringUtil.h"
 #include "cru/platform/graphics/Factory.h"
+#include "cru/platform/gui/UiApplication.h"
 
 namespace cru::ui::mapper {
 bool FontMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
@@ -18,6 +18,8 @@ std::shared_ptr<platform::graphics::IFont> FontMapper::DoMapFromXml(
       font_size_attr ? cru::string::ParseToNumber<float>(*font_size_attr).value
                      : 16.0f;
 
-  return GetGraphicsFactory()->CreateFont(font_family, font_size);
+  return platform::gui::IUiApplication::GetInstance()
+      ->GetGraphicsFactory()
+      ->CreateFont(font_family, font_size);
 }
 }  // namespace cru::ui::mapper