From 3b7ef5348b728cbc916f5caa24938ff0581625cc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 2 Feb 2014 19:56:23 +0000
Subject: m_database.h is not needed in many cases

git-svn-id: http://svn.miranda-ng.org/main/trunk@8017 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/AddContactPlus/src/addcontactplus.h      | 2 +-
 plugins/Alarms/src/common.h                      | 2 +-
 plugins/BossKeyPlus/src/BossKey.h                | 2 +-
 plugins/ChangeKeyboardLayout/src/commonheaders.h | 2 +-
 plugins/CrashDumper/src/utils.h                  | 2 +-
 plugins/CryptoPP/src/commonheaders.h             | 2 +-
 plugins/Exchange/src/commonheaders.h             | 2 +-
 plugins/FTPFileYM/src/common.h                   | 2 +-
 plugins/FirstRun/src/commonheaders.h             | 2 +-
 plugins/LotusNotify/src/stdafx.h                 | 1 -
 plugins/ModernOpt/src/commonheaders.h            | 2 +-
 plugins/MsgPopup/src/common.h                    | 2 +-
 plugins/NotesAndReminders/src/globals.h          | 2 +-
 plugins/PackUpdater/Src/Common.h                 | 2 +-
 plugins/PasteIt/src/stdafx.h                     | 2 +-
 plugins/QuickMessages/src/quickmessages.h        | 2 +-
 plugins/QuickReplies/src/common.h                | 2 +-
 plugins/Sessions/Src/Sessions.h                  | 2 +-
 plugins/SimpleStatusMsg/src/commonheaders.h      | 2 +-
 plugins/SkypeStatusChange/src/stdafx.h           | 1 -
 plugins/StartPosition/src/Common.h               | 2 +-
 plugins/StartupSilence/src/StartupSilence.h      | 2 +-
 plugins/TranslitSwitcher/src/TranslitSwitcher.h  | 2 +-
 plugins/UserGuide/src/commonheaders.h            | 2 +-
 plugins/VersionInfo/src/common.h                 | 2 +-
 plugins/Watrack_MPD/src/commonheaders.h          | 2 +-
 plugins/WhoUsesMyFiles/src/wumf.h                | 2 +-
 plugins/YAPP/src/common.h                        | 2 +-
 plugins/YahooGroups/src/commonheaders.h          | 2 +-
 plugins/mTextControl/src/headers.h               | 2 +-
 protocols/Omegle/src/common.h                    | 1 -
 protocols/Skype/src/skype.h                      | 1 -
 src/core/stdautoaway/commonheaders.h             | 2 +-
 src/core/stdaway/commonheaders.h                 | 2 +-
 src/core/stdchat/src/chat.h                      | 2 +-
 src/core/stdcrypt/commonheaders.h                | 2 +-
 src/core/stdemail/commonheaders.h                | 2 +-
 src/core/stdhelp/commonheaders.h                 | 2 +-
 src/core/stdidle/commonheaders.h                 | 2 +-
 39 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/plugins/AddContactPlus/src/addcontactplus.h b/plugins/AddContactPlus/src/addcontactplus.h
index 24ee4fa99a..cf7fb0ee0e 100644
--- a/plugins/AddContactPlus/src/addcontactplus.h
+++ b/plugins/AddContactPlus/src/addcontactplus.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <win2k.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_clistint.h>
 #include <m_genmenu.h>
 #include <m_hotkeys.h>
diff --git a/plugins/Alarms/src/common.h b/plugins/Alarms/src/common.h
index c2116c679b..76b82b44b9 100644
--- a/plugins/Alarms/src/common.h
+++ b/plugins/Alarms/src/common.h
@@ -13,7 +13,7 @@
 #include <shellapi.h>
 
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_options.h>
 #include <m_skin.h>
 #include <m_protomod.h>
diff --git a/plugins/BossKeyPlus/src/BossKey.h b/plugins/BossKeyPlus/src/BossKey.h
index 3e44dcbbb9..b28d22efdd 100644
--- a/plugins/BossKeyPlus/src/BossKey.h
+++ b/plugins/BossKeyPlus/src/BossKey.h
@@ -33,7 +33,7 @@
 #include <Wtsapi32.h>
 
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_protosvc.h>
 #include <m_options.h>
diff --git a/plugins/ChangeKeyboardLayout/src/commonheaders.h b/plugins/ChangeKeyboardLayout/src/commonheaders.h
index 9a498b6e58..02eca1d1e6 100644
--- a/plugins/ChangeKeyboardLayout/src/commonheaders.h
+++ b/plugins/ChangeKeyboardLayout/src/commonheaders.h
@@ -10,7 +10,7 @@
 #include <newpluginapi.h>
 #include <m_options.h>
 #include <m_langpack.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_system.h>
 #include <m_skin.h>
 #include <m_popup.h>
