diff --git a/ajax.php b/ajax.php
index bb745515e..2d7d9fbd0 100644
--- a/ajax.php
+++ b/ajax.php
@@ -4,7 +4,7 @@
     }
     $cmd = $_GET["command"];
     $cmd = preg_replace("#[^a-zA-Z_]#","",$cmd);
-    $path = DIRNAME(__FILE__);
+    $path = __DIR__;
     $cmdpath = "$path/ajax/$cmd.php";
     if(!file_exists($cmdpath)) {
         die(json_encode(array("success"=>false,"code"=>-1,"msg"=>"Invalid command!")));
diff --git a/ajax/add_bulk_complete_marker.php b/ajax/add_bulk_complete_marker.php
index fe2702ec9..565f61c41 100644
--- a/ajax/add_bulk_complete_marker.php
+++ b/ajax/add_bulk_complete_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();
@@ -25,11 +25,11 @@
                        , marker_id
                        , complete_date
                        , visible
-                ) values ";   
-                
+                ) values ";
+
       // @TODO: Move to a Config in the DB?
       $commitEvery = 10;
-      
+
       for ($i = 0; $i < count($markerList); $i++) {
          $query = $query . "(" .$_POST['userId'] . ", " . $markerList[$i] . ", now(), 1)";
          if ($i == count($markerList) - 1) {
@@ -38,23 +38,23 @@
             $query = $query . ",";
          } else {
             $query = $query . " ON DUPLICATE KEY UPDATE user_id=user_id;";
-            
+
             $result = @$mysqli->query($query); // or die(mysql_error());
             if ($result) {
-               
+
             } else {
                echo json_encode(array("success"=>false, "msg"=>$mysqli->error()));
                rollback();
                exit(0);
             }
-            
+
             if ($i != count($markerList) - 1) {
                $query = "insert into " . $map_prefix . "user_completed_marker (
                                   user_id
                                 , marker_id
                                 , complete_date
                                 , visible
-                         ) values ";   
+                         ) values ";
             }
          }
       }
diff --git a/ajax/add_complete_marker.php b/ajax/add_complete_marker.php
index 54443c1fb..73b0db469 100644
--- a/ajax/add_complete_marker.php
+++ b/ajax/add_complete_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();
diff --git a/ajax/add_marker.php b/ajax/add_marker.php
index d971642ae..a660c178f 100644
--- a/ajax/add_marker.php
+++ b/ajax/add_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();
diff --git a/ajax/change_password.php b/ajax/change_password.php
index 012c72de8..72a7b66ae 100644
--- a/ajax/change_password.php
+++ b/ajax/change_password.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();
diff --git a/ajax/del_complete_marker.php b/ajax/del_complete_marker.php
index af240e90b..c1b188f91 100644
--- a/ajax/del_complete_marker.php
+++ b/ajax/del_complete_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();
diff --git a/ajax/del_completed_marker_all.php b/ajax/del_completed_marker_all.php
index 242046005..716e2373b 100644
--- a/ajax/del_completed_marker_all.php
+++ b/ajax/del_completed_marker_all.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();
diff --git a/ajax/del_marker.php b/ajax/del_marker.php
index 12375cb95..b825992ae 100644
--- a/ajax/del_marker.php
+++ b/ajax/del_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();
diff --git a/ajax/get_categories.php b/ajax/get_categories.php
index 88f89cf4f..496b43fba 100644
--- a/ajax/get_categories.php
+++ b/ajax/get_categories.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $map = $_GET["game"];
diff --git a/ajax/get_category_tree.php b/ajax/get_category_tree.php
index b28cbf19c..97bdfb72d 100644
--- a/ajax/get_category_tree.php
+++ b/ajax/get_category_tree.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $map = $_GET["game"];
diff --git a/ajax/get_changelog.php b/ajax/get_changelog.php
index 9e4147c19..08a24113b 100644
--- a/ajax/get_changelog.php
+++ b/ajax/get_changelog.php
@@ -1,5 +1,5 @@
 <?php
-  $path = DIRNAME(__FILE__);
+  $path = __DIR__;
   include("$path/../config.php");
 
   if(isset($_GET["sinceVersion"]))
diff --git a/ajax/get_container.php b/ajax/get_container.php
index fdbb26599..e7a4f5844 100644
--- a/ajax/get_container.php
+++ b/ajax/get_container.php
@@ -1,9 +1,10 @@
 <?php
-   $path = DIRNAME(__FILE__);
+
+   $path = __DIR__;
    include("$path/../config.php");
-   
+
    $map = $_GET["game"];
-    
+
    $query = 'select id
                   , name
                   , short_name as shortName
@@ -41,7 +42,7 @@
       print($mysqli->error);
       return;
    }
