diff --git a/admin/adminAppDataQueue.php b/admin/adminAppDataQueue.php
index 451da3f..9337ec9 100644
--- a/admin/adminAppDataQueue.php
+++ b/admin/adminAppDataQueue.php
@@ -6,7 +6,6 @@
 include("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/mail.php");
-require(BASE."include/screenshot.php");
 require(BASE."include/tableve.php");
 require(BASE."include/application.php");
 
diff --git a/admin/deleteAny.php b/admin/deleteAny.php
index 90b5d71..861d30e 100644
--- a/admin/deleteAny.php
+++ b/admin/deleteAny.php
@@ -51,7 +51,7 @@ if($_REQUEST['what'])
 	    break;
 	case "appVersion":
 	    // delete a version
-            $oVersion = new Application($_REQUEST['versionId']);
+            $oVersion = new Version($_REQUEST['versionId']);
             $oVersion->delete();
             redirect(BASE."appview.php?appId=".$_REQUEST['appId']);
 	    break;
diff --git a/appview.php b/appview.php
index 4f9f85a..598b26b 100644
--- a/appview.php
+++ b/appview.php
@@ -12,7 +12,6 @@ require(BASE."include/application.php");
 require(BASE."include/appdb.php");
 require(BASE."include/vote.php");
 require(BASE."include/category.php");
-require(BASE."include/screenshot.php");
 require(BASE."include/maintainer.php");
 
 
diff --git a/bugs.php b/bugs.php
index ac90474..cb9ecf8 100644
--- a/bugs.php
+++ b/bugs.php
@@ -10,7 +10,6 @@ include("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/application.php");
 require(BASE."include/appdb.php");
-require(BASE."include/screenshot.php");
 require(BASE."include/category.php");
 
 
diff --git a/include/version.php b/include/version.php
index 1f6b55b..94407a9 100644
--- a/include/version.php
+++ b/include/version.php
@@ -6,6 +6,7 @@
 require_once(BASE."include/note.php");
 require_once(BASE."include/comment.php");
 require_once(BASE."include/url.php");
+require_once(BASE."include/screenshot.php");
 
 /**
  * Version class for handling versions.
diff --git a/index.php b/index.php
index c8cb74b..ff2ccab 100644
--- a/index.php
+++ b/index.php
@@ -9,7 +9,6 @@
 include("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/application.php");
-require(BASE."include/screenshot.php");
 
 apidb_header("Wine Application Database");
 ?>