diff --git a/src/app/core/controller.h b/src/app/core/controller.h
index 515d56fd..0f8d556a 100644
--- a/src/app/core/controller.h
+++ b/src/app/core/controller.h
@@ -35,7 +35,7 @@ class Controller {
   void CreateWindow();
   void CreateRenderer();
   void CreateGuiContext() const;
-  inline void quit() { active_ = false; }
+  void quit() { active_ = false; }
   friend int ::main(int argc, char **argv);
 
   struct sdl_deleter {
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index bb513596..61139a02 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -33,22 +33,22 @@ class OverworldEditor {
   void LoadBlockset();
   void LoadGraphics();
 
-  app::zelda3::Overworld overworld_;
-  app::gfx::SNESPalette palette_;
-  app::gfx::TilePreset current_set_;
+  zelda3::Overworld overworld_;
+  gfx::SNESPalette palette_;
+  gfx::TilePreset current_set_;
 
-  app::rom::ROM rom_;
+  rom::ROM rom_;
 
-  app::gfx::Bitmap tile16_blockset_bmp_;
+  gfx::Bitmap tile16_blockset_bmp_;
   uchar *tile16_blockset_ptr_ = new uchar[1048576];
 
-  app::gfx::Bitmap current_gfx_bmp_;
+  gfx::Bitmap current_gfx_bmp_;
   uchar *current_gfx_ptr_ = new uchar[(128 * 512) / 2];
 
-  app::gfx::Bitmap allgfxBitmap;
+  gfx::Bitmap allgfxBitmap;
   uchar *allGfx16Ptr = new uchar[(128 * 7136) / 2];
 
-  app::gfx::Bitmap mapblockset16Bitmap;
+  gfx::Bitmap mapblockset16Bitmap;
 
   std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;
 
diff --git a/src/app/rom.h b/src/app/rom.h
index 7c976650..1326eda4 100644
--- a/src/app/rom.h
+++ b/src/app/rom.h
@@ -36,8 +36,8 @@ class ROM {
   char* CreateAllGfxDataRaw();
   void CreateAllGraphicsData(uchar* allGfx16Ptr);
 
-  inline uchar* data() { return current_rom_; }
-  inline auto Renderer() { return sdl_renderer_; }
+  uchar* data() { return current_rom_; }
+  auto Renderer() { return sdl_renderer_; }
   const uchar* getTitle() const { return title; }
   long getSize() const { return size_; }
   char getVersion() const { return version_; }
diff --git a/src/app/zelda3/overworld.h b/src/app/zelda3/overworld.h
index 9a7a0278..338a0bd4 100644
--- a/src/app/zelda3/overworld.h
+++ b/src/app/zelda3/overworld.h
@@ -20,9 +20,9 @@ namespace zelda3 {
 class Overworld {
  public:
   void Load(app::rom::ROM& rom, uchar* allGfxPtr);
-  inline auto GetTiles16() const { return tiles16; }
-  inline auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; }
-  inline auto GetMapBlockset16Ptr() { return mapblockset16; }
+  auto GetTiles16() const { return tiles16; }
+  auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; }
+  auto GetMapBlockset16Ptr() { return mapblockset16; }
 
   std::shared_ptr<uchar[]> overworldMapPointer;
   gfx::Bitmap overworldMapBitmap;