diff --git a/account.php b/account.php
index 7a6993a..ded345d 100644
--- a/account.php
+++ b/account.php
@@ -18,10 +18,10 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/mail.php");
 
 // set http header to not cache
 header("Pragma: no-cache");
diff --git a/addcomment.php b/addcomment.php
index 44e25ff..2c821b9 100644
--- a/addcomment.php
+++ b/addcomment.php
@@ -12,11 +12,10 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/comment.php");
 
 // you must be logged in to submit comments
 if(!$_SESSION['current']->isLoggedIn())
diff --git a/admin/addAppNote.php b/admin/addAppNote.php
index 2265f65..23ac5f7 100644
--- a/admin/addAppNote.php
+++ b/admin/addAppNote.php
@@ -3,10 +3,9 @@
 /* Add Application Note */
 /************************/
 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/note.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/addCategory.php b/admin/addCategory.php
index 4d65e58..64b8371 100644
--- a/admin/addCategory.php
+++ b/admin/addCategory.php
@@ -1,7 +1,7 @@
 <?php
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/category.php");
+require_once(BASE."include/category.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/adminAppDataQueue.php b/admin/adminAppDataQueue.php
index 3ea308c..edc2010 100644
--- a/admin/adminAppDataQueue.php
+++ b/admin/adminAppDataQueue.php
@@ -3,11 +3,13 @@
 /* code to view and approve new application data        */
 /********************************************************/
 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/mail.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
+require_once(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/version.php");
+require_once(BASE."include/user.php");
 
 $aClean = array(); //array of user input
 
diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index c9f5125..a84d0bf 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -3,11 +3,10 @@
 /* code to View and approve new Apps */
 /*************************************/
  
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/application.php");
 require_once(BASE."include/testResults.php");
 
 $aClean = array(); //array of filtered user input
diff --git a/admin/adminBugs.php b/admin/adminBugs.php
index cbe8561..1489777 100644
--- a/admin/adminBugs.php
+++ b/admin/adminBugs.php
@@ -6,10 +6,9 @@
 /*
  * application environment
  */ 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/bug.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/adminMaintainerQueue.php b/admin/adminMaintainerQueue.php
index 9668d46..3592bf2 100644
--- a/admin/adminMaintainerQueue.php
+++ b/admin/adminMaintainerQueue.php
@@ -3,13 +3,13 @@
 /* code to View and approve new application maintainers */
 /********************************************************/
 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/tableve.php");
-require(BASE."include/category.php");
-require(BASE."include/maintainer.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/category.php");
+require_once(BASE."include/maintainer.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/mail.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/adminMaintainers.php b/admin/adminMaintainers.php
index 251f0fa..3a3fe22 100644
--- a/admin/adminMaintainers.php
+++ b/admin/adminMaintainers.php
@@ -6,7 +6,7 @@
 /*
  * application environment
  */ 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 
 $aClean = array(); //array of filtered user input
diff --git a/admin/adminScreenshots.php b/admin/adminScreenshots.php
index 30c7035..d015bc0 100644
--- a/admin/adminScreenshots.php
+++ b/admin/adminScreenshots.php
@@ -7,8 +7,7 @@
 include("path.php");
 include(BASE."include/incl.php");
 require_once(BASE."include/screenshot.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/application.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/adminTestResults.php b/admin/adminTestResults.php
index 62a076c..4bf8b1d 100644
--- a/admin/adminTestResults.php
+++ b/admin/adminTestResults.php
@@ -3,11 +3,11 @@
 /* code to View and resubmit Apps    */
 /*************************************/
  
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/version.php");
 require_once(BASE."include/testResults.php");
 require_once(BASE."include/distributions.php");
 
diff --git a/admin/deleteAny.php b/admin/deleteAny.php
index f523506..7fc50e1 100644
--- a/admin/deleteAny.php
+++ b/admin/deleteAny.php
@@ -6,11 +6,10 @@
 /*
  * application environment
  */
-include("path.php");
-require_once(BASE."include/incl.php");
+require("path.php");
+require(BASE."include/incl.php");
 require_once(BASE."include/category.php");
 require_once(BASE."include/application.php");
-require_once(BASE."include/mail.php");
 require_once(BASE."include/monitor.php");
 require_once(BASE."include/testResults.php");
 
diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php
index 1fb8132..2ece09d 100644
--- a/admin/editAppFamily.php
+++ b/admin/editAppFamily.php
@@ -3,12 +3,11 @@
 /* Edit application family        */
 /**********************************/
 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
-require(BASE."include/category.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/category.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/editAppNote.php b/admin/editAppNote.php
index 7416ba7..1467cfc 100644
--- a/admin/editAppNote.php
+++ b/admin/editAppNote.php
@@ -3,10 +3,9 @@
 /* Edit AppNote */
 /****************/
 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/note.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/editAppVersion.php b/admin/editAppVersion.php
index de16171..84e6e3b 100644
--- a/admin/editAppVersion.php
+++ b/admin/editAppVersion.php
@@ -1,9 +1,9 @@
 <?php
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/version.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/editDistribution.php b/admin/editDistribution.php
index 3fe97cd..1c3b95b 100644
--- a/admin/editDistribution.php
+++ b/admin/editDistribution.php
@@ -1,7 +1,7 @@
 <?php
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/distributions.php");
+require_once(BASE."include/distributions.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/editVendor.php b/admin/editVendor.php
index 5e88c41..b28dbb7 100644
--- a/admin/editVendor.php
+++ b/admin/editVendor.php
@@ -1,6 +1,6 @@
 <?php
-include("path.php");
-require_once(BASE."include/incl.php");
+require("path.php");
+require(BASE."include/incl.php");
 require_once(BASE."include/vendor.php");
 
 $aClean = array(); //array of filtered user input
diff --git a/admin/moveAppVersion.php b/admin/moveAppVersion.php
index a94b58c..fa8c467 100644
--- a/admin/moveAppVersion.php
+++ b/admin/moveAppVersion.php
@@ -1,9 +1,9 @@
 <?php
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/version.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/admin/resubmitRejectedApps.php b/admin/resubmitRejectedApps.php
index 0e011c6..3807e1c 100644
--- a/admin/resubmitRejectedApps.php
+++ b/admin/resubmitRejectedApps.php
@@ -3,11 +3,9 @@
 /* code to View and resubmit Apps    */
 /*************************************/
  
-include("path.php");
-require_once(BASE."include/incl.php");
-
-
-        util_redirect_and_exit(BASE."appsubmit.php");
+require("path.php");
+require(BASE."include/incl.php");
 
+util_redirect_and_exit(BASE."appsubmit.php");
 
 ?>
diff --git a/appbrowse.php b/appbrowse.php
index 396c348..9731976 100644
--- a/appbrowse.php
+++ b/appbrowse.php
@@ -7,11 +7,11 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/"."incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/"."appdb.php");
-require(BASE."include/"."category.php");
+require_once(BASE."include/"."appdb.php");
+require_once(BASE."include/"."category.php");
 
 function admin_menu()
 {
diff --git a/appdbStats.php b/appdbStats.php
index ece938d..1cd2e05 100644
--- a/appdbStats.php
+++ b/appdbStats.php
@@ -3,10 +3,9 @@
 /* Code to view all kinds of interesting statistics about appdb */
 /****************************************************************/
 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/category.php");
-require(BASE."include/maintainer.php");
+require_once(BASE."include/user.php");
 
 apidb_header("Appdb Statistics");
 echo html_frame_start("","60%","",0);
diff --git a/appimage.php b/appimage.php
index ccec3dd..2426287 100644
--- a/appimage.php
+++ b/appimage.php
@@ -12,11 +12,10 @@
  * TODO:
  *  - rename and document sREQUEST_METHOD
  *  - replace iId with iScreenshotId
- *  - replace require_once with require after checking that it doesn't break anything
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
 require_once(BASE."include/screenshot.php");
diff --git a/appsubmit.php b/appsubmit.php
index 2e44b70..2f8c7fd 100644
--- a/appsubmit.php
+++ b/appsubmit.php
@@ -1,4 +1,8 @@
 <?php
+/************************************/
+/* code to Submit and Resubmit Apps */
+/************************************/
+ 
 /**
  * Submit new applications or versions.
  *
@@ -23,11 +27,10 @@
  */
 
 // application environment
-include("path.php");
-require_once(BASE."include/incl.php");
+require("path.php");
+require(BASE."include/incl.php");
 require_once(BASE."include/tableve.php");
 require_once(BASE."include/application.php");
-require_once(BASE."include/mail.php");
 require_once(BASE."include/testResults.php");
 
 $aClean = array(); //array of filtered user input
diff --git a/appview.php b/appview.php
index bfb06f3..144c8c5 100644
--- a/appview.php
+++ b/appview.php
@@ -18,17 +18,15 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/application.php");
-require(BASE."include/appdb.php");
-require(BASE."include/vote.php");
-require(BASE."include/category.php");
-require(BASE."include/maintainer.php");
-require(BASE."include/mail.php");
-require(BASE."include/monitor.php");
-require_once(BASE."include/testResults.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/appdb.php");
+require_once(BASE."include/vote.php");
+require_once(BASE."include/category.php");
+require_once(BASE."include/maintainer.php");
+require_once(BASE."include/monitor.php");
 
 $oApp = new Application($aClean['iAppId']);
 $oVersion = new Version($aClean['iVersionId']);
diff --git a/cron/cleanup.php b/cron/cleanup.php
index d24bbd3..926ba8d 100644
--- a/cron/cleanup.php
+++ b/cron/cleanup.php
@@ -5,9 +5,9 @@
 # it's purpose is to clean the user's table.     #
 ##################################################
 
-include("path.php");
-include(BASE."include/incl.php");
-include(BASE."include/mail.php");
+require("path.php");
+require(BASE."include/incl.php");
+require_once(BASE."include/mail.php");
 
 /*
  * Warn users that have been inactive for some number of months
diff --git a/deletecomment.php b/deletecomment.php
index ee93283..5fff396 100644
--- a/deletecomment.php
+++ b/deletecomment.php
@@ -11,11 +11,10 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE.'include/comment.php');
 
 $oComment = new Comment($aClean['iCommentId']);
 
diff --git a/distributionView.php b/distributionView.php
index 3cad648..c2352fb 100644
--- a/distributionView.php
+++ b/distributionView.php
@@ -6,11 +6,11 @@
 /*
  * application environment
  */ 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/distributions.php");
-require(BASE."include/testResults.php");
+require_once(BASE."include/distributions.php");
+require_once(BASE."include/testResults.php");
 
 if ($aClean['sSub'])
 {
diff --git a/help/index.php b/help/index.php
index e5001a2..1eaae5d 100644
--- a/help/index.php
+++ b/help/index.php
@@ -3,8 +3,8 @@
 /* Application Database Documentation Center */
 /*********************************************/
 
-include("path.php");
-include(BASE."include/"."incl.php");
+require("path.php");
+require(BASE."include/"."incl.php");
 
 $help_path = BASE."/help";
 
diff --git a/include/application.php b/include/application.php
index 6013f81..de8e232 100644
--- a/include/application.php
+++ b/include/application.php
@@ -7,6 +7,7 @@ require_once(BASE."include/version.php");
 require_once(BASE."include/vendor.php");
 require_once(BASE."include/url.php");
 require_once(BASE."include/util.php");
+require_once(BASE."include/mail.php");
 
 /**
  * Application class for handling applications.
diff --git a/index.php b/index.php
index fe8cb30..499022e 100644
--- a/index.php
+++ b/index.php
@@ -8,9 +8,8 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/application.php");
 
 apidb_header("Wine Application Database");
 ?>
diff --git a/maintainerdelete.php b/maintainerdelete.php
index 7ff436b..19e4972 100644
--- a/maintainerdelete.php
+++ b/maintainerdelete.php
@@ -18,10 +18,10 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/category.php");
-require(BASE."include/application.php");
+require_once(BASE."include/category.php");
+require_once(BASE."include/application.php");
 
 $aClean = array(); //array of filtered user input
 
diff --git a/maintainersubmit.php b/maintainersubmit.php
index d8262ed..09f6043 100644
--- a/maintainersubmit.php
+++ b/maintainersubmit.php
@@ -16,10 +16,10 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/category.php");
-require(BASE."include/application.php");
+require_once(BASE."include/application.php");
+require_once(BASE.'include/version.php');
 
 $aClean = array(); //array of filtered user input
 
diff --git a/screenshots.php b/screenshots.php
index 811ae1e..03a0354 100644
--- a/screenshots.php
+++ b/screenshots.php
@@ -19,12 +19,12 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
 require_once(BASE."include/screenshot.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/version.php");
 
 // we issued a command
 if($aClean['sCmd'])
diff --git a/search.php b/search.php
index ed5f8a8..936817b 100644
--- a/search.php
+++ b/search.php
@@ -10,10 +10,9 @@
  */
 
 // application environment
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/application.php");
 
 apidb_header("Search Results");
 perform_search_and_output_results($aClean['sSearchQuery']);
diff --git a/testResults.php b/testResults.php
index 6d0318d..6ec4644 100644
--- a/testResults.php
+++ b/testResults.php
@@ -3,12 +3,11 @@
 /* code to submit, view and resubmit Test Results */
 /**************************************************/
  
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/tableve.php");
+require_once(BASE."include/application.php");
 require_once(BASE."include/testResults.php");
 require_once(BASE."include/distributions.php");
 
diff --git a/vendorview.php b/vendorview.php
index 024e053..8e27d04 100644
--- a/vendorview.php
+++ b/vendorview.php
@@ -6,9 +6,9 @@
 /*
  * application environment
  */ 
-include("path.php");
-require_once(BASE."include/incl.php");
-require_once(BASE."include/filter.php");
+require("path.php");
+require(BASE."include/incl.php");
+require(BASE."include/filter.php");
 require_once(BASE."include/application.php");
 require_once(BASE."include/vendor.php");
 
diff --git a/viewScreenshots.php b/viewScreenshots.php
index 7a581fc..8e33431 100644
--- a/viewScreenshots.php
+++ b/viewScreenshots.php
@@ -4,12 +4,11 @@
 /* Without having go into each application version to do so */
 /************************************************************/
 
-include("path.php");
-include(BASE."include/incl.php");
-include(BASE."include/filter.php");
+require("path.php");
+require(BASE."include/incl.php");
+require(BASE."include/filter.php");
 require_once(BASE."include/screenshot.php");
-require(BASE."include/application.php");
-require(BASE."include/mail.php");
+require_once(BASE."include/application.php");
 
 apidb_header("View Screenshots");
 /* display a range of 10 pages */
diff --git a/votestats.php b/votestats.php
index 20f23a8..4d03ea1 100644
--- a/votestats.php
+++ b/votestats.php
@@ -7,9 +7,9 @@
  * application environment
  */ 
 include("path.php");
-include(BASE."include/incl.php");
+require(BASE."include/incl.php");
 require(BASE."include/filter.php");
-require(BASE."include/category.php");
+require_once(BASE."include/category.php");
 
 /* default to 25 apps, main categories */
 $topNumber = 25;