diff --git a/src/app/editor/graphics/graphics_editor.cc b/src/app/editor/graphics/graphics_editor.cc
index 57b3f6fd..92939438 100644
--- a/src/app/editor/graphics/graphics_editor.cc
+++ b/src/app/editor/graphics/graphics_editor.cc
@@ -529,7 +529,7 @@ absl::Status GraphicsEditor::DrawCgxImport() {
   }
 
   if (ImGui::Button("Load CGX Data")) {
-    status_ = gfx::scad_format::LoadCgx(current_bpp_, cgx_file_path_, cgx_data_,
+    status_ = gfx::LoadCgx(current_bpp_, cgx_file_path_, cgx_data_,
                                         decoded_cgx_, extra_cgx_data_);
 
     cgx_bitmap_.Create(0x80, 0x200, 8, decoded_cgx_);
@@ -557,10 +557,10 @@ absl::Status GraphicsEditor::DrawScrImport() {
 
   if (ImGui::Button("Load Scr Data")) {
     status_ =
-        gfx::scad_format::LoadScr(scr_file_path_, scr_mod_value_, scr_data_);
+        gfx::LoadScr(scr_file_path_, scr_mod_value_, scr_data_);
 
     decoded_scr_data_.resize(0x100 * 0x100);
-    status_ = gfx::scad_format::DrawScrWithCgx(current_bpp_, scr_data_,
+    status_ = gfx::DrawScrWithCgx(current_bpp_, scr_data_,
                                                decoded_scr_data_, decoded_cgx_);
 
     scr_bitmap_.Create(0x100, 0x100, 8, decoded_scr_data_);
@@ -596,7 +596,7 @@ absl::Status GraphicsEditor::DrawPaletteControls() {
     col_file_palette_ = gfx::SnesPalette(col_data_);
 
     // gigaleak dev format based code
-    decoded_col_ = gfx::scad_format::DecodeColFile(col_file_path_);
+    decoded_col_ = gfx::DecodeColFile(col_file_path_);
     col_file_ = true;
     is_open_ = true;
   }
diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h
index b08a0e6a..5081e8eb 100644
--- a/src/app/gfx/bitmap.h
+++ b/src/app/gfx/bitmap.h
@@ -3,6 +3,7 @@
 
 #include <SDL.h>
 
+#include <span>
 #include <cstdint>
 #include <memory>
 
diff --git a/src/app/gfx/scad_format.cc b/src/app/gfx/scad_format.cc
index 0012c7b7..389c8e0e 100644
--- a/src/app/gfx/scad_format.cc
+++ b/src/app/gfx/scad_format.cc
@@ -13,7 +13,6 @@
 
 namespace yaze {
 namespace gfx {
-namespace scad_format {
 
 void FindMetastamp() {
   int matching_position = -1;
@@ -275,6 +274,5 @@ absl::Status DecodeObjFile(
   return absl::OkStatus();
 }
 
-}  // namespace scad_format
 }  // namespace gfx
 }  // namespace yaze
diff --git a/src/app/gfx/scad_format.h b/src/app/gfx/scad_format.h
index 98926fdf..30ad95f0 100644
--- a/src/app/gfx/scad_format.h
+++ b/src/app/gfx/scad_format.h
@@ -15,14 +15,10 @@
 namespace yaze {
 namespace gfx {
 
-/**
- * @namespace yaze::gfx::scad_format
- * @brief Loading from prototype SCAD format
- */
-namespace scad_format {
-
 /**
  * @brief Cgx file header
+ *
+ * @details
  * キャラクタ（．ＳＣＨ）ファイル
  * ヘッダー情報
  * アドレス 	       説明
@@ -91,7 +87,6 @@ absl::Status DecodeObjFile(
     std::unordered_map<std::string, std::vector<uint8_t>> decoded_obj,
     std::vector<uint8_t>& decoded_extra_obj, int& obj_loaded);
 
-}  // namespace scad_format
 }  // namespace gfx
 }  // namespace yaze
 
diff --git a/src/app/gfx/snes_tile.h b/src/app/gfx/snes_tile.h
index e113a642..a4ed5284 100644
--- a/src/app/gfx/snes_tile.h
+++ b/src/app/gfx/snes_tile.h
@@ -221,7 +221,6 @@ class GraphicsBuffer {
 };
 
 }  // namespace gfx
-
 }  // namespace yaze
 
 #endif  // YAZE_APP_GFX_SNES_TILE_H