src/modules/butterflies/butterflies_paths.c

@@ -30,6 +30,8 @@
 #include "actions/cats_actions.h"
 #include "butterflies_paths.h"
 #include "module.h"
+#include "bdc_io/bdc_io.h"
+
 
 void bf_add_directories(struct cats_configuration *conf)
 {

src/modules/butterflies/butterflies_stats.c

@@ -32,6 +32,7 @@
 #include "butterflies_paths.h"
 #include "temporal/phase_names.h"
 #include "temporal/years.h"
+#include "bdc_io/bdc_io.h"
 
 
 const char *bf_get_stats_field_name(enum butterfly_stats which)

src/modules/cats_test_module/CMakeLists.txt

@@ -8,4 +8,4 @@ target_sources(cats-test-module PRIVATE
 
 target_include_directories(cats-test-module PUBLIC ".")
 set_property(TARGET cats-test-module PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_link_libraries(cats-test-module cats_logging libcats)
+target_link_libraries(cats-test-module bdc_logging libcats)

src/tests/CMakeLists.txt

@@ -9,5 +9,5 @@ add_executable(vital_rate_test vital_rate_test.c)
 add_executable(csv_test csv_test.c )
 configure_file("test.csv" "test.csv")
 
-target_link_libraries(vital_rate_test cmocka cats_logging bdc cats_strings cats_ini cats_csv libcats)
-target_link_libraries(csv_test cmocka cats_strings cats_csv cats_strings cats_logging bdc)
+target_link_libraries(vital_rate_test cmocka bdc_logging bdc bdc_strings cats_ini cats_csv libcats)
+target_link_libraries(csv_test cmocka bdc_strings cats_csv bdc_strings bdc_logging bdc)

src/tests/csv_test.c

@@ -24,8 +24,9 @@
 #include <cmocka.h>
 #include <stdio.h>
 #include "bdc_memory/bdc_memory.h"
-#include "cats_strings/cats_strings.h"
+#include "bdc_strings/bdc_strings.h"
 #include "cats_csv/cats_csv.h"
+#include "bdc_io/bdc_io.h"
 
 
 struct csv_test {