diff --git a/src/client/Minecraft.cpp b/src/client/Minecraft.cpp
index ef9b134..a19dbaf 100755
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
@@ -1,11 +1,10 @@
 #include "Minecraft.h"
 #include "Options.h"
-#include "IBuildInput.h"
-#include "Keyboard.h"
-#include "Item.h"
-#include "ItemInstance.h"
-#include "XperiaPlayInput.h"
-#include "ControllerTurnInput.h"
+#include "client/Options.h"
+#include "client/player/input/IBuildInput.h"
+#include "platform/input/Keyboard.h"
+#include "world/item/Item.h"
+#include "world/item/ItemInstance.h"
 #include <string>
 #include <cstdlib>
 
@@ -25,13 +24,9 @@
 #include "../world/level/storage/LevelStorageSource.h"
 #include "../world/level/storage/LevelStorage.h"
 #include "player/input/KeyboardInput.h"
-<<<<<<< HEAD
 #include "player/input/ControllerTurnInput.h"
 #include "player/input/XperiaPlayInput.h"
 #include "world/level/chunk/ChunkSource.h"
-=======
-#include "ChunkSource.h"
->>>>>>> abfb9e0 (more refactoring for iOS)
 
 #ifndef STANDALONE_SERVER
 #include "player/input/touchscreen/TouchInputHolder.h"
diff --git a/src/client/Options.h b/src/client/Options.h
index 8671b1a..120f141 100755
--- a/src/client/Options.h
+++ b/src/client/Options.h
@@ -94,6 +94,9 @@ typedef std::vector<std::string> StringVector;
 class Options
 {
 public:
+    // deepfriedwaffles: for iOS, was getting compile errors saying: No member named 'sound' in 'Options' and No member named 'music' in 'Options' so I floated them here. 1.0f means full volume out of the box, but if everything is too loud, you might want to try adjusting this
+    float sound = 1.0f;
+    float music = 1.0f;
     
     static bool debugGl;
 
@@ -158,9 +161,7 @@ private:
         if (m_options[key] == nullptr) return nullptr;
         return dynamic_cast<T*>(m_options[key]); 
     }
-// apple stuff
-    float sound;
-    float music;
+
 	std::array<Option*, OPTIONS_COUNT> m_options;
 	OptionsFile optionsFile;
 
diff --git a/src/client/gui/Gui.cpp b/src/client/gui/Gui.cpp
index df5284a..ccc9c26 100755
--- a/src/client/gui/Gui.cpp
+++ b/src/client/gui/Gui.cpp
@@ -1,7 +1,7 @@
 #include "Gui.h"
 #include "Font.h"
-#include "Options.h"
-#include "Keyboard.h"
+#include "client/Options.h"
+#include "platform/input/Keyboard.h"
 #include "screens/IngameBlockSelectionScreen.h"
 #include "screens/ChatScreen.h"
 #include "screens/ConsoleScreen.h"
diff --git a/src/client/gui/components/ImageButton.cpp b/src/client/gui/components/ImageButton.cpp
index f686dcd..3d95acc 100755
--- a/src/client/gui/components/ImageButton.cpp
+++ b/src/client/gui/components/ImageButton.cpp
@@ -4,7 +4,7 @@
 #include "../../../platform/log.h"
 #include "../../../util/Mth.h"
 #include "../../renderer/Textures.h"
-#include "../../Option.h"
+#include <client/Option.h>
 
 
 ImageButton::ImageButton(int id, const std::string& msg)
diff --git a/src/client/gui/components/KeyOption.h b/src/client/gui/components/KeyOption.h
index cc86958..fabdc7a 100644
--- a/src/client/gui/components/KeyOption.h
+++ b/src/client/gui/components/KeyOption.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Button.h"
-#include "Options.h"
+#include <client/Options.h>
 
 class KeyOption : public Touch::TButton {
 public:
@@ -11,4 +11,4 @@ public:
     virtual void keyPressed(Minecraft* minecraft, int key);
 protected:
     bool m_captureMode;
-};
+};
\ No newline at end of file
diff --git a/src/client/gui/components/TextOption.h b/src/client/gui/components/TextOption.h
index b93a79c..89c545c 100644
--- a/src/client/gui/components/TextOption.h
+++ b/src/client/gui/components/TextOption.h
@@ -1,10 +1,10 @@
 #pragma once
 #include "TextBox.h"
-#include "Options.h"
+#include <client/Options.h>
 
 class TextOption : public TextBox {
 public:
     TextOption(Minecraft* minecraft, OptionId optId);
 
     virtual bool loseFocus(Minecraft* minecraft);
-};
+};
\ No newline at end of file
diff --git a/src/client/gui/screens/OptionsScreen.cpp b/src/client/gui/screens/OptionsScreen.cpp
index 97a1696..a6dffcb 100755
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -267,4 +267,4 @@ void OptionsScreen::tick() {
 		currentOptionsGroup->tick(minecraft);
 
 	super::tick();
-}
+}
\ No newline at end of file
diff --git a/src/client/player/input/XperiaPlayInput.h b/src/client/player/input/XperiaPlayInput.h
index bbebab5..0b3afc5 100755
--- a/src/client/player/input/XperiaPlayInput.h
+++ b/src/client/player/input/XperiaPlayInput.h
@@ -1,7 +1,5 @@
 #ifndef NET_MINECRAFT_CLIENT_PLAYER__XperiaPlayInput_H__
 #define NET_MINECRAFT_CLIENT_PLAYER__XperiaPlayInput_H__
-#include "Player.h"
-#include "Controller.h"
 
 //package net.minecraft.client.player;