diff --git a/common/camera.cpp b/common/camera.cpp
index 9c59bc46..536d6838 100644
--- a/common/camera.cpp
+++ b/common/camera.cpp
@@ -1,8 +1,6 @@
 #include "lc_global.h"
 #include "lc_math.h"
-#include "lc_colors.h"
 #include <stdlib.h>
-#include <string.h>
 #include <math.h>
 #include <float.h>
 #include "lc_file.h"
@@ -28,7 +26,7 @@ lcCamera::lcCamera(bool Simple)
 		mTargetPosition.SetValue(lcVector3(0.0f, 0.0f, 0.0f));
 		mUpVector.SetValue(lcVector3(-0.2357f, -0.2357f, 0.94281f));
 
-		UpdatePosition(1);
+		lcCamera::UpdatePosition(1);
 	}
 }
 
@@ -51,7 +49,7 @@ lcCamera::lcCamera(float ex, float ey, float ez, float tx, float ty, float tz)
 	mTargetPosition.SetValue(lcVector3(tx, ty, tz));
 	mUpVector.SetValue(UpVector);
 
-	UpdatePosition(1);
+	lcCamera::UpdatePosition(1);
 }
 
 lcCamera::~lcCamera()
diff --git a/common/lc_file.cpp b/common/lc_file.cpp
index ac75d57b..60c756ea 100644
--- a/common/lc_file.cpp
+++ b/common/lc_file.cpp
@@ -16,7 +16,7 @@ lcMemFile::lcMemFile()
 
 lcMemFile::~lcMemFile()
 {
-	Close();
+	lcMemFile::Close();
 }
 
 void lcMemFile::Seek(qint64 Offset, int From)
diff --git a/common/lc_file.h b/common/lc_file.h
index 9d4e958d..adbf97e1 100644
--- a/common/lc_file.h
+++ b/common/lc_file.h
@@ -459,7 +459,7 @@ class lcMemFile : public lcFile
 {
 public:
 	lcMemFile();
-	~lcMemFile();
+	virtual ~lcMemFile();
 
 	lcMemFile(const lcMemFile&) = delete;
 	lcMemFile(lcMemFile&&) = delete;
@@ -498,9 +498,9 @@ public:
 	{
 	}
 
-	~lcDiskFile()
+	virtual ~lcDiskFile()
 	{
-		Close();
+		lcDiskFile::Close();
 	}
 
 	lcDiskFile(const lcDiskFile&) = delete;
diff --git a/common/lc_glextensions.cpp b/common/lc_glextensions.cpp
index 98cc0432..58efd2e2 100644
--- a/common/lc_glextensions.cpp
+++ b/common/lc_glextensions.cpp
@@ -31,7 +31,7 @@ static void APIENTRY lcGLDebugCallback(GLenum Source, GLenum Type, GLuint Id, GL
 
 void lcInitializeGLExtensions(const QOpenGLContext* Context)
 {
-	const QOpenGLFunctions* Functions = Context->functions();
+	QOpenGLFunctions* Functions = Context->functions();
 
 #if !defined(QT_NO_DEBUG) && defined(GL_ARB_debug_output)
 	if (Context->hasExtension("GL_KHR_debug"))
@@ -53,7 +53,7 @@ void lcInitializeGLExtensions(const QOpenGLContext* Context)
 
 	if (Context->hasExtension("GL_EXT_texture_filter_anisotropic"))
 	{
-		glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gMaxAnisotropy);
+		Functions->glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gMaxAnisotropy);
 
 		gSupportsAnisotropic = true;
 	}