Fixes

Author: LukasMolzberger

include/network/activation.h

@@ -1,18 +1,21 @@
 #ifndef NETWORK_ACTIVATION_H
 #define NETWORK_ACTIVATION_H
 
-#include <map>
-#include <set>
-#include <vector>
+
+#include "fields/queue_provider.h"
+
 #include "network/element.h"
 #include "network/model_provider.h"
-#include "network/queue_provider.h"
 #include "network/neuron.h"
 #include "network/document.h"
 #include "network/binding_signal.h"
 #include "network/link.h"
 #include "network/timestamp.h"
 
+#include <map>
+#include <set>
+#include <vector>
+
 class Activation : public Element, public ModelProvider, public QueueProvider {
 public:
     static const std::function<bool(Activation*, Activation*)> ID_COMPARATOR;

include/network/document.h

@@ -3,13 +3,14 @@
 
 #include <map>
 #include <set>
+
+#include "fields/queue.h"
+#include "fields/step.h"
+#include "fields/queue_provider.h"
 #include "network/model_provider.h"
-#include "network/queue_provider.h"
 #include "network/activation.h"
 #include "network/binding_signal.h"
 #include "network/neuron.h"
-#include "network/queue.h"
-#include "network/step.h"
 
 class Document : public Queue, public ModelProvider, public QueueProvider {
 public:

include/network/link.h

@@ -1,20 +1,22 @@
 #ifndef NETWORK_LINK_H
 #define NETWORK_LINK_H
 
-#include "network/obj_impl.h"
+#include "fields/queue_provider.h"
+#include "fields/obj.h"
+
 #include "network/element.h"
 #include "network/model_provider.h"
-#include "network/queue_provider.h"
 #include "network/typedefs.h"
 #include "network/timestamp.h"
+
 #include <string>
 
 class Synapse;
 class Activation;
 class Document;
 class Model;
 
-class Link : public ObjImpl, public Element, public ModelProvider, public QueueProvider {
+class Link : public Obj, public Element, public ModelProvider, public QueueProvider {
 public:
     Link(LinkDefinition* type, Synapse* s, Activation* input, Activation* output);
 

include/network/neuron.h

@@ -1,10 +1,10 @@
 #ifndef NETWORK_NEURON_H
 #define NETWORK_NEURON_H
 
-#include "network/obj_impl.h"
+#include "fields/obj.h"
+#include "fields/queue_provider.h"
 #include "network/element.h"
 #include "network/model_provider.h"
-#include "network/queue_provider.h"
 #include "network/read_write_lock.h"
 #include "network/neuron_reference.h"
 #include "network/synapse.h"

include/network/obj_impl.h

@@ -1,16 +1,17 @@
 #ifndef NETWORK_SYNAPSE_H
 #define NETWORK_SYNAPSE_H
 
+#include "fields/type_registry.h"
+#include "fields/obj.h"
+#include "fields/queue_provider.h"
+
 #include "network/element.h"
-#include "network/queue_provider.h"
 #include "network/neuron_reference.h"
 #include "network/binding_signal.h"
 #include "network/link.h"
-#include "network/obj_impl.h"
 #include "network/timestamp.h"
 #include "network/direction.h"
 #include "network/model.h"
-#include "network/type_registry.h"
 
 #include <map>
 #include <vector>