diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 1d07f444121a1ebbcad160df70d7777b689fd66e..daa27428a104c55adbb4615cef8491e5c5ecbd35 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -72,7 +72,8 @@ class pluglist {
         $infos = call_user_func(array($cname, 'plInfo'));
         if (is_subclass_of($cname, 'simpleService')) {
           $infos['plSelfModify']  = FALSE;
-          unset($infos['plObjectType']); // services are not part of any objectType
+          /* services are not part of any objectType */
+          unset($infos['plObjectType']);
           $infos['plCategory']    = array('server');
         } else {
           if (!isset($infos['plSelfModify'])) {
diff --git a/include/class_session.inc b/include/class_session.inc
index 4bfdfdd88789b7c0e74bfdec6a079b8811ba362d..e466be12a2dc80527620b5660ba1cdc93cfc41e0 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -210,7 +210,7 @@ class session {
     session_set_cookie_params(24 * 60 * 60);
 
     /* Set cache limter to one day (parameter is minute !!)*/
-    session_cache_expire(60 * 24);  // default is 180
+    session_cache_expire(60 * 24);
 
     /* Set session max lifetime, to prevent the garbage collector to delete session before timeout.
        !! The garbage collector is a cron job on debian systems, the cronjob will fetch the timeout from
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 19a3698356e00a2281b2c2d6d573a3409282a01c..4145e79dca791febb26347d89d3e04107235f417 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -240,7 +240,8 @@ class userinfo
     $without_self_acl = $all_acl = array();
     foreach ($this->ACL as $dn => $acl) {
       $sdn    = $dn;
-      $first  = TRUE; // Run at least once
+      /* Run at least once */
+      $first  = TRUE;
       while ((strpos($dn, ",") !== FALSE) || $first) {
         $first = FALSE;
         if (isset($this->ACL[$dn])) {
diff --git a/include/functions.inc b/include/functions.inc
index 2a8d6c6df35bc5b50092bae3eea08a4efb87de4e..c8cb5b0f079fa3eaf0b759136ea134427a0ebab0 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -68,10 +68,10 @@ define ('DEBUG_CONFIG',   64); /*! Debug level for CONFIG information */
 define ('DEBUG_ACL',      128); /*! Debug level for ACL infos */
 define ('DEBUG_SI',       256); /*! Debug level for communication with Argonaut */
 define ('DEBUG_MAIL',     512); /*! Debug level for all about mail (mailAccounts, imap, sieve etc.) */
-define ('DEBUG_FAI',      1024); // FAI (incomplete)
+define ('DEBUG_FAI',      1024); /*! Debug level for FAI (incomplete) */
 
 
-// Define shadow states
+/* Define shadow states */
 define ('POSIX_ACCOUNT_EXPIRED', 1);
 define ('POSIX_WARN_ABOUT_EXPIRATION', 2);
 define ('POSIX_FORCE_PASSWORD_CHANGE', 4);
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index a0593e5a7a81ca07d68cabf7c2d033f5457b2cb3..441894c296fbddd5aa183d3f80376dda7de8fa73 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -40,9 +40,12 @@ class fake_userinfo extends userinfo
 
 class setup
 {
-  var $i_steps;               // Number of setup steps
-  var $i_current        = 0;  // Current step
-  var $i_previous       = 0;  // Previous setup step;
+  /* Number of setup steps */ 
+  var $i_steps;
+  /* Current step */
+  var $i_current        = 0;
+  /* Previous setup step; */
+  var $i_previous       = 0;
   var $i_config         = 4;
   var $o_steps          = array();
   var $captured_values  = array();
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index eec385b5ca386453c840767531f6227f22bc19d0..02d6f68c0a5ef56e00fcb92ae40af1b2370f97ec 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -352,7 +352,9 @@ class Step_Migrate extends setupStep
       /* Try to detect base class type, e.g. is it a dcObject */
       $dep_types  = departmentManagement::getDepartmentTypes();
       $dep_type   = "";
-      $attrs['objectClass'][] = 'gosaDepartment'; // This allow us to filter it as if it was already migrated
+      $attrs['objectClass'][] = 'gosaDepartment';
+
+      /* This allow us to filter it as if it was already migrated */
       foreach ($dep_types as $type) {
         if (objects::isOfType($attrs, $type)) {
           $dep_type = $type;
@@ -883,7 +885,7 @@ class Step_Migrate extends setupStep
       }
     }
 
-    // Reload base OC
+    /* Reload base OC */
     $this->checks['baseOC']->run();
     return '';
   }