diff --git a/plugins/CrashDumper/src/utils.h b/plugins/CrashDumper/src/utils.h
index 5696458da3..64c1c6483c 100644
--- a/plugins/CrashDumper/src/utils.h
+++ b/plugins/CrashDumper/src/utils.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <malloc.h>
 
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_clist.h>
 #include <m_skin.h>
diff --git a/plugins/CryptoPP/src/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h
index e22be72091..9b4fce001a 100644
--- a/plugins/CryptoPP/src/commonheaders.h
+++ b/plugins/CryptoPP/src/commonheaders.h
@@ -42,7 +42,7 @@
 // Miranda API
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_protomod.h>
 #include <m_protosvc.h>
diff --git a/plugins/Exchange/src/commonheaders.h b/plugins/Exchange/src/commonheaders.h
index bbfdcc9b59..656dc8af13 100644
--- a/plugins/Exchange/src/commonheaders.h
+++ b/plugins/Exchange/src/commonheaders.h
@@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>
 #include <m_core.h>
 #include <m_popup.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_system.h>
 //#include "m_skin.h"
 #include <m_options.h>
diff --git a/plugins/FTPFileYM/src/common.h b/plugins/FTPFileYM/src/common.h
index 80dfddeb1c..c8b4d645a4 100644
--- a/plugins/FTPFileYM/src/common.h
+++ b/plugins/FTPFileYM/src/common.h
@@ -50,7 +50,7 @@ using namespace std;
 #include <newpluginapi.h>
 #include <m_button.h>
 #include <m_clist.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_hotkeys.h>
 #include <m_icolib.h>
 #include <m_message.h>
diff --git a/plugins/FirstRun/src/commonheaders.h b/plugins/FirstRun/src/commonheaders.h
index 12a9562e5e..369f963af8 100644
--- a/plugins/FirstRun/src/commonheaders.h
+++ b/plugins/FirstRun/src/commonheaders.h
@@ -5,6 +5,6 @@
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_protocols.h>
-#include <m_database.h>
+#include <m_utils.h>
 
 #include "Version.h"
\ No newline at end of file
diff --git a/plugins/LotusNotify/src/stdafx.h b/plugins/LotusNotify/src/stdafx.h
index f05394b3e0..c61bdbf3e8 100644
--- a/plugins/LotusNotify/src/stdafx.h
+++ b/plugins/LotusNotify/src/stdafx.h
@@ -16,7 +16,6 @@
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_skin.h>
-#include <m_database.h>
 #include <m_langpack.h>
 #include <m_options.h>
 #include <m_popup.h>
diff --git a/plugins/ModernOpt/src/commonheaders.h b/plugins/ModernOpt/src/commonheaders.h
index f86a02b766..071043562b 100644
--- a/plugins/ModernOpt/src/commonheaders.h
+++ b/plugins/ModernOpt/src/commonheaders.h
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <win2k.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_clistint.h>
 #include <m_protomod.h>
diff --git a/plugins/MsgPopup/src/common.h b/plugins/MsgPopup/src/common.h
index 2e85b4b5c3..6f7192aca2 100644
--- a/plugins/MsgPopup/src/common.h
+++ b/plugins/MsgPopup/src/common.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <dbghelp.h>
 
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_options.h>
 #include <m_popup.h>
diff --git a/plugins/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h
index e440c95870..e63446f5c9 100644
--- a/plugins/NotesAndReminders/src/globals.h
+++ b/plugins/NotesAndReminders/src/globals.h
@@ -7,7 +7,7 @@
 
 #include <win2k.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_clist.h>
 #include <m_langpack.h>
 #include <m_options.h>
diff --git a/plugins/PackUpdater/Src/Common.h b/plugins/PackUpdater/Src/Common.h
index 881a558062..e36579e804 100644
--- a/plugins/PackUpdater/Src/Common.h
+++ b/plugins/PackUpdater/Src/Common.h
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.
 #include <m_skin.h>
 #include <m_langpack.h>
 #include <m_options.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_popup.h>
 #include <m_hotkeys.h>
 #include <m_netlib.h>
diff --git a/plugins/PasteIt/src/stdafx.h b/plugins/PasteIt/src/stdafx.h
index 75006155b0..959524e03e 100644
--- a/plugins/PasteIt/src/stdafx.h
+++ b/plugins/PasteIt/src/stdafx.h
@@ -26,7 +26,7 @@
 #include <m_message.h>
 #include <m_protosvc.h>
 #include <m_options.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_chat.h>
 
 #include <m_msg_buttonsbar.h>
