Remove osmo-iuh subdir level from include/ (2/2)

Make all changes to #include statements and build files.
diff --git a/include/osmocom/hnbap/MacroCellID.h b/include/osmocom/hnbap/MacroCellID.h
index 04ed95f..88b4a62 100644
--- a/include/osmocom/hnbap/MacroCellID.h
+++ b/include/osmocom/hnbap/MacroCellID.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
-#include <osmocom/osmo-iuh/hnbap/CGI.h>
+#include <osmocom/hnbap/UTRANCellID.h>
+#include <osmocom/hnbap/CGI.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus