diff --git a/src/Makefile.am b/src/Makefile.am
index bca4861..a35ff9b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,8 @@ SUBDIRS = $(LOCAL_SIGCPP_DIR) lib pixmaps sounds win32 dic treedict
 
 bin_PROGRAMS = stardict
 
+DEFAULT_INCLUDES = -I$(top_builddir)
+
 INCLUDES =							                            \
 	$(STARDICT_CFLAGS)						                    \
 	$(LOCAL_SIGCPP_INCLUDE)	\
diff --git a/src/conf.h b/src/conf.h
index f8ec600..deaacd5 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
 #include <cstring>
+#include <stdlib.h>
 
 #include "config_file.hpp"
 
diff --git a/src/config_file.hpp b/src/config_file.hpp
index 1727e8b..6d9bd98 100644
--- a/src/config_file.hpp
+++ b/src/config_file.hpp
@@ -5,7 +5,7 @@
 #include <list>
 #include <string>
 
-#include "sigc++/sigc++.h"
+#include <sigc++/sigc++.h>
 
 class config_file;
 
diff --git a/src/gconf_file.cpp b/src/gconf_file.cpp
index a5b81c6..aecc057 100644
--- a/src/gconf_file.cpp
+++ b/src/gconf_file.cpp
@@ -22,6 +22,7 @@
 #  include "config.h"
 #endif
 
+#include <memory>
 #include <glib/gi18n.h>
 
 #include "gconf_file.hpp"
diff --git a/src/gtk_iskeyspressed.cpp b/src/gtk_iskeyspressed.cpp
index 16fe560..b689354 100644
--- a/src/gtk_iskeyspressed.cpp
+++ b/src/gtk_iskeyspressed.cpp
@@ -96,8 +96,7 @@ bool gtk_hotkeys::is_pressed(void)
     GDK_BUTTON4_MASK  = 1 << 11,
     GDK_BUTTON5_MASK  = 1 << 12,
   */
-
-  mask = GdkModifierType(guint(mask) & (1<<13)-1);
+  mask = GdkModifierType(guint(mask) & ((1<<13)-1));
 
   mask = 
     GdkModifierType(guint(mask) & ~(GDK_LOCK_MASK | GDK_BUTTON1_MASK | GDK_BUTTON2_MASK |
diff --git a/src/inifile.cpp b/src/inifile.cpp
index 2f73f7b..d4b9aea 100644
--- a/src/inifile.cpp
+++ b/src/inifile.cpp
@@ -26,6 +26,7 @@
 #include <cerrno>
 #include <cstring>
 #include <cstdio>
+#include <stdlib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/src/lib/common.cpp b/src/lib/common.cpp
index 6575ad9..b0b972e 100644
--- a/src/lib/common.cpp
+++ b/src/lib/common.cpp
@@ -24,6 +24,8 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
+#include <cstdlib>
 #include "common.hpp"
 
 static void parse_description(const char *p, long len, std::string &description)
diff --git a/src/lib/data.cpp b/src/lib/data.cpp
index 45c7d1a..1b29ec3 100644
--- a/src/lib/data.cpp
+++ b/src/lib/data.cpp
@@ -22,6 +22,7 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
 #include "kmp.h"
 
 #include "data.hpp"
diff --git a/src/lib/http_client.cpp b/src/lib/http_client.cpp
index 802a469..732f205 100644
--- a/src/lib/http_client.cpp
+++ b/src/lib/http_client.cpp
@@ -2,6 +2,7 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
 #include "http_client.h"
 #include "sockets.hpp"
 
diff --git a/src/lib/pluginmanager.cpp b/src/lib/pluginmanager.cpp
index de3e92d..eaca355 100644
--- a/src/lib/pluginmanager.cpp
+++ b/src/lib/pluginmanager.cpp
@@ -1,6 +1,7 @@
 #include "pluginmanager.h"
 #include "file.hpp"
 #include <string>
+#include <cstring>
 
 StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_):
 	plugin_filename(filename), module(module_), configure_func(configure_func_)
diff --git a/src/lib/stardict_client.cpp b/src/lib/stardict_client.cpp
index dcae5ce..12c4aab 100644
--- a/src/lib/stardict_client.cpp
+++ b/src/lib/stardict_client.cpp
@@ -22,6 +22,8 @@
 #  include "config.h"
 #endif
 
+#include <cstdlib>
+#include <cstring>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/src/lib/stddict.cpp b/src/lib/stddict.cpp
index feaf793..4aecdce 100644
--- a/src/lib/stddict.cpp
+++ b/src/lib/stddict.cpp
@@ -28,6 +28,7 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/src/lib/treedict.cpp b/src/lib/treedict.cpp
index 01fa89a..f0b3322 100644
--- a/src/lib/treedict.cpp
+++ b/src/lib/treedict.cpp
@@ -25,6 +25,7 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
 #include "file.hpp"
 #include "getuint32.h"
 
diff --git a/src/pangoview.cpp b/src/pangoview.cpp
index eb5d34d..a23b984 100644
--- a/src/pangoview.cpp
+++ b/src/pangoview.cpp
@@ -22,6 +22,7 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
 #include "gtktextviewpango.h"
 #include "utils.h"
 #include "skin.h"//for SkinCursor definition
diff --git a/src/utils.h b/src/utils.h
index fc2963e..24e561d 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -3,6 +3,7 @@
 
 #include <glib.h>
 #include <string>
+#include <string.h>
 #include <vector>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/src/x11_iskeyspressed.hpp b/src/x11_iskeyspressed.hpp
index 9b0d375..738bf20 100644
--- a/src/x11_iskeyspressed.hpp
+++ b/src/x11_iskeyspressed.hpp
@@ -5,6 +5,8 @@
 #include <X11/keysym.h>
 #include <gtk/gtk.h>
 
+#include <memory>
+
 #include "iskeyspressed.hpp"
 
 typedef enum { SYM, CODE, BUTTON } KeyType_t;
diff --git a/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp b/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
index c678b02..267f279 100644
--- a/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
+++ b/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
@@ -2,7 +2,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <string>
+#include <cstring>
 #include <map>
 #include <list>
 #include <vector>
diff --git a/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp b/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
index b779046..f608fb1 100644
--- a/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
+++ b/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
@@ -1,6 +1,6 @@
 #include "stardict_dictdotcn.h"
 #include <glib/gi18n.h>
-#include <string>
+#include <cstring>
 #include <list>
 
 #ifdef _WIN32
diff --git a/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp b/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
index 08d6f91..63b7faa 100644
--- a/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
+++ b/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
@@ -1,6 +1,7 @@
 #include "stardict_espeak.h"
 #include <espeak/speak_lib.h>
 #include <glib/gi18n.h>
+#include <cstring>
 
 static const StarDictPluginSystemInfo *plugin_info = NULL;
 static std::string voice_engine;
diff --git a/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp b/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
index f522e07..63fdf08 100644
--- a/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
+++ b/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
@@ -1,7 +1,8 @@
 #include "stardict_gucharmap.h"
 #include <glib/gi18n.h>
 #include <gucharmap/gucharmap.h>
-#include <string>
+#include <stdlib.h>
+#include <cstring>
 
 static char *build_dictdata(char type, const char *definition)
 {
diff --git a/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp b/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
index 8bb78e8..9db2bf6 100644
--- a/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
+++ b/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
@@ -1,5 +1,7 @@
 #include "stardict_html_parsedata.h"
 #include <glib/gi18n.h>
+#include <cstring>
+#include <stdlib.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/stardict-plugins/stardict-man-plugin/stardict_man.cpp b/stardict-plugins/stardict-man-plugin/stardict_man.cpp
index 1587e46..1950d8b 100644
--- a/stardict-plugins/stardict-man-plugin/stardict_man.cpp
+++ b/stardict-plugins/stardict-man-plugin/stardict_man.cpp
@@ -1,5 +1,6 @@
 #include "stardict_man.h"
 #include <glib/gi18n.h>
+#include <cstring>
 #include <string>
 
 static const StarDictPluginSystemInfo *plugin_info = NULL;
diff --git a/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp b/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
index 068ebbe..4da5c81 100644
--- a/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
+++ b/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
@@ -1,4 +1,5 @@
 #include "stardict_powerword_parsedata.h"
+#include <cstring>
 #include <glib/gi18n.h>
 
 #ifdef _WIN32
diff --git a/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp b/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
index 65234dc..c256ff8 100644
--- a/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
+++ b/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
@@ -1,6 +1,8 @@
 #include "stardict_qqwry.h"
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
+#include <cstring>
+#include <stdlib.h>
 #include <string>
 
 #ifdef _WIN32
diff --git a/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp b/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
index af3e8ae..c337c3a 100644
--- a/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
+++ b/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
@@ -3,6 +3,7 @@
 #include <glib/gi18n.h>
 #include <enchant.h>
 #include <pango/pango.h>
+#include <cstring>
 #include <string>
 #include <vector>
 
diff --git a/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp b/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
index 76f18d4..baa3331 100644
--- a/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
+++ b/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
@@ -1,5 +1,7 @@
 #include "stardict_update_info.h"
 #include <glib/gi18n.h>
+#include <cstring>
+#include <stdlib.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp b/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
index 0cfade9..f1a0277 100644
--- a/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
+++ b/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
@@ -1,5 +1,6 @@
 #include "stardict_wiki2xml.h"
 #include "WIKI2XML.h"
+#include <cstring>
 #include <glib.h>
 
 std::string wiki2xml(std::string &str)
diff --git a/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp b/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
index fdf5270..8a6f7b0 100644
--- a/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
+++ b/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
@@ -1,5 +1,6 @@
 #include "stardict_wiki_parsedata.h"
 #include "stardict_wiki2xml.h"
+#include <cstring>
 #include <glib/gi18n.h>
 
 #ifdef _WIN32
diff --git a/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp b/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
index 37b227e..97be8d4 100644
--- a/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
+++ b/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
@@ -1,7 +1,7 @@
 #include "court_widget.h"
 #include <math.h>
 #include <list>
-
+#include <cstring>
 
 wnobj::wnobj(partic_t & p, unsigned int t) : _p(p), _t(t), highlight(false)
 {
diff --git a/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp b/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
index 043afaf..50622ca 100644
--- a/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
+++ b/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
@@ -1,6 +1,7 @@
 #include "stardict_wordnet.h"
 #include "court_widget.h"
 #include <glib/gi18n.h>
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp b/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
index 9f9ab9f..c5397e1 100644
--- a/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
+++ b/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
@@ -1,4 +1,5 @@
 #include "stardict_wordnet_parsedata.h"
+#include <cstring>
 #include <glib/gi18n.h>
 
 #ifdef _WIN32
diff --git a/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp b/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
index 905a01d..b143b90 100644
--- a/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
+++ b/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
@@ -1,4 +1,5 @@
 #include "stardict_xdxf_parsedata.h"
+#include <cstring>
 #include <glib/gi18n.h>
 
 #ifdef _WIN32
diff --git a/tests/t_config_file.cpp b/tests/t_config_file.cpp
index 73e2a52..36330ca 100644
--- a/tests/t_config_file.cpp
+++ b/tests/t_config_file.cpp
@@ -2,6 +2,7 @@
 #  include "config.h"
 #endif
 
+#include <memory>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
diff --git a/tests/t_xml.cpp b/tests/t_xml.cpp
index a20422d..1b7a05d 100644
--- a/tests/t_xml.cpp
+++ b/tests/t_xml.cpp
@@ -3,6 +3,7 @@
 #endif
 
 #include <glib.h>
+#include <cstring>
 #include <cstdlib>
 #include <string>