-fix header inclusion

4 files changed, 20 insertions, 16 deletions

diff --git a/src/mesh/gnunet-service-mesh_channel.h b/src/mesh/gnunet-service-mesh_channel.h
index 154e92b0d..48f3e897d 100644
--- a/src/mesh/gnunet-service-mesh_channel.h
+++ b/src/mesh/gnunet-service-mesh_channel.h
@@ -40,13 +40,15 @@ extern "C"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-#include "gnunet-service-mesh_tunnel.h"
-
 /**
  * Struct containing all information regarding a channel to a remote client.
  */
 struct MeshChannel;
 
+
+#include "gnunet-service-mesh_tunnel.h"
+
+
 /**
  * Get channel ID.
  *
@@ -241,4 +243,4 @@ GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
 
 /* ifndef GNUNET_SERVICE_MESH_CHANNEL_H */
 #endif
-/* end of gnunet-service-mesh_channel.h */
\ No newline at end of file
+/* end of gnunet-service-mesh_channel.h */
diff --git a/src/mesh/gnunet-service-mesh_connection.h b/src/mesh/gnunet-service-mesh_connection.h
index 2552623c3..6b53b17cf 100644
--- a/src/mesh/gnunet-service-mesh_connection.h
+++ b/src/mesh/gnunet-service-mesh_connection.h
@@ -39,10 +39,6 @@ extern "C"
 
 #include "gnunet_util_lib.h"
 
-#include "mesh_path.h"
-#include "gnunet-service-mesh_channel.h"
-#include "gnunet-service-mesh_peer.h"
-
 
 /**
  * All the states a connection can be in.
@@ -76,6 +72,10 @@ enum MeshConnectionState
  */
 struct MeshConnection;
 
+#include "mesh_path.h"
+#include "gnunet-service-mesh_channel.h"
+#include "gnunet-service-mesh_peer.h"
+
 
 
 
@@ -407,4 +407,4 @@ GMC_send_destroy (struct MeshConnection *c);
 
 /* ifndef GNUNET_SERVICE_MESH_CONNECTION_H */
 #endif
-/* end of gnunet-service-mesh_connection.h */
\ No newline at end of file
+/* end of gnunet-service-mesh_connection.h */
diff --git a/src/mesh/gnunet-service-mesh_peer.h b/src/mesh/gnunet-service-mesh_peer.h
index 6ac3e3801..065da7731 100644
--- a/src/mesh/gnunet-service-mesh_peer.h
+++ b/src/mesh/gnunet-service-mesh_peer.h
@@ -40,13 +40,13 @@ extern "C"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-#include "gnunet-service-mesh_connection.h"
-
 /**
  * Struct containing all information regarding a given peer
  */
 struct MeshPeer;
 
+#include "gnunet-service-mesh_connection.h"
+
 
 /******************************************************************************/
 /********************************    API    ***********************************/
@@ -78,7 +78,7 @@ GMP_shutdown (void);
  * @param fwd Is this a message going root->dest? (FWD ACK are NOT FWD!)
  */
 void
-GMP_queue_add (void *cls, uint16_t type, size_t size, 
+GMP_queue_add (void *cls, uint16_t type, size_t size,
                struct MeshConnection *c,
                struct MeshChannel *ch,
                int fwd);
@@ -161,4 +161,4 @@ GMP_2s (const struct MeshPeer *peer);
 
 /* ifndef GNUNET_MESH_SERVICE_PEER_H */
 #endif
-/* end of gnunet-mesh-service_peer.h */
\ No newline at end of file
+/* end of gnunet-mesh-service_peer.h */
diff --git a/src/mesh/gnunet-service-mesh_tunnel.h b/src/mesh/gnunet-service-mesh_tunnel.h
index 71fa5780e..49e4ce4b2 100644
--- a/src/mesh/gnunet-service-mesh_tunnel.h
+++ b/src/mesh/gnunet-service-mesh_tunnel.h
@@ -40,9 +40,6 @@ extern "C"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-#include "gnunet-service-mesh_channel.h"
-#include "gnunet-service-mesh_connection.h"
-
 /**
  * All the states a tunnel can be in.
  */
@@ -79,6 +76,11 @@ enum MeshTunnelState
  */
 struct MeshTunnel3;
 
+
+#include "gnunet-service-mesh_channel.h"
+#include "gnunet-service-mesh_connection.h"
+
+
 /******************************************************************************/
 /********************************    API    ***********************************/
 /******************************************************************************/
@@ -234,4 +236,4 @@ GMT_get_buffer (struct MeshTunnel3 *t, int fwd);
 
 /* ifndef GNUNET_MESH_SERVICE_TUNNEL_H */
 #endif
-/* end of gnunet-mesh-service_tunnel.h */
\ No newline at end of file
+/* end of gnunet-mesh-service_tunnel.h */