Merge branch 'master'

src/modules/controllib/block/Block.cpp

@@ -208,4 +208,9 @@ void SuperBlock::updateChildPublications()
 	}
 }
 
+
 } // namespace control
+
+template class List<uORB::SubscriptionNode *>;
+template class List<uORB::PublicationNode *>;
+template class List<control::BlockParamBase *>;

src/modules/controllib/block/Block.hpp

@@ -43,12 +43,9 @@
 #include <inttypes.h>
 
 #include <containers/List.hpp>
-
-// forward declaration
-namespace uORB {
-	class SubscriptionNode;
-	class PublicationNode;
-}
+#include <uORB/Publication.hpp>
+#include <uORB/Subscription.hpp>
+#include <controllib/block/BlockParam.hpp>
 
 namespace control
 {
@@ -60,8 +57,8 @@ static const uint16_t maxPublicationsPerBlock = 100;
 static const uint8_t blockNameLengthMax = 80;
 
 // forward declaration
-class BlockParamBase;
 class SuperBlock;
+class BlockParamBase;
 
 /**
  */
@@ -137,4 +134,5 @@ protected:
 	List<Block *> _children;
 };
 
+
 } // namespace control

src/modules/controllib/block/BlockParam.cpp

@@ -43,6 +43,8 @@
 
 #include "BlockParam.hpp"
 
+#include <containers/List.hpp>
+
 namespace control
 {
 

src/modules/controllib/block/BlockParam.hpp

@@ -47,6 +47,8 @@
 namespace control
 {
 
+class Block;
+
 /**
  * A base class for block params that enables traversing linked list.
  */

src/modules/controllib/uorb/blocks.cpp

@@ -38,6 +38,7 @@
  */
 
 #include "blocks.hpp"
+#include <geo/geo.h>
 
 namespace control
 {

src/modules/controllib/uorb/blocks.hpp

@@ -61,10 +61,6 @@
 #include <drivers/drv_hrt.h>
 #include <poll.h>
 
-extern "C" {
-#include <geo/geo.h>
-}
-
 #include "../blocks.hpp"
 #include <uORB/Subscription.hpp>
 #include <uORB/Publication.hpp>