diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h
index 1c696f48..1a1c7433 100644
--- a/src/app/gfx/bitmap.h
+++ b/src/app/gfx/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef YAZE_APP_UTILS_BITMAP_H
-#define YAZE_APP_UTILS_BITMAP_H
+#ifndef YAZE_APP_GFX_BITMAP_H
+#define YAZE_APP_GFX_BITMAP_H
 
 #include <SDL2/SDL.h>
 
@@ -31,10 +31,10 @@ class Bitmap {
   SDL_Texture *GetTexture() const { return texture_; }
 
  private:
-  int width_;
-  int height_;
-  int depth_;
-  int data_size_;
+  int width_ = 0;
+  int height_ = 0;
+  int depth_ = 0;
+  int data_size_ = 0;
   uchar *pixel_data_;
   SDL_Surface *surface_;
   SDL_Texture *texture_;
@@ -45,4 +45,4 @@ class Bitmap {
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif  // YAZE_APP_GFX_BITMAP_H
\ No newline at end of file
diff --git a/src/app/gfx/pseudo_vram.h b/src/app/gfx/pseudo_vram.h
index e13b68f4..e37f289a 100644
--- a/src/app/gfx/pseudo_vram.h
+++ b/src/app/gfx/pseudo_vram.h
@@ -32,9 +32,9 @@ class pseudo_vram {
   auto GetGraphicsData() const { return gfx_data_; }
 
  private:
+  static const uint32_t REAL_VRAM_SIZE = 0x8000;
   uchar* gfx_data_ = new uchar[(128 * 512) / 2];
   std::unordered_map<int, Bitmap> m_vram;
-  static const uint32_t REAL_VRAM_SIZE = 0x8000;
 };
 
 std::vector<Bitmap> CreateGraphicsSet(
@@ -46,4 +46,4 @@ std::vector<Bitmap> CreateSpriteSet(
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif  // YAZE_APP_GFX_PSEUDO_VRAM_H
\ No newline at end of file
diff --git a/src/app/gfx/snes_palette.h b/src/app/gfx/snes_palette.h
index 7d945936..7689a988 100644
--- a/src/app/gfx/snes_palette.h
+++ b/src/app/gfx/snes_palette.h
@@ -1,5 +1,5 @@
-#ifndef YAZE_APP_gfx_PALETTE_H
-#define YAZE_APP_gfx_PALETTE_H
+#ifndef YAZE_APP_GFX_PALETTE_H
+#define YAZE_APP_GFX_PALETTE_H
 
 #include <SDL2/SDL.h>
 #include <imgui/imgui.h>
@@ -50,4 +50,4 @@ class SNESPalette {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_gfx_PALETTE_H
\ No newline at end of file
+#endif  // YAZE_APP_GFX_PALETTE_H
\ No newline at end of file
diff --git a/src/app/gfx/snes_tile.h b/src/app/gfx/snes_tile.h
index b4dea907..0aaf2d7a 100644
--- a/src/app/gfx/snes_tile.h
+++ b/src/app/gfx/snes_tile.h
@@ -17,11 +17,6 @@ typedef struct {
   unsigned int palette_id;
 } tile8;
 
-using ushort = unsigned short;
-using uchar = unsigned char;
-using ulong = unsigned long;
-using uint = unsigned int;
-
 // vhopppcc cccccccc
 // [0, 1]
 // [2, 3]