diff --git a/plugins/QuickMessages/src/quickmessages.h b/plugins/QuickMessages/src/quickmessages.h
index d68f03ee8b..e40ef0c385 100644
--- a/plugins/QuickMessages/src/quickmessages.h
+++ b/plugins/QuickMessages/src/quickmessages.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_options.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_protomod.h>
 #include <m_langpack.h>
 #include <m_icolib.h>
diff --git a/plugins/QuickReplies/src/common.h b/plugins/QuickReplies/src/common.h
index 438fe0d388..b09b83f3a2 100644
--- a/plugins/QuickReplies/src/common.h
+++ b/plugins/QuickReplies/src/common.h
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.
 #include <vector>
 
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_message.h>
 #include <m_options.h>
diff --git a/plugins/Sessions/Src/Sessions.h b/plugins/Sessions/Src/Sessions.h
index b7e9186f62..fd9c805235 100644
--- a/plugins/Sessions/Src/Sessions.h
+++ b/plugins/Sessions/Src/Sessions.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <newpluginapi.h>
 #include <m_options.h>
 #include <m_clc.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_icolib.h>
 #include <m_message.h>
diff --git a/plugins/SimpleStatusMsg/src/commonheaders.h b/plugins/SimpleStatusMsg/src/commonheaders.h
index 296d8f54a0..30b7b51e82 100644
--- a/plugins/SimpleStatusMsg/src/commonheaders.h
+++ b/plugins/SimpleStatusMsg/src/commonheaders.h
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <m_options.h>
 #include <m_langpack.h>
 #include <m_protosvc.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_awaymsg.h>
 #include <m_idle.h>
 #include <m_icolib.h>
diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h
index ebc0f3036d..c144cc9082 100644
--- a/plugins/SkypeStatusChange/src/stdafx.h
+++ b/plugins/SkypeStatusChange/src/stdafx.h
@@ -12,7 +12,6 @@
 #include <m_protocols.h>
 #include <m_protosvc.h>
 #include <m_awaymsg.h>
-#include <m_database.h>
 #include <m_options.h>
 #include <m_langpack.h>
 #include <m_utils.h>
diff --git a/plugins/StartPosition/src/Common.h b/plugins/StartPosition/src/Common.h
index eadb6ee1e2..53509894d8 100644
--- a/plugins/StartPosition/src/Common.h
+++ b/plugins/StartPosition/src/Common.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <newpluginapi.h>
 #include <m_langpack.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_options.h>
 
 #include "resource.h"
diff --git a/plugins/StartupSilence/src/StartupSilence.h b/plugins/StartupSilence/src/StartupSilence.h
index f07b50db32..10514da85d 100644
--- a/plugins/StartupSilence/src/StartupSilence.h
+++ b/plugins/StartupSilence/src/StartupSilence.h
@@ -8,7 +8,7 @@
 #include <m_skin.h>
 #include <m_popup.h>
 #include <m_langpack.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_icolib.h>
 #include <m_options.h>
 #include <m_protocols.h>
diff --git a/plugins/TranslitSwitcher/src/TranslitSwitcher.h b/plugins/TranslitSwitcher/src/TranslitSwitcher.h
index 20dc5c9ae4..834bb033bf 100644
--- a/plugins/TranslitSwitcher/src/TranslitSwitcher.h
+++ b/plugins/TranslitSwitcher/src/TranslitSwitcher.h
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.
 
 #include <newpluginapi.h>
 #include <m_langpack.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_hotkeys.h>
 #include <win2k.h>
 #include <m_icolib.h>
diff --git a/plugins/UserGuide/src/commonheaders.h b/plugins/UserGuide/src/commonheaders.h
index 03ce9e5ec0..e698d2adc0 100644
--- a/plugins/UserGuide/src/commonheaders.h
+++ b/plugins/UserGuide/src/commonheaders.h
@@ -4,7 +4,7 @@
 
 #include <newpluginapi.h>
 #include <m_langpack.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_clist.h>
 #include <m_skin.h>
 
diff --git a/plugins/VersionInfo/src/common.h b/plugins/VersionInfo/src/common.h
index c446a76469..16107fd7e7 100644
--- a/plugins/VersionInfo/src/common.h
+++ b/plugins/VersionInfo/src/common.h
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <newpluginapi.h>
 #include <m_langpack.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_clist.h>
 #include <m_options.h>
 #include <m_popup.h>
diff --git a/plugins/Watrack_MPD/src/commonheaders.h b/plugins/Watrack_MPD/src/commonheaders.h
index ebf41e6819..6d80044c73 100755
--- a/plugins/Watrack_MPD/src/commonheaders.h
+++ b/plugins/Watrack_MPD/src/commonheaders.h
@@ -22,7 +22,7 @@
 
 #include <newpluginapi.h>
 #include <m_netlib.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_options.h>
 #include <m_langpack.h>
 
diff --git a/plugins/WhoUsesMyFiles/src/wumf.h b/plugins/WhoUsesMyFiles/src/wumf.h
index a60fb23404..104e6d50a2 100644
--- a/plugins/WhoUsesMyFiles/src/wumf.h
+++ b/plugins/WhoUsesMyFiles/src/wumf.h
@@ -9,7 +9,7 @@
 #include <m_options.h>
 #include <m_langpack.h>
 #include <m_clist.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_popup.h>
 #include <win2k.h>
 
diff --git a/plugins/YAPP/src/common.h b/plugins/YAPP/src/common.h
index b906cdcf48..6262d36a51 100644
--- a/plugins/YAPP/src/common.h
+++ b/plugins/YAPP/src/common.h
@@ -34,7 +34,7 @@
 #include <malloc.h>
 
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_langpack.h>
 #include <m_options.h>
 #include <m_skin.h>
diff --git a/plugins/YahooGroups/src/commonheaders.h b/plugins/YahooGroups/src/commonheaders.h
index e89e48e214..61d51f6236 100644
--- a/plugins/YahooGroups/src/commonheaders.h
+++ b/plugins/YahooGroups/src/commonheaders.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_clist.h>
 #include <m_contacts.h>
 #include <m_langpack.h>
diff --git a/plugins/mTextControl/src/headers.h b/plugins/mTextControl/src/headers.h
index b3df760548..c9eaed3639 100644
--- a/plugins/mTextControl/src/headers.h
+++ b/plugins/mTextControl/src/headers.h
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <newpluginapi.h>
 #include <m_langpack.h>
-#include <m_database.h>
+#include <m_utils.h>
 
 #include <m_text.h>
 #include <m_smileyadd.h>
diff --git a/protocols/Omegle/src/common.h b/protocols/Omegle/src/common.h
index 25f088b66a..3237a333ac 100644
--- a/protocols/Omegle/src/common.h
+++ b/protocols/Omegle/src/common.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_system_cpp.h>
 #include <m_chat.h>
 #include <m_clistint.h>
-#include <m_database.h>
 #include <m_langpack.h>
 #include <m_netlib.h>
 #include <m_options.h>
diff --git a/protocols/Skype/src/skype.h b/protocols/Skype/src/skype.h
index d27c7564ab..9e8f436a7f 100644
--- a/protocols/Skype/src/skype.h
+++ b/protocols/Skype/src/skype.h
@@ -21,7 +21,6 @@
 #include <m_clistint.h>
 #include <m_clui.h>
 #include <m_core.h>
-#include <m_database.h>
 #include <m_ignore.h>
 #include <m_langpack.h>
 #include <m_message.h>
diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h
index 413fa3430d..b11a377e25 100644
--- a/src/core/stdautoaway/commonheaders.h
+++ b/src/core/stdautoaway/commonheaders.h
@@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_netlib.h>
 #include <m_crypto.h>
 #include <m_langpack.h>
diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h
index 002b2bad4d..d067e7e7db 100644
--- a/src/core/stdaway/commonheaders.h
+++ b/src/core/stdaway/commonheaders.h
@@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
 #include <m_clist.h>
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index 83421a44d5..acd01aabfd 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_options.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_utils.h>
 #include <m_langpack.h>
 #include <m_skin.h>
diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/commonheaders.h
index 2ad7031f79..a86f828180 100644
--- a/src/core/stdcrypt/commonheaders.h
+++ b/src/core/stdcrypt/commonheaders.h
@@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
 #include <m_button.h>
diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h
index f027e47929..c4aab03b84 100644
--- a/src/core/stdemail/commonheaders.h
+++ b/src/core/stdemail/commonheaders.h
@@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
 #include <m_clistint.h>
diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h
index ca154ba24b..9caed79e40 100644
--- a/src/core/stdhelp/commonheaders.h
+++ b/src/core/stdhelp/commonheaders.h
@@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
 #include <m_clist.h>
diff --git a/src/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h
index 77faadcfe7..282313e51c 100644
--- a/src/core/stdidle/commonheaders.h
+++ b/src/core/stdidle/commonheaders.h
@@ -50,7 +50,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
-#include <m_database.h>
+#include <m_utils.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
 #include <m_clist.h>
-- 
cgit v1.2.3