Merge branch 'collectd-4.2' into collectd-4.3

diff --cc src/collectd.c
index 984ff75,ab9c89d..4e521f9
--- 1/src/collectd.c
--- 2/src/collectd.c
+++ b/src/collectd.c
@@@ -23,13 -23,14 +23,17 @@@
  #include "collectd.h"
  #include "common.h"
  
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netdb.h>
 +
  #include "plugin.h"
  #include "configfile.h"
 -#include "types_list.h"
  
+ #if HAVE_STATGRAB_H
+ # include <statgrab.h>
+ #endif
+ 
  /*
   * Global variables
   */