diff --git a/common.php b/common.php
index 8bedc808..c57e20c6 100644
--- a/common.php
+++ b/common.php
@@ -15,10 +15,10 @@
  * environment and ensures other functions are loaded.
  */
 
-if (!defined('POSTFIXADMIN')) { # already defined if called from setup.php
-    define('POSTFIXADMIN', 1); # checked in included files
+if (!defined('POSTFIXADMIN')) {
+    define('POSTFIXADMIN', 1);
 
-    if (!defined('POSTFIXADMIN_CLI')) {
+    if (!defined('POSTFIXADMIN_CLI')) { // postfixadmin-cli
         // this is the default; see also https://sourceforge.net/p/postfixadmin/bugs/347/
         session_cache_limiter('nocache');
         session_name('postfixadmin_session');
diff --git a/public/list.php b/public/list.php
index 3c76dbe9..d0ead055 100644
--- a/public/list.php
+++ b/public/list.php
@@ -1,4 +1,5 @@
-<?php /**
+<?php
+/**
  * Postfix Admin
  *
  * LICENSE
diff --git a/public/main.php b/public/main.php
index 606e4e37..a2460da2 100644
--- a/public/main.php
+++ b/public/main.php
@@ -20,7 +20,7 @@
  * Form POST \ GET Variables: -none-
  */
 
-require_once(__DIR__ . '/common.php');
+require_once('common.php');
 
 $SESSID_USERNAME = authentication_get_username();
 
diff --git a/public/xmlrpc.php b/public/xmlrpc.php
index cd397e09..c01e2ec3 100644
--- a/public/xmlrpc.php
+++ b/public/xmlrpc.php
@@ -30,7 +30,7 @@
  * If it does not do this, then your authentication details will not persist across requests, and
  * this XMLRPC interface will not work.
  */
-require_once(dirname(__FILE__) . '/common.php');
+require_once('common.php');
 
 if ($CONF['xmlrpc_enabled'] == false) {
     die("xmlrpc support disabled");