Merge branch 'master' into l20integration

5 files changed, 1 insertions, 8 deletions

diff --git a/contrib/gana b/contrib/gana
-Subproject c1dc2dc975742c929a523c22d91f7d4f8278723
+Subproject c4142e681a0921c186fe4a413840c2b884e8247
diff --git a/contrib/sphinx b/contrib/sphinx
-Subproject 9c5b9d9040d21542eff792e26624cf9669b127a
+Subproject e6d65efe70f694d030182401437d309532c1cc1
diff --git a/src/fs/meta_data.c b/src/fs/meta_data.c
index cf9448aa4..1e75ecf6c 100644
--- a/src/fs/meta_data.c
+++ b/src/fs/meta_data.c
@@ -24,12 +24,8 @@
  * @author Christian Grothoff
  * @author Martin Schanzenbach
  */
-
-
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
-
 #include "gnunet_fs_service.h"
 
 /**
diff --git a/src/util/helper.c b/src/util/helper.c
index d7fbb5ead..1dd3e33e2 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -25,8 +25,6 @@
  * @author Philipp Toelke
  * @author Christian Grothoff
  */
-
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/network.c b/src/util/network.c
index 34f34eec6..8c74c5626 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -24,9 +24,8 @@
  * @author Nils Durner
  * @author Christian Grothoff
  */
-
-#include "gnunet_common.h"
 #include "platform.h"
+#include "gnunet_common.h"
 #include "disk.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-network", __VA_ARGS__)