diff --git a/api/index.php b/api/index.php
index 333c64830..d1e02bbd4 100644
--- a/api/index.php
+++ b/api/index.php
@@ -12,7 +12,6 @@
 	define('NO_SESSION_AUTOSTART', true);
 
 	require_once "autoload.php";
-	require_once "db-prefs.php";
 	require_once "functions.php";
 	require_once "sessions.php";
 
diff --git a/backend.php b/backend.php
index 32eb3f3b9..9bc1449d0 100644
--- a/backend.php
+++ b/backend.php
@@ -26,7 +26,6 @@
 	require_once "autoload.php";
 	require_once "sessions.php";
 	require_once "functions.php";
-	require_once "db-prefs.php";
 
 	$op = (string)clean($op);
 	$method = (string)clean($method);
diff --git a/include/db-prefs.php b/include/db-prefs.php
deleted file mode 100644
index ce5753638..000000000
--- a/include/db-prefs.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-	function get_pref($pref_name, $user_id = false, $die_on_error = false) {
-		return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
-	}
-
-	function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) {
-		return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
-	}
\ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
index 172ba169d..a698fa79d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -42,6 +42,14 @@
 		define('SUBSTRING_FOR_DATE', 'SUBSTRING');
 	}
 
+	function get_pref($pref_name, $user_id = false, $die_on_error = false) {
+		return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
+	}
+
+	function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) {
+		return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
+	}
+
 	function get_translations() {
 		$t = array(
 					"auto"  => __("Detect automatically"),
@@ -152,7 +160,6 @@
 		}
 	}
 
-	require_once 'db-prefs.php';
 	require_once 'controls.php';
 	require_once 'controls_compat.php';
 
diff --git a/index.php b/index.php
index d640c2db9..1f2802864 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,6 @@
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
-	require_once "db-prefs.php";
 
 	if (!init_plugins()) return;
 
diff --git a/prefs.php b/prefs.php
index 141118534..851dd898a 100644
--- a/prefs.php
+++ b/prefs.php
@@ -6,7 +6,6 @@
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
-	require_once "db-prefs.php";
 
 	if (!init_plugins()) return;
 
diff --git a/public.php b/public.php
index 8a02387cf..43aa66c1d 100644
--- a/public.php
+++ b/public.php
@@ -6,7 +6,6 @@
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
-	require_once "db-prefs.php";
 
 	startup_gettext();
 
diff --git a/update.php b/update.php
index af541f517..8d8566db7 100755
--- a/update.php
+++ b/update.php
@@ -10,7 +10,6 @@
 	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
-	require_once "db-prefs.php";
 
 	function make_stampfile($filename) {
 		$fp = fopen(Config::get(Config::LOCK_DIRECTORY) . "/$filename", "w");
diff --git a/update_daemon2.php b/update_daemon2.php
index 2743a0fa2..b75f06ae5 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -11,7 +11,6 @@
 	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
-	require_once "db-prefs.php";
 
 	if (!function_exists('pcntl_fork')) {
 		die("error: This script requires PHP compiled with PCNTL module.\n");