diff --git a/add-domain.php b/add-domain.php
index d39dd94..e06b3a0 100644
--- a/add-domain.php
+++ b/add-domain.php
@@ -1,3 +1,7 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,10 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-?>
 <html>
     <head>
         <title>PDNS Manager - Domains</title>
diff --git a/domains.php b/domains.php
index d126bf8..fb8aacb 100644
--- a/domains.php
+++ b/domains.php
@@ -1,3 +1,7 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,10 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-?>
 <html>
     <head>
         <title>PDNS Manager - Domains</title>
diff --git a/edit-master.php b/edit-master.php
index bc11571..798b340 100644
--- a/edit-master.php
+++ b/edit-master.php
@@ -1,3 +1,7 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,10 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-?>
 <html>
     <head>
         <title>PDNS Manager - Domains</title>
diff --git a/edit-remote.php b/edit-remote.php
index ce54668..7a6ce31 100644
--- a/edit-remote.php
+++ b/edit-remote.php
@@ -1,3 +1,7 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,10 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-?>
 <html>
     <head>
         <title>PDNS Manager - Remotes</title>
diff --git a/edit-user.php b/edit-user.php
index 7eac887..a6ac67d 100644
--- a/edit-user.php
+++ b/edit-user.php
@@ -1,3 +1,7 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,10 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-?>
 <html>
     <head>
         <title>PDNS Manager - Users</title>
diff --git a/install.php b/install.php
index 35ec7ed..a8bcde2 100644
--- a/install.php
+++ b/install.php
@@ -1,3 +1,9 @@
+<?php
+    require_once 'lib/headers.php';
+    if(file_exists("config/config-user.php")) {
+        Header("Location: index.php");
+    }
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,12 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    if(file_exists("config/config-user.php")) {
-        Header("Location: index.php");
-    }
-?>
 <html>
     <head>
         <title>PDNS Manager - Domains</title>
diff --git a/logout.php b/logout.php
index 999e6fb..4a1ec1d 100644
--- a/logout.php
+++ b/logout.php
@@ -1,3 +1,9 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+    session_destroy();
+    setcookie("authSecret", "", 1, "/", "", false, true);
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,12 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-    session_destroy();
-    setcookie("authSecret", "", 1, "/", "", false, true);
-?>
 <html>
     <head>
         <title>PDNS Manager</title>
diff --git a/password.php b/password.php
index 858e0a3..8d4f223 100644
--- a/password.php
+++ b/password.php
@@ -1,3 +1,7 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,10 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-?>
 <html>
     <head>
         <title>PDNS Manager - Password</title>
diff --git a/upgrade.php b/upgrade.php
index 0b5b9f4..0e4e9be 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -1,3 +1,12 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'config/config-default.php';
+    require_once 'lib/database.php';
+    require_once 'lib/checkversion.php';
+    if(checkVersion($db)) {
+        Header("Location: index.php");
+    }
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,15 +20,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'config/config-default.php';
-    require_once 'lib/database.php';
-    require_once 'lib/checkversion.php';
-    if(checkVersion($db)) {
-        Header("Location: index.php");
-    }
-?>
 <html>
     <head>
         <title>PDNS Manager - Upgrade</title>
diff --git a/users.php b/users.php
index 9c5d14f..d76b087 100644
--- a/users.php
+++ b/users.php
@@ -1,3 +1,7 @@
+<?php
+    require_once 'lib/headers.php';
+    require_once 'lib/session.php';
+?>
 <!DOCTYPE html>
 <!--
 Copyright 2016 Lukas Metzger <developer@lukas-metzger.com>.
@@ -11,10 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<?php
-    require_once 'lib/headers.php';
-    require_once 'lib/session.php';
-?>
 <html>
     <head>
         <title>PDNS Manager - Users</title>
