Compile fixes

Author: LukasMolzberger

include/network/activation.h

@@ -2,13 +2,12 @@
 #define NETWORK_ACTIVATION_H
 
 
-#include "fields/queue_provider.h"
+#include "fields/obj.h"
 
 #include "network/activation_definition.h"
 #include "network/element.h"
 #include "network/model_provider.h"
 #include "network/neuron.h"
-#include "network/document.h"
 #include "network/binding_signal.h"
 #include "network/link.h"
 #include "network/timestamp.h"
@@ -17,7 +16,9 @@
 #include <set>
 #include <vector>
 
-class Activation : public Element, public ModelProvider, public QueueProvider {
+class Document;
+
+class Activation : public Obj, public Element, public ModelProvider {
 public:
     static const std::function<bool(Activation*, Activation*)> ID_COMPARATOR;
 

include/network/binding_signal.h

@@ -3,10 +3,11 @@
 
 #include <map>
 #include <set>
-#include "network/activation.h"
 #include "network/activation_key.h"
-#include "document.h"
-#include "neuron.h"
+#include "network/neuron.h"
+
+class Activation;
+class Document;
 
 class BindingSignal {
 public:

include/network/link.h

@@ -1,9 +1,9 @@
 #ifndef NETWORK_LINK_H
 #define NETWORK_LINK_H
 
-#include "fields/queue_provider.h"
 #include "fields/obj.h"
 
+#include "network/link_definition.h"
 #include "network/element.h"
 #include "network/model_provider.h"
 #include "network/typedefs.h"
@@ -16,7 +16,7 @@ class Activation;
 class Document;
 class Model;
 
-class Link : public Obj, public Element, public ModelProvider, public QueueProvider {
+class Link : public Obj, public Element, public ModelProvider {
 public:
     Link(LinkDefinition* type, Synapse* s, Activation* input, Activation* output);
 

include/network/link_definition.h

@@ -3,12 +3,10 @@
 
 #include "fields/type.h"
 #include "fields/type_registry.h"
+#include "fields/relation.h"
 
 #include "network/activation.h"
 #include "network/link.h"
-#include "network/relation.h"
-#include "network/relation_one.h"
-#include "network/relation_self.h"
 #include "network/synapse.h"
 
 #include <string>

include/network/neuron.h

@@ -2,7 +2,8 @@
 #define NETWORK_NEURON_H
 
 #include "fields/obj.h"
-#include "fields/queue_provider.h"
+
+#include "network/neuron_definition.h"
 #include "network/element.h"
 #include "network/model_provider.h"
 #include "network/read_write_lock.h"
@@ -13,7 +14,7 @@
 #include <vector>
 #include <string>
 
-class Neuron : public ObjImpl, public Element, public ModelProvider, public QueueProvider {
+class Neuron : public Obj, public Element, public ModelProvider {
 public:
     Neuron(NeuronDefinition* type, Model* model, long id);
     Neuron(NeuronDefinition* type, Model* model);

include/network/node_definition.h

@@ -2,8 +2,9 @@
 #define NETWORK_NODE_DEFINITION_H
 
 #include "fields/type_registry.h"
-#include "network/activation_definition.h"
-#include "network/neuron_definition.h"
+
+class NeuronDefinition;
+class ActivationDefinition;
 
 class NodeDefinition {
 public:

include/network/synapse.h

@@ -3,8 +3,8 @@
 
 #include "fields/type_registry.h"
 #include "fields/obj.h"
-#include "fields/queue_provider.h"
 
+#include "network/synapse_definition.h"
 #include "network/element.h"
 #include "network/neuron_reference.h"
 #include "network/binding_signal.h"
@@ -16,7 +16,7 @@
 #include <map>
 #include <vector>
 
-class Synapse : public ObjImpl, public Element, public QueueProvider {
+class Synapse : public Obj, public Element {
 public:
     Synapse(SynapseDefinition* type);
     Synapse(SynapseDefinition* type, Neuron* input, Neuron* output);

include/network/synapse_definition.h

@@ -1,20 +1,19 @@
 #ifndef NETWORK_SYNAPSE_DEFINITION_H
 #define NETWORK_SYNAPSE_DEFINITION_H
 
+#include "fields/type.h"
+#include "fields/type_registry.h"
+#include "fields/relation.h"
+
 #include "network/activation.h"
 #include "network/binding_signal.h"
 #include "network/conjunctive_synapse.h"
 #include "network/disjunctive_synapse.h"
-#include "network/relation.h"
-#include "network/relation_many.h"
-#include "network/relation_one.h"
 #include "network/neuron.h"
 #include "network/synapse.h"
 #include "network/transition.h"
 #include "network/direction.h"
-#include "network/type.h"
-#include "network/type_registry.h"
-#include "network/relation_self.h"
+
 
 #include <set>
 #include <vector>