cmake remove circular linking and reorganize

- px4_add_module now requires MAIN
 - px4_add_library doesn't automatically link

src/modules/position_estimator_inav/CMakeLists.txt

@@ -41,6 +41,5 @@ px4_add_module(
 		position_estimator_inav_main.cpp
 		inertial_filter.cpp
 	DEPENDS
-		platforms__common
+		terrain_estimation
 	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :

src/modules/position_estimator_inav/position_estimator_inav_params.h

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include <systemlib/param/param.h>
+#include <parameters/param.h>
 
 struct position_estimator_inav_params {
 	float w_z_baro;