--- src/inifile.cpp
+++ src/inifile.cpp
@@ -26,6 +26,7 @@
 #include <cerrno>
 #include <cstring>
 #include <cstdio>
+#include <cstdlib>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
--- src/lib/common.hpp
+++ src/lib/common.hpp
@@ -4,6 +4,8 @@
 #include <glib.h>
 #include <list>
 #include <string>
+#include <cstring>
+#include <cstdlib>
 
 //this structure contain all information about dictionary
 struct DictInfo {
--- src/lib/data.hpp
+++ src/lib/data.hpp
@@ -4,6 +4,7 @@
 #include <glib.h>
 #include <vector>
 #include <string>
+#include <cstring>
 #include <memory>
 
 #include "dictziplib.hpp"
--- src/lib/pluginmanager.cpp
+++ 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_)
--- src/lib/sockets.hpp
+++ src/lib/sockets.hpp
@@ -3,6 +3,8 @@
 
 #include <glib.h>
 #include <string>
+#include <cstring>
+#include <cstdlib>
 #include <map>
 #ifndef _WIN32
 #  include <netdb.h>
--- src/sigc++/macros/signal.h.m4
+++ src/sigc++/macros/signal.h.m4
@@ -483,7 +483,7 @@
   //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
   //do not allow a typedef to have the same name as a class in the typedef's definition.
   //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
-  #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
+  //#define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
 #endif
 
 namespace sigc {
--- src/sigc++/signal.h
+++ src/sigc++/signal.h
@@ -18,7 +18,7 @@
   //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
   //do not allow a typedef to have the same name as a class in the typedef's definition.
   //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
-  #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
+  //#define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
 #endif
 
 namespace sigc {
--- src/utils.h
+++ src/utils.h
@@ -3,6 +3,7 @@
 
 #include <glib.h>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
--- src/x11_iskeyspressed.hpp
+++ src/x11_iskeyspressed.hpp
@@ -4,6 +4,7 @@
 #include <gdk/gdkx.h>
 #include <X11/keysym.h>
 #include <gtk/gtk.h>
+#include <memory>
 
 #include "iskeyspressed.hpp"
 
--- stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
+++ stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
@@ -1,6 +1,7 @@
 #include "stardict_dictdotcn.h"
 #include <glib/gi18n.h>
 #include <string>
+#include <cstring>
 #include <list>
 
 #ifdef _WIN32
--- stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
+++ 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 <cstdlib>
 
 #ifdef _WIN32
 #include <windows.h>
--- stardict-plugins/stardict-man-plugin/stardict_man.cpp
+++ stardict-plugins/stardict-man-plugin/stardict_man.cpp
@@ -1,6 +1,7 @@
 #include "stardict_man.h"
 #include <glib/gi18n.h>
 #include <string>
+#include <cstring>
 
 static const StarDictPluginSystemInfo *plugin_info = NULL;
 static bool need_prefix;
--- stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
+++ stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
@@ -1,5 +1,6 @@
 #include "stardict_powerword_parsedata.h"
 #include <glib/gi18n.h>
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>
--- stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
+++ stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
@@ -2,6 +2,8 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <string>
+#include <cstring>
+#include <cstdlib>
 
 #ifdef _WIN32
 #include <windows.h>
--- stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
+++ stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
@@ -1,6 +1,7 @@
 #include "stardict_wiki2xml.h"
 #include "WIKI2XML.h"
 #include <glib.h>
+#include <cstring>
 
 std::string wiki2xml(std::string &str)
 {
--- stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
+++ stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
@@ -1,6 +1,7 @@
 #include "stardict_wiki_parsedata.h"
 #include "stardict_wiki2xml.h"
 #include <glib/gi18n.h>
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>
--- stardict-plugins/stardict-wordnet-plugin/court_widget.h
+++ stardict-plugins/stardict-wordnet-plugin/court_widget.h
@@ -3,6 +3,7 @@
 
 #include <gtk/gtk.h>
 #include <string>
+#include <cstring>
 #include <vector>
 
 #include "partic.hpp"
--- stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
+++ stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
@@ -1,5 +1,6 @@
 #include "stardict_wordnet_parsedata.h"
 #include <glib/gi18n.h>
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>
--- stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
+++ stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
@@ -1,5 +1,6 @@
 #include "stardict_xdxf_parsedata.h"
 #include <glib/gi18n.h>
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>
--- tests/t_config_file.cpp
+++ tests/t_config_file.cpp
@@ -8,6 +8,7 @@
 #include <cstring>
 #include <iterator>
 #include <iostream>
+#include <memory>
 #include <gtk/gtk.h>
 
 #include "config_file.hpp"
--- tests/t_xml.cpp
+++ tests/t_xml.cpp
@@ -5,6 +5,7 @@
 #include <glib.h>
 #include <cstdlib>
 #include <string>
+#include <cstring>
 
 
 static void xml_decode(const char *str, std::string& decoded)