4 files changed, 12 insertions, 6 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp
index f344525d1e..375121c0cc 100644
--- a/core/os/file_access.cpp
+++ b/core/os/file_access.cpp
@@ -28,13 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "file_access.h"
+
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "global_config.h"
-#include "io/md5.h"
-#include "io/sha256.h"
 #include "os/os.h"
 
+#include "thirdparty/misc/md5.h"
+#include "thirdparty/misc/sha256.h"
+
 FileAccess::CreateFunc FileAccess::create_func[ACCESS_MAX] = { 0, 0 };
 
 FileAccess::FileCloseFailNotify FileAccess::close_fail_notify = NULL;
diff --git a/core/os/input_event.h b/core/os/input_event.h
index eb5c5685e5..93cceac27c 100644
--- a/core/os/input_event.h
+++ b/core/os/input_event.h
@@ -188,6 +188,7 @@ struct InputEventMouse {
 
 struct InputEventMouseButton : public InputEventMouse {
 
+	double factor;
 	int button_index;
 	bool pressed; //otherwise released
 	bool doubleclick; //last even less than doubleclick time
@@ -272,7 +273,10 @@ struct InputEvent {
 	InputEvent xform_by(const Transform2D &p_xform) const;
 	bool operator==(const InputEvent &p_event) const;
 	operator String() const;
-	InputEvent() { zeromem(this, sizeof(InputEvent)); }
+	InputEvent() {
+		zeromem(this, sizeof(InputEvent));
+		mouse_button.factor = 1;
+	}
 };
 
 #endif
diff --git a/core/os/os.cpp b/core/os/os.cpp
index ab03bb8016..8bee725813 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -389,7 +389,7 @@ void OS::_ensure_data_dir() {
 	memdelete(da);
 }
 
-void OS::set_icon(const Image &p_icon) {
+void OS::set_icon(const Ref<Image> &p_icon) {
 }
 
 String OS::get_model_name() const {
@@ -507,7 +507,6 @@ OS::OS() {
 	_render_thread_mode = RENDER_THREAD_SAFE;
 
 	_allow_hidpi = true;
-	Math::seed(1234567);
 }
 
 OS::~OS() {
diff --git a/core/os/os.h b/core/os/os.h
index ff2a24f40d..037ce436c1 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -31,6 +31,7 @@
 #define OS_H
 
 #include "engine.h"
+#include "image.h"
 #include "list.h"
 #include "os/main_loop.h"
 #include "power.h"
@@ -357,7 +358,7 @@ public:
 	virtual void make_rendering_thread();
 	virtual void swap_buffers();
 
-	virtual void set_icon(const Image &p_icon);
+	virtual void set_icon(const Ref<Image> &p_icon);
 
 	virtual int get_exit_code() const;
 	virtual void set_exit_code(int p_code);