6 files changed, 3 insertions, 11 deletions
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 9d57abd..4a94180 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -1,6 +1,3 @@
-#include "../facade/FontFacade.h"
-#include "util/Log.h"
-
 #include "Text.h"
 
 using namespace crepe;
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index c30dc80..da40141 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -3,8 +3,6 @@
 #include <optional>
 #include <string>
 
-#include "../Component.h"
-
 #include "Asset.h"
 #include "Color.h"
 #include "UIObject.h"
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
index 0c670c1..771002f 100644
--- a/src/crepe/facade/Font.cpp
+++ b/src/crepe/facade/Font.cpp
@@ -2,7 +2,6 @@
 
 #include "../api/Asset.h"
 #include "../api/Config.h"
-#include <string>
 
 #include "Font.h"
 
@@ -12,7 +11,6 @@ using namespace crepe;
 Font::Font(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 	const Config & config = Config::get_instance();
 	const std::string FONT_PATH = src.get_path();
-
 	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
 	if (loaded_font == NULL) {
 		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
index b08366d..b208d96 100644
--- a/src/crepe/facade/Font.h
+++ b/src/crepe/facade/Font.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <SDL2/SDL_ttf.h>
-#include <functional>
 #include <memory>
 
 #include "../Resource.h"
+#include "../api/Config.h"
 
 namespace crepe {
 
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index ea3b71c..9a122f5 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -208,14 +208,14 @@ void SDLContext::draw_text(const RenderText & data) {
 	};
 	SDL_Surface * tmp_font_surface
 		= TTF_RenderText_Solid(font.get_font(), text.text.c_str(), color);
-	if (!tmp_font_surface) {
+	if (tmp_font_surface == NULL) {
 		throw runtime_error(format("draw_text: font surface error: {}", SDL_GetError()));
 	}
 	font_surface = {tmp_font_surface, [](SDL_Surface * surface) { SDL_FreeSurface(surface); }};
 
 	SDL_Texture * tmp_font_texture
 		= SDL_CreateTextureFromSurface(this->game_renderer.get(), font_surface.get());
-	if (!tmp_font_texture) {
+	if (tmp_font_texture == NULL) {
 		throw runtime_error(format("draw_text: font texture error: {}", SDL_GetError()));
 	}
 	font_texture
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 4082591..bf2bfd3 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -87,7 +87,6 @@ void RenderSystem::render_text() {
 		if (!text.active) continue;
 		if (!text.font.has_value())
 			text.font.emplace(ctx.get_font_from_name(text.font_family));
-		if (!text.font.has_value()) continue;
 
 		const Font & font = resource_manager.get<Font>(text.font.value());
 		const auto & transform