-   
+
    $res = array();
    while($row = $result->fetch_assoc()) {
         $res[] = $row;
diff --git a/ajax/get_container_name.php b/ajax/get_container_name.php
index fdb34b5ec..e417f01ed 100644
--- a/ajax/get_container_name.php
+++ b/ajax/get_container_name.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $game = $_GET["game"];
diff --git a/ajax/get_games.php b/ajax/get_games.php
index ba6b06cb9..40efdd8cc 100644
--- a/ajax/get_games.php
+++ b/ajax/get_games.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $query = "select c.id
diff --git a/ajax/get_map.php b/ajax/get_map.php
index 0d9c172c7..cc728ebf9 100644
--- a/ajax/get_map.php
+++ b/ajax/get_map.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $map = $_GET["game"];
diff --git a/ajax/get_markers.php b/ajax/get_markers.php
index 164832fdc..cced962f3 100644
--- a/ajax/get_markers.php
+++ b/ajax/get_markers.php
@@ -1,6 +1,6 @@
 <?php
    if (!isset($_GET['newMarkerId'])) {
-     $path = DIRNAME(__FILE__);
+     $path = __DIR__;
    	 include_once("$path/../config.php");
    }
    /*
diff --git a/ajax/get_user_completed_markers.php b/ajax/get_user_completed_markers.php
index e6e89928e..73f66e773 100644
--- a/ajax/get_user_completed_markers.php
+++ b/ajax/get_user_completed_markers.php
@@ -1,6 +1,6 @@
 <?php
    if (!isset($_GET['newMarkerId'])) {
-     $path = DIRNAME(__FILE__);
+     $path = __DIR__;
    	 include_once("$path/../config.php");
    }
 
diff --git a/ajax/get_user_info.php b/ajax/get_user_info.php
index 1ace50b1a..84ba1bb3a 100644
--- a/ajax/get_user_info.php
+++ b/ajax/get_user_info.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	start_session("zmap");
diff --git a/ajax/login.php b/ajax/login.php
index c0d2c5bd1..4da649153 100644
--- a/ajax/login.php
+++ b/ajax/login.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();
diff --git a/ajax/logout.php b/ajax/logout.php
index e3b6cab12..2b0d4929c 100644
--- a/ajax/logout.php
+++ b/ajax/logout.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	start_session("zmap");
diff --git a/ajax/lost_password.php b/ajax/lost_password.php
index 3e80166c6..809b4f09e 100644
--- a/ajax/lost_password.php
+++ b/ajax/lost_password.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();
diff --git a/ajax/search_markers.php b/ajax/search_markers.php
index 8c5ef566c..22be06f32 100644
--- a/ajax/search_markers.php
+++ b/ajax/search_markers.php
@@ -1,6 +1,6 @@
 <?php
    if (!isset($_GET['newMarkerId'])) {
-     $path = DIRNAME(__FILE__);
+     $path = __DIR__;
      include("$path/../config.php");
    }
    /*
diff --git a/ajax/update_user_version.php b/ajax/update_user_version.php
index fb8cafc81..1fbdf61d6 100644
--- a/ajax/update_user_version.php
+++ b/ajax/update_user_version.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	start_session("zmap");
diff --git a/ajax/user_add.php b/ajax/user_add.php
index cfdff6766..53a5ba90e 100644
--- a/ajax/user_add.php
+++ b/ajax/user_add.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();
diff --git a/content/upload.php b/content/upload.php
index 4310dedf6..e9cd63d85 100644
--- a/content/upload.php
+++ b/content/upload.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	start_session("zmap");
diff --git a/lib/minify.php b/lib/minify.php
index b0d0be035..91f382b4e 100644
--- a/lib/minify.php
+++ b/lib/minify.php
@@ -1,6 +1,6 @@
 <?php
 function includeMini() {
-    $path = DIRNAME(__FILE__);
+    $path = __DIR__;
     include_once("$path/JSMin.php");
     include_once("$path/CSSmin.php");
 }
diff --git a/lib/zmailer.php b/lib/zmailer.php
index ca2587538..e4e0f3f12 100644
--- a/lib/zmailer.php
+++ b/lib/zmailer.php
@@ -1,6 +1,6 @@
 <?php
 
-$path = DIRNAME(__FILE__);
+$path = __DIR__;
 include_once("$path/../config.php");
 
 function prepareMailTransport() {
diff --git a/res.php b/res.php
index 78eaa381c..8a3149ee2 100644
--- a/res.php
+++ b/res.php
@@ -1,5 +1,5 @@
 <?php
-    $path = DIRNAME(__FILE__);
+  $path=__DIR__;
 
     if(!isset($_GET["type"])) {
       print("A type must be provided! javascript or css.");
diff --git a/sitemap/index.php b/sitemap/index.php
index df4038f2d..b2fe492af 100644
--- a/sitemap/index.php
+++ b/sitemap/index.php
@@ -4,7 +4,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> 
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
    $query = 'select c.short_name
diff --git a/tests/res.php b/tests/res.php
index c3366506e..021f2e055 100644
--- a/tests/res.php
+++ b/tests/res.php
@@ -1,10 +1,10 @@
 <?php
-  $path = DIRNAME(__FILE__);
+  $path = __DIR__;
 
   include_once("$path/../config.php");
   if(!$enableTests) exit;
   
-  $path = DIRNAME(__FILE__);
+  $path = __DIR__;
   
   include "$path/../lib/minify.php";