diff --git a/includes/class/ApiHandler.php b/includes/class/ApiHandler.php
index 8653974..d793cf0 100644
--- a/includes/class/ApiHandler.php
+++ b/includes/class/ApiHandler.php
@@ -3,6 +3,19 @@
 include_once('includes/config.inc.php');
 
 class ApiHandler {
+    public $headers;
+    public $hostname;
+    public $port;
+    public $auth;
+    public $proto;
+    public $sslverify;
+    public $curlh;
+    public $method;
+    public $content;
+    public $apiurl;
+    public $url;
+    public $json;
+    
     public function __construct() {
         global $apiip, $apiport, $apipass, $apiproto, $apisslverify;
 
diff --git a/includes/class/PdnsApi.php b/includes/class/PdnsApi.php
index 0f9d8b7..404a22c 100644
--- a/includes/class/PdnsApi.php
+++ b/includes/class/PdnsApi.php
@@ -3,6 +3,9 @@
 include_once('ApiHandler.php');
 
 class PdnsAPI {
+    public $http;
+    
+    
     public function __construct() {
         $this->http = new ApiHandler();
     }
diff --git a/includes/class/Zone.php b/includes/class/Zone.php
index a429550..79cb237 100644
--- a/includes/class/Zone.php
+++ b/includes/class/Zone.php
@@ -1,6 +1,21 @@
 <?php
 
 class Zone {
+    public $id;
+    public $name;
+    public $kind;
+    public $url;
+    public $serial;
+    public $dnssec;
+    public $soa_edit;
+    public $soa_edit_api;
+    public $keyinfo;
+    public $account;
+    public $zone;
+    public $nameservers;
+    public $rrsets;
+    public $masters;    
+    
     public function __construct() {
         $this->id = '';
         $this->name = '';
@@ -221,6 +236,13 @@ class Zone {
 }
 
 class RRSet {
+    public $name;
+    public $type;
+    public $ttl;
+    public $changetype;
+    public $records;
+    public $comments;
+    
     public function __construct($name = '', $type = '', $content = '', $disabled = FALSE, $ttl = 3600, $setptr = FALSE) {
         $this->name = $name;
         $this->type = $type;
@@ -306,6 +328,10 @@ class RRSet {
 }
 
 class Record {
+    public $content;
+    public $disabled;
+    public $setptr;
+    
     public function __construct($content, $disabled = FALSE, $setptr = FALSE) {
         $this->content = $content;
         $this->disabled = $disabled;
@@ -326,6 +352,10 @@ class Record {
 }
 
 class Comment {
+    public $content;
+    public $account;
+    public $modified_at;
+    
     public function __construct($content, $account, $modified_at) {
         $this->content = $content;
         $this->account = $account;
diff --git a/includes/session.inc.php b/includes/session.inc.php
index 9b359c3..1900256 100644
--- a/includes/session.inc.php
+++ b/includes/session.inc.php
@@ -52,7 +52,7 @@ function _check_csrf_token($user) {
     }
 
     define('CSRF_TOKEN', $csrf_token);
-    header("X-CSRF-Token: ${csrf_token}");
+    header("X-CSRF-Token: {$csrf_token}");
 }
 
 function enc_secret($message) {
@@ -122,13 +122,13 @@ function dec_secret($code) {
 
 function _unset_cookie($name) {
     $is_ssl = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off';
-    setcookie($name, null, -1, null, null, $is_ssl);
+    setcookie($name, "", -1, "", "", $is_ssl);
 }
 
 function _store_auto_login($value) {
     $is_ssl = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off';
     // set for 30 days
-    setcookie('NSEDIT_AUTOLOGIN', $value, time()+60*60*24*30, null, null, $is_ssl);
+    setcookie('NSEDIT_AUTOLOGIN', $value, time()+60*60*24*30, "", "", $is_ssl);
 }
 
 function try_login() {