10 files changed, 32 insertions, 23 deletions
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 24459d55..cac4201d 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -16,14 +16,16 @@
  */
 
 #include "raul/Atom.hpp"
+#include "raul/Path.hpp"
+
 #include "ingen/CommonInterface.hpp"
-#include "ingen/Patch.hpp"
-#include "ingen/Node.hpp"
-#include "ingen/Port.hpp"
 #include "ingen/Connection.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Patch.hpp"
 #include "ingen/Plugin.hpp"
+#include "ingen/Port.hpp"
+#include "shared/Builder.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "Builder.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp
index 91957d0a..8a21dee0 100644
--- a/src/shared/Builder.hpp
+++ b/src/shared/Builder.hpp
@@ -20,8 +20,6 @@
 
 #include "raul/SharedPtr.hpp"
 
-namespace Raul { class Path; }
-
 namespace Ingen {
 
 class CommonInterface;
@@ -56,3 +54,4 @@ private:
 
 #endif // INGEN_SHARED_BUILDER_HPP
 
+
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
index e6f2704a..87fd106a 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/src/shared/ClashAvoider.hpp
@@ -19,8 +19,10 @@
 #define INGEN_SHARED_CLASHAVOIDER_HPP
 
 #include <inttypes.h>
-#include <string>
+
 #include <map>
+#include <string>
+
 #include "ingen/CommonInterface.hpp"
 
 namespace Raul { class Atom; class Path; }
diff --git a/src/shared/HTTPSender.hpp b/src/shared/HTTPSender.hpp
index 5c26a386..a1a3ea2a 100644
--- a/src/shared/HTTPSender.hpp
+++ b/src/shared/HTTPSender.hpp
@@ -18,9 +18,10 @@
 #ifndef INGEN_SHARED_HTTPSENDER_HPP
 #define INGEN_SHARED_HTTPSENDER_HPP
 
-#include <stdint.h>
 #include <string>
+
 #include <glibmm/thread.h>
+
 #include "raul/Thread.hpp"
 
 namespace Ingen {
diff --git a/src/shared/LV2Atom.hpp b/src/shared/LV2Atom.hpp
index 458eb31e..ad0c8691 100644
--- a/src/shared/LV2Atom.hpp
+++ b/src/shared/LV2Atom.hpp
@@ -15,26 +15,31 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INGEN_SHARED_LV2OBJECT_HPP
-#define INGEN_SHARED_LV2OBJECT_HPP
+#ifndef INGEN_SHARED_LV2ATOM_HPP
+#define INGEN_SHARED_LV2ATOM_HPP
 
-namespace Raul { class Atom; }
 typedef struct _LV2_Atom LV2_Atom;
 
+namespace Raul { class Atom; }
+
 namespace Ingen {
 namespace Shared {
 
-class World;
 class LV2URIMap;
 
 namespace LV2Atom {
 
-	bool to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom);
-	bool from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* object);
+bool to_atom(const LV2URIMap& uris,
+             const LV2_Atom*  object,
+             Raul::Atom&      atom);
+
+bool from_atom(const LV2URIMap&  uris,
+               const Raul::Atom& atom,
+               LV2_Atom*         object);
 
 } // namespace LV2Atom
 
 } // namespace Shared
 } // namespace Ingen
 
-#endif // INGEN_SHARED_LV2OBJECT_HPP
+#endif // INGEN_SHARED_LV2ATOM_HPP
diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp
index ffc48ab2..75bbcda3 100644
--- a/src/shared/LV2Features.hpp
+++ b/src/shared/LV2Features.hpp
@@ -21,7 +21,9 @@
 #include <map>
 #include <string>
 #include <vector>
+
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+
 #include "raul/SharedPtr.hpp"
 
 namespace Ingen {
diff --git a/src/shared/Module.hpp b/src/shared/Module.hpp
index 841e8890..60acf1ff 100644
--- a/src/shared/Module.hpp
+++ b/src/shared/Module.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INGEN_MODULE_MODULE_HPP
-#define INGEN_MODULE_MODULE_HPP
+#ifndef INGEN_SHARED_MODULE_HPP
+#define INGEN_SHARED_MODULE_HPP
 
 #include <glibmm/module.h>
 
@@ -45,4 +45,4 @@ struct Module {
 } // namespace Shared
 } // namespace Ingen
 
-#endif // INGEN_MODULE_MODULE_HPP
+#endif // INGEN_SHARED_MODULE_HPP
diff --git a/src/shared/OSCSender.hpp b/src/shared/OSCSender.hpp
index 34c5565a..b2febb70 100644
--- a/src/shared/OSCSender.hpp
+++ b/src/shared/OSCSender.hpp
@@ -18,7 +18,6 @@
 #ifndef INGEN_SHARED_OSCSENDER_HPP
 #define INGEN_SHARED_OSCSENDER_HPP
 
-#include <stdbool.h>
 #include <stddef.h>
 
 #include <lo/lo.h>
diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp
index 997305a1..cc78e946 100644
--- a/src/shared/Store.hpp
+++ b/src/shared/Store.hpp
@@ -19,8 +19,11 @@
 #define INGEN_SHARED_STORE_HPP
 
 #include <string>
+
 #include <glibmm/thread.h>
+
 #include "raul/PathTable.hpp"
+
 #include "ingen/GraphObject.hpp"
 
 namespace Ingen {
diff --git a/src/shared/runtime_paths.hpp b/src/shared/runtime_paths.hpp
index 4a2ff81a..3ed48f00 100644
--- a/src/shared/runtime_paths.hpp
+++ b/src/shared/runtime_paths.hpp
@@ -18,10 +18,6 @@
 #ifndef INGEN_SHARED_RUNTIME_PATHS_HPP
 #define INGEN_SHARED_RUNTIME_PATHS_HPP
 
-#ifndef _GNU_SOURCE
-	#define _GNU_SOURCE
-#endif
-
 #include <string>
 
 namespace Ingen {