From 7cebb61486bc337d0c531fa1fd9958b1ca1ff0e6 Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Mon, 10 Jul 2023 15:07:37 +0200
Subject: [PATCH] Cleanup: CMake: Modernize bf_dna dependencies

There's quite a few libraries that depend on dna_type_offsets.h
but had gotten to it by just adding the folder that contains it to
their includes INC section without declaring a dependency to
bf_dna in the LIB section.

which occasionally lead to the lib building before bf_dna and the
header being missing, while this generally gets fixed in CMake by
adding bf_dna to the LIB section of the lib, however until last
week all libraries in the LIB section were linked as INTERFACE so
adding it in there did not resolve the build issue.

To make things still build, we sprinkled add_dependencies wherever
we needed it to force a build order.

This diff :

Declares public include folders for the bf_dna target so there's
no more fudging the INC section required to get to them.

Removes all dna related paths from the INC section for all
libraries.

Adds an alias target bf:dna to signify it has been updated to
modern cmake

Declares a dependency on bf::dna for all libraries that require it

Removes (almost) all calls to add_dependencies for bf_dna

Future work:

Because of the manual dependency management that was done, there is
now some "clutter" with libs depending on bf_dna that realistically
don't. Example bf_intern_opencolorio itself has no dependency on
bf_dna at all, doesn't need it, doesn't use it. However the
dna include folder had been added to it in the past since bf_blenlib
uses dna headers in some of its public headers and
bf_intern_opencolorio does use those blenlib headers.

Given bf_blenlib now correctly declares the dependency on bf_dna
as public bf_intern_opencolorio will get the dna header directory
automatically from CMake, hence some cleanup could be done for
bf_intern_opencolorio

Because 99% of the changes in this diff have been automated, this diff
does not seek to address these issues as there is no easy way to
determine why a certain dependency is in place. A developer will have
to make a pass a this at some later point in time. As I'd rather not
mix automated and manual labour.

There are a few libraries that could not be automatically processed
(ie bf_blendthumb) that also will need this manual look-over.

Pull Request: https://projects.blender.org/blender/blender/pulls/109835
---
 intern/cycles/blender/CMakeLists.txt                      | 2 +-
 intern/ghost/CMakeLists.txt                               | 2 +-
 intern/mantaflow/CMakeLists.txt                           | 2 +-
 intern/opencolorio/CMakeLists.txt                         | 2 +-
 source/blender/asset_system/CMakeLists.txt                | 2 +-
 source/blender/blenfont/CMakeLists.txt                    | 2 +-
 source/blender/blenkernel/CMakeLists.txt                  | 6 +-----
 source/blender/blenlib/CMakeLists.txt                     | 3 +--
 source/blender/blenlib/tests/performance/CMakeLists.txt   | 2 +-
 source/blender/blenloader/CMakeLists.txt                  | 6 +-----
 source/blender/blentranslation/CMakeLists.txt             | 2 +-
 source/blender/bmesh/CMakeLists.txt                       | 2 +-
 source/blender/compositor/CMakeLists.txt                  | 6 +-----
 .../blender/compositor/realtime_compositor/CMakeLists.txt | 6 +-----
 source/blender/depsgraph/CMakeLists.txt                   | 2 +-
 source/blender/draw/CMakeLists.txt                        | 6 +-----
 source/blender/editors/animation/CMakeLists.txt           | 2 +-
 source/blender/editors/armature/CMakeLists.txt            | 2 +-
 source/blender/editors/asset/CMakeLists.txt               | 2 +-
 source/blender/editors/curve/CMakeLists.txt               | 2 +-
 source/blender/editors/curves/CMakeLists.txt              | 2 +-
 source/blender/editors/geometry/CMakeLists.txt            | 2 +-
 source/blender/editors/gizmo_library/CMakeLists.txt       | 2 +-
 source/blender/editors/gpencil_legacy/CMakeLists.txt      | 2 +-
 source/blender/editors/grease_pencil/CMakeLists.txt       | 2 +-
 source/blender/editors/interface/CMakeLists.txt           | 2 +-
 source/blender/editors/io/CMakeLists.txt                  | 2 +-
 source/blender/editors/lattice/CMakeLists.txt             | 2 +-
 source/blender/editors/mask/CMakeLists.txt                | 2 +-
 source/blender/editors/mesh/CMakeLists.txt                | 2 +-
 source/blender/editors/metaball/CMakeLists.txt            | 2 +-
 source/blender/editors/object/CMakeLists.txt              | 5 +----
 source/blender/editors/physics/CMakeLists.txt             | 2 +-
 source/blender/editors/render/CMakeLists.txt              | 2 +-
 source/blender/editors/scene/CMakeLists.txt               | 2 +-
 source/blender/editors/screen/CMakeLists.txt              | 2 +-
 source/blender/editors/sculpt_paint/CMakeLists.txt        | 2 +-
 source/blender/editors/sound/CMakeLists.txt               | 2 +-
 source/blender/editors/space_action/CMakeLists.txt        | 4 +---
 source/blender/editors/space_api/CMakeLists.txt           | 2 +-
 source/blender/editors/space_buttons/CMakeLists.txt       | 4 +---
 source/blender/editors/space_clip/CMakeLists.txt          | 6 +-----
 source/blender/editors/space_console/CMakeLists.txt       | 6 +-----
 source/blender/editors/space_file/CMakeLists.txt          | 4 +---
 source/blender/editors/space_graph/CMakeLists.txt         | 4 +---
 source/blender/editors/space_image/CMakeLists.txt         | 4 +---
 source/blender/editors/space_info/CMakeLists.txt          | 4 +---
 source/blender/editors/space_nla/CMakeLists.txt           | 4 +---
 source/blender/editors/space_node/CMakeLists.txt          | 4 +---
 source/blender/editors/space_outliner/CMakeLists.txt      | 4 +---
 source/blender/editors/space_script/CMakeLists.txt        | 6 +-----
 source/blender/editors/space_sequencer/CMakeLists.txt     | 4 +---
 source/blender/editors/space_spreadsheet/CMakeLists.txt   | 4 +---
 source/blender/editors/space_statusbar/CMakeLists.txt     | 4 +---
 source/blender/editors/space_text/CMakeLists.txt          | 6 +-----
 source/blender/editors/space_topbar/CMakeLists.txt        | 4 +---
 source/blender/editors/space_userpref/CMakeLists.txt      | 6 +-----
 source/blender/editors/space_view3d/CMakeLists.txt        | 6 +-----
 source/blender/editors/transform/CMakeLists.txt           | 2 +-
 source/blender/editors/undo/CMakeLists.txt                | 2 +-
 source/blender/editors/util/CMakeLists.txt                | 2 +-
 source/blender/editors/uvedit/CMakeLists.txt              | 2 +-
 source/blender/freestyle/CMakeLists.txt                   | 2 +-
 source/blender/functions/CMakeLists.txt                   | 2 +-
 source/blender/geometry/CMakeLists.txt                    | 3 +--
 source/blender/gpencil_modifiers_legacy/CMakeLists.txt    | 5 +----
 source/blender/gpu/CMakeLists.txt                         | 2 +-
 source/blender/ikplugin/CMakeLists.txt                    | 2 +-
 source/blender/imbuf/CMakeLists.txt                       | 2 +-
 source/blender/imbuf/intern/cineon/CMakeLists.txt         | 2 +-
 source/blender/imbuf/intern/oiio/CMakeLists.txt           | 2 +-
 source/blender/imbuf/intern/openexr/CMakeLists.txt        | 2 +-
 source/blender/io/alembic/CMakeLists.txt                  | 2 +-
 source/blender/io/avi/CMakeLists.txt                      | 2 +-
 source/blender/io/collada/CMakeLists.txt                  | 2 +-
 source/blender/io/common/CMakeLists.txt                   | 2 +-
 source/blender/io/gpencil/CMakeLists.txt                  | 2 +-
 source/blender/io/ply/CMakeLists.txt                      | 2 +-
 source/blender/io/stl/CMakeLists.txt                      | 2 +-
 source/blender/io/usd/CMakeLists.txt                      | 2 +-
 source/blender/io/wavefront_obj/CMakeLists.txt            | 2 +-
 source/blender/makesdna/intern/CMakeLists.txt             | 6 ++++--
 source/blender/makesrna/intern/CMakeLists.txt             | 8 +-------
 source/blender/modifiers/CMakeLists.txt                   | 8 +-------
 source/blender/nodes/CMakeLists.txt                       | 6 +-----
 source/blender/nodes/composite/CMakeLists.txt             | 6 +-----
 source/blender/nodes/function/CMakeLists.txt              | 2 +-
 source/blender/nodes/geometry/CMakeLists.txt              | 2 +-
 source/blender/nodes/shader/CMakeLists.txt                | 2 +-
 source/blender/nodes/texture/CMakeLists.txt               | 2 +-
 source/blender/python/bmesh/CMakeLists.txt                | 2 +-
 source/blender/python/generic/CMakeLists.txt              | 2 +-
 source/blender/python/gpu/CMakeLists.txt                  | 2 +-
 source/blender/python/intern/CMakeLists.txt               | 2 +-
 source/blender/python/mathutils/CMakeLists.txt            | 2 +-
 source/blender/render/CMakeLists.txt                      | 2 +-
 source/blender/sequencer/CMakeLists.txt                   | 6 +-----
 source/blender/shader_fx/CMakeLists.txt                   | 2 +-
 source/blender/simulation/CMakeLists.txt                  | 2 +-
 source/blender/windowmanager/CMakeLists.txt               | 6 +-----
 source/creator/CMakeLists.txt                             | 2 +-
 101 files changed, 104 insertions(+), 208 deletions(-)

diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index f8ae1129a59..68fc84e6bf9 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ..
   ../../guardedalloc
   ../../mikktspace
-  ../../../source/blender/makesdna
   ../../../source/blender/makesrna
   ../../../source/blender/blenkernel
   ../../../source/blender/blenlib
@@ -60,6 +59,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   cycles_bvh
   cycles_device
   cycles_graph
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 6a9f5e52436..e4de08b9df1 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../clog
   ../../source/blender/blenlib
   ../../source/blender/imbuf
-  ../../source/blender/makesdna
 )
 
 set(INC_SYS
@@ -75,6 +74,7 @@ set(SRC
 
 set(LIB
   ${Epoxy_LIBRARIES}
+  PRIVATE bf::dna
 )
 
 if(WITH_VULKAN_BACKEND)
diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt
index 5938831c18f..e43c91f7739 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -25,7 +25,6 @@ endif()
 set(INC
   extern
   intern/strings
-  ../../source/blender/makesdna
   ../../source/blender/blenlib
 )
 
@@ -74,6 +73,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   extern_mantaflow
 
   ${PYTHON_LINKFLAGS}
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt
index 55d15a97286..9376b7fe2e6 100644
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../source/blender/blenlib
   ../../source/blender/gpu
   ../../source/blender/gpu/intern
-  ../../source/blender/makesdna
 )
 
 set(INC_SYS
@@ -25,6 +24,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 if(WITH_OPENCOLORIO)
diff --git a/source/blender/asset_system/CMakeLists.txt b/source/blender/asset_system/CMakeLists.txt
index 1bc2e85c4fa..24ec2314817 100644
--- a/source/blender/asset_system/CMakeLists.txt
+++ b/source/blender/asset_system/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   intern
   ../blenkernel
   ../blenlib
-  ../makesdna
   ../../../intern/clog
   ../../../intern/guardedalloc
 )
@@ -43,6 +42,7 @@ set(SRC
 
 set(LIB
   bf_blenkernel
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index 1cde61b4879..9a5b664128e 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../blentranslation
   ../gpu
   ../imbuf
-  ../makesdna
   ../makesrna
   ../../../intern/guardedalloc
 )
@@ -34,6 +33,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_gpu
   bf_intern_guardedalloc
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 4629495d2e6..967c31d53d1 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
   ../gpu
   ../ikplugin
   ../imbuf
-  ../makesdna
   ../makesrna
   ../modifiers
   ../nodes
@@ -38,8 +37,6 @@ set(INC
   ../../../extern/curve_fit_nd
   ../../../extern/fmtlib/include
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -539,6 +536,7 @@ set(LIB
   bf_blentranslation
   bf_bmesh
   bf_depsgraph
+  PRIVATE bf::dna
   bf_draw
   bf_functions
   bf_gpencil_modifiers_legacy
@@ -819,8 +817,6 @@ endif()
 
 blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_blenkernel bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_blenkernel bf_rna)
 
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 1d6fef955fd..4c6c79d86f1 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -9,8 +9,6 @@ endif()
 set(INC
   .
   ..
-  # ../blenkernel  # don't add this back!
-  ../makesdna
   ../../../intern/eigen
   ../../../intern/guardedalloc
 )
@@ -390,6 +388,7 @@ set(SRC
 )
 
 set(LIB
+  PUBLIC bf::dna
   bf_intern_eigen
   bf_intern_guardedalloc
   extern_wcwidth
diff --git a/source/blender/blenlib/tests/performance/CMakeLists.txt b/source/blender/blenlib/tests/performance/CMakeLists.txt
index e3207de027e..9d184047e94 100644
--- a/source/blender/blenlib/tests/performance/CMakeLists.txt
+++ b/source/blender/blenlib/tests/performance/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   .
   ..
   ../..
-  ../../../makesdna
   ../../../../../intern/guardedalloc
 )
 
@@ -15,6 +14,7 @@ set(INC_SYS
 
 set(LIB
   PRIVATE bf_blenlib
+  PRIVATE bf::dna
   PRIVATE bf_intern_guardedalloc
   PRIVATE bf::intern::atomic
 )
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 030825b280c..e0242a7e737 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../editors/include
   ../gpu
   ../imbuf
-  ../makesdna
   ../makesrna
   ../nodes
   ../render
@@ -23,8 +22,6 @@ set(INC
   ../../../intern/guardedalloc
   ../bmesh
 
-  # for writefile.c: dna_type_offsets.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -67,6 +64,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_BUILDINFO)
@@ -97,8 +95,6 @@ endif()
 
 blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# needed so writefile.c can use dna_type_offsets.h
-add_dependencies(bf_blenloader bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_blenloader bf_rna)
 
diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt
index df0efd250af..5303aa03e3b 100644
--- a/source/blender/blentranslation/CMakeLists.txt
+++ b/source/blender/blentranslation/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../blenkernel
   ../blenlib
   ../imbuf
-  ../makesdna
   ../makesrna
   ../../../intern/guardedalloc
   ../../../intern/locale
@@ -27,6 +26,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index c983443372f..ee27f3378ea 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../blenlib
   ../blentranslation
   ../depsgraph
-  ../makesdna
   ../../../intern/clog
   ../../../intern/eigen
   ../../../intern/guardedalloc
@@ -171,6 +170,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   extern_rangetree
   PRIVATE bf::intern::atomic
 )
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index b3d0716e480..6f556a0ba94 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -15,7 +15,6 @@ if(WITH_COMPOSITOR_CPU)
     ../blentranslation
     ../depsgraph
     ../imbuf
-    ../makesdna
     ../makesrna
     ../nodes
     ../windowmanager
@@ -27,8 +26,6 @@ if(WITH_COMPOSITOR_CPU)
     ../../../intern/clog
     ../../../intern/guardedalloc
 
-    # dna_type_offsets.h
-    ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
     # RNA_prototypes.h
     ${CMAKE_BINARY_DIR}/source/blender/makesrna
   )
@@ -601,6 +598,7 @@ if(WITH_COMPOSITOR_CPU)
   set(LIB
     bf_blenkernel
     bf_blenlib
+    PRIVATE bf::dna
     extern_clew
     PRIVATE bf::intern::atomic
   )
@@ -675,8 +673,6 @@ if(WITH_COMPOSITOR_CPU)
     blender_add_test_lib(bf_compositor_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
   endif()
 
-  # Needed so we can use dna_type_offsets.h for defaults initialization.
-  add_dependencies(bf_compositor bf_dna)
   # RNA_prototypes.h
   add_dependencies(bf_compositor bf_rna)
 
diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt
index 071bd60690a..7b780ecfa47 100644
--- a/source/blender/compositor/realtime_compositor/CMakeLists.txt
+++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt
@@ -12,15 +12,12 @@ set(INC
   ../../draw
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../render
   ../../gpu/intern
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )
 
 set(INC_SYS
@@ -101,6 +98,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_gpu
   bf_nodes
   bf_imbuf
@@ -311,5 +309,3 @@ endif()
 
 blender_add_lib(bf_realtime_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h
-add_dependencies(bf_realtime_compositor bf_dna)
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index e04f235cee6..8fcfd8a4877 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../bmesh
   ../draw
   ../functions
-  ../makesdna
   ../makesrna
   ../modifiers
   ../sequencer
@@ -155,6 +154,7 @@ set(SRC
 
 set(LIB
   bf_blenkernel
+  PRIVATE bf::dna
   PRIVATE bf::intern::atomic
 )
 
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 5fb334aa7dd..0b6615a0ab4 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -19,7 +19,6 @@ set(INC
   ../gpu
   ../gpu/intern
   ../imbuf
-  ../makesdna
   ../makesrna
   ../nodes
   ../render
@@ -33,8 +32,6 @@ set(INC
   ../../../intern/guardedalloc
   ../../../intern/opensubdiv
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
 )
 
 set(SRC
@@ -359,6 +356,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_realtime_compositor
   bf_windowmanager
   PRIVATE bf::intern::atomic
@@ -890,8 +888,6 @@ endif()
 
 blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_draw bf_dna)
 
 if(WITH_GTESTS)
   if(WITH_OPENGL_DRAW_TESTS)
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index e8e82c5149d..232d2a95cff 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../sequencer
   ../../windowmanager
@@ -48,6 +47,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 75d3e56a2f0..11222730a43 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -51,6 +50,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt
index 84e7e75b094..324818f35d6 100644
--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../blenlib
   ../../blenloader
   ../../blentranslation
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -54,6 +53,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenloader
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index 8be77c09662..99ccdfa662d 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -40,6 +39,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   extern_curve_fit_nd
 )
 
diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt
index 893b1f82c4c..fb6147794cf 100644
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../functions
   ../../geometry
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -35,6 +34,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_TBB)
diff --git a/source/blender/editors/geometry/CMakeLists.txt b/source/blender/editors/geometry/CMakeLists.txt
index 79137034590..7468ca62a73 100644
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../functions
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../windowmanager
@@ -35,6 +34,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_depsgraph
+  PRIVATE bf::dna
   bf_editor_object
   bf_windowmanager
 )
diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt
index dfe3dfd0dc4..659057dd8a7 100644
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../bmesh
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -44,6 +43,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt
index 2d7539d7686..3ace2b5aaa8 100644
--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -62,6 +61,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_POTRACE)
diff --git a/source/blender/editors/grease_pencil/CMakeLists.txt b/source/blender/editors/grease_pencil/CMakeLists.txt
index a80a4b3deef..caac2312729 100644
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -33,6 +32,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_editor_grease_pencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 84c2784f93c..081394a2826 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
   ../../functions
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../python
@@ -99,6 +98,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_editor_datafiles
 )
 
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index ef136a0e58a..d91be1e45b3 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
   ../../io/stl
   ../../io/usd
   ../../io/wavefront_obj
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -54,6 +53,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_OPENCOLLADA)
diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt
index 713d1b59704..dec7351562e 100644
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenkernel
   ../../blenlib
   ../../depsgraph
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
@@ -29,6 +28,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt
index 3f6e437b247..486b20f90b7 100644
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blenlib
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -32,6 +31,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index efc07c3725c..26f1cca7fd3 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
   ../../geometry
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
@@ -66,6 +65,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_windowmanager
 )
 
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt
index bb302a1ae70..4e284149d51 100644
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blenlib
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
@@ -29,6 +28,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 7f1f403381a..1f2bb9a9d30 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
   ../../gpu
   ../../ikplugin
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../modifiers
   ../../python
@@ -25,8 +24,6 @@ set(INC
   ../../../../intern/clog
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h in BLO_read_write.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -68,6 +65,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_editor_mesh
   bf_editor_grease_pencil
   bf_render
@@ -87,6 +85,5 @@ endif()
 
 blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-add_dependencies(bf_editor_object bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_editor_object bf_rna)
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index 2d8375dae01..915bd11dfed 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -42,6 +41,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_MOD_FLUID)
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index 59ff7aecee6..db37f17a95e 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../../draw
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../render
@@ -37,6 +36,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_draw
 )
 
diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt
index 45de4756556..99a1f0fb0f8 100644
--- a/source/blender/editors/scene/CMakeLists.txt
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blenlib
   ../../blentranslation
   ../../depsgraph
-  ../../makesdna
   ../../makesrna
   ../../sequencer
   ../../windowmanager
@@ -26,6 +25,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index ae2aede3e64..05a11e7d191 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../sequencer
   ../../windowmanager
@@ -45,6 +44,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_editor_datafiles
   bf_editor_space_sequencer
 )
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 1af93781129..b695459c838 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
   ../../geometry
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../render
@@ -97,6 +96,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   PRIVATE bf::intern::atomic
 )
 
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index f624d1df690..20858484ac8 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenkernel
   ../../blenlib
   ../../depsgraph
-  ../../makesdna
   ../../makesrna
   ../../sequencer
   ../../windowmanager
@@ -29,6 +28,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt
index 0fb65608816..9732c865c7c 100644
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -39,6 +36,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
index 15d577d77f6..5959e378420 100644
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../blenkernel
   ../../blenlib
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -24,6 +23,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_editor_geometry
   bf_editor_space_action
   bf_editor_space_buttons
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index e0468207b94..4dfdef96eb6 100644
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -9,14 +9,11 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
   ../../bmesh
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -34,6 +31,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt
index 1a5e50a02a3..70295625ffc 100644
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -12,13 +12,10 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -54,12 +51,11 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 
 blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_editor_space_clip bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_editor_space_clip bf_rna)
diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt
index 447c31cba16..72392118335 100644
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
   ../../blenlib
   ../../blenloader
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )
 
 set(INC_SYS
@@ -32,6 +29,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_PYTHON)
@@ -41,5 +39,3 @@ endif()
 
 blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# dna_type_offsets.h
-add_dependencies(bf_editor_space_console bf_dna)
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index c09f2d698ff..e6f6db5f810 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -13,15 +13,12 @@ set(INC
   ../../blentranslation
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
   ../../../../intern/guardedalloc
   ../../../../extern/fmtlib/include
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -50,6 +47,7 @@ set(SRC
 
 set(LIB
   bf_blenkernel
+  PRIVATE bf::dna
   extern_fmtlib
   PRIVATE bf::intern::atomic
 )
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index d6642979643..86f6770b3ee 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -41,6 +38,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 5239a978827..c4993c8e50b 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -14,15 +14,12 @@ set(INC
   ../../draw
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -45,6 +42,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_editor_uvedit
 )
 
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index bc46a8a6bfd..2fe666c93d1 100644
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -13,13 +13,10 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -40,6 +37,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt
index 79eab77314e..9ab67b7dc07 100644
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -39,6 +36,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index aa8ea981f4e..e0c917c201a 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
   ../../geometry
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../render
@@ -25,8 +24,6 @@ set(INC
   ../../../../intern/guardedalloc
   ../../../../extern/fmtlib/include
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -58,6 +55,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_editor_screen
   extern_fmtlib
 )
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index cfd10ec134c..0f7552d436c 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -11,15 +11,12 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../sequencer
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -114,6 +111,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_editor_undo
 )
 
diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt
index 6db584a0cc1..ffbc91ddc60 100644
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )
 
 set(INC_SYS
@@ -30,6 +27,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 if(WITH_PYTHON)
@@ -42,5 +40,3 @@ endif()
 
 blender_add_lib(bf_editor_space_script "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# dna_type_offsets.h
-add_dependencies(bf_editor_space_script bf_dna)
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index efdec92d2df..48e65789975 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -13,14 +13,11 @@ set(INC
   ../../draw
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../sequencer
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -53,6 +50,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_editor_interface
   bf_editor_util
   PRIVATE bf::intern::atomic
diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt
index e53d00c1066..d137baa1637 100644
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -13,14 +13,11 @@ set(INC
   ../../depsgraph
   ../../functions
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -56,6 +53,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 if(WITH_OPENVDB)
diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt
index fbd7995c276..db9a8a62b2d 100644
--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -30,6 +27,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt
index 9958f33e6c1..6850dac8715 100644
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )
 
 set(INC_SYS
@@ -42,6 +39,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 
@@ -55,5 +53,3 @@ endif()
 
 blender_add_lib(bf_editor_space_text "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# dna_type_offsets.h
-add_dependencies(bf_editor_space_text bf_dna)
diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt
index b832752c0f1..2478df1ccfe 100644
--- a/source/blender/editors/space_topbar/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -28,6 +25,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt
index 6c2afdb9675..47c8fb9af3a 100644
--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -7,13 +7,10 @@ set(INC
   ../../blenkernel
   ../../blenlib
   ../../blenloader
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )
 
 set(INC_SYS
@@ -28,9 +25,8 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# dna_type_offsets.h
-add_dependencies(bf_editor_space_userpref bf_dna)
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 4ebdfcbd6d6..3dfb589f1d6 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -15,15 +15,12 @@ set(INC
   ../../draw
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
   ../../../../intern/guardedalloc
   ../../../../intern/mantaflow/extern
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -76,6 +73,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_editor_curves
   bf_editor_lattice
   bf_editor_mesh
@@ -96,7 +94,5 @@ endif()
 
 blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_editor_space_view3d bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_editor_space_view3d bf_rna)
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 1757604417b..5132d6e345c 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../ikplugin
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../sequencer
@@ -122,6 +121,7 @@ set(LIB
   bf_blenkernel
   bf_blenlib
   bf_bmesh
+  PRIVATE bf::dna
   bf_editor_mask
   bf_gpu
 )
diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt
index 8f64964483f..0a55e462f2d 100644
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../blenlib
   ../../blenloader
   ../../blentranslation
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -31,6 +30,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_editor_curve
   bf_editor_curves
   bf_editor_lattice
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index d3605f2b97e..8ddff989970 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
   ../../depsgraph
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../sequencer
   ../../windowmanager
@@ -110,6 +109,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 321d48bd88e..ee93860ec47 100644
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../depsgraph
   ../../geometry
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/eigen
@@ -42,6 +41,7 @@ set(SRC
 
 set(LIB
   bf_bmesh
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt
index a7c48f1675b..ff807214baa 100644
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -530,6 +530,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_python_mathutils
 
   ${PYTHON_LINKFLAGS}
@@ -543,7 +544,6 @@ set(INC
   ../blentranslation
   ../depsgraph
   ../imbuf
-  ../makesdna
   ../makesrna
   ../python
   ../python/intern
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 4cd5277fc48..f03cb91a8e6 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   .
   ../blenlib
-  ../makesdna
   ../../../intern/guardedalloc
 )
 
@@ -51,6 +50,7 @@ set(SRC
 
 set(LIB
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_TBB)
diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt
index 9a7cbe88514..df79f57b105 100644
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -8,11 +8,9 @@ set(INC
   ../blenlib
   ../blentranslation
   ../functions
-  ../makesdna
   ../makesrna
   ../../../intern/eigen
   ../../../intern/guardedalloc
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
 )
 
 set(SRC
@@ -62,6 +60,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 if(WITH_OPENVDB)
diff --git a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
index ee4a9502cc0..d3a0dd95f36 100644
--- a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
@@ -12,15 +12,12 @@ set(INC
   ../bmesh
   ../depsgraph
   ../editors/include
-  ../makesdna
   ../makesrna
   ../render
   ../windowmanager
   ../../../intern/eigen
   ../../../intern/guardedalloc
 
-  # dna_type_offsets.h in BLO_read_write.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -93,10 +90,10 @@ list(APPEND LIB
 endif()
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_gpencil_modifiers_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-add_dependencies(bf_gpencil_modifiers_legacy bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_gpencil_modifiers_legacy bf_rna)
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index a82a1ef9dcf..221c9070bf1 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -21,7 +21,6 @@ set(INC
   ../bmesh
   ../draw
   ../imbuf
-  ../makesdna
   ../makesrna
 
   # For theme color access.
@@ -326,6 +325,7 @@ set(METAL_SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   PRIVATE bf::intern::atomic
   ${Epoxy_LIBRARIES}
 )
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 6245d4e7c2d..76d6689b1f1 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   .
   ../blenkernel
   ../blenlib
-  ../makesdna
   ../../../intern/guardedalloc
 )
 
@@ -24,6 +23,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 if(WITH_IK_SOLVER)
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index ac82b81cd33..de4d130dc6d 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../blenlib
   ../blenloader
   ../gpu
-  ../makesdna
   ../makesrna
   ../sequencer
   ../../../intern/guardedalloc
@@ -79,6 +78,7 @@ set(LIB
   bf_blenkernel
   bf_blenlib
   bf_blenloader
+  PRIVATE bf::dna
   bf_imbuf_openimageio
   bf_intern_guardedalloc
   bf_intern_memutil
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index 1f993f79fa2..7663cdabb45 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../..
   ../../../blenkernel
   ../../../blenlib
-  ../../../makesdna
   ../../../../../intern/guardedalloc
 )
 
@@ -30,6 +29,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 if(WITH_IMAGE_CINEON)
diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt
index 8a7c718a0f5..6191ca47fe0 100644
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../..
   ../../../blenkernel
   ../../../blenlib
-  ../../../makesdna
   ../../../../../intern/guardedalloc
   ../../../../../intern/utfconv
 )
@@ -28,6 +27,7 @@ set(SRC
 set(LIB
   ${OPENIMAGEIO_LIBRARIES}
   ${PUGIXML_LIBRARIES}
+  PRIVATE bf::dna
 )
 
 if(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index 44807deff2b..958c0e61ce0 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../..
   ../../../blenkernel
   ../../../blenlib
-  ../../../makesdna
   ../../../../../intern/guardedalloc
   ../../../../../intern/utfconv
 )
@@ -23,6 +22,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 if(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt
index c93f3f3f563..636b93fdaf4 100644
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../bmesh
   ../../depsgraph
   ../../editors/include
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -93,6 +92,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_io_common
 
   ${ALEMBIC_LIBRARIES}
diff --git a/source/blender/io/avi/CMakeLists.txt b/source/blender/io/avi/CMakeLists.txt
index 627d6e54f73..b811b9ab1e7 100644
--- a/source/blender/io/avi/CMakeLists.txt
+++ b/source/blender/io/avi/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   .
   ../../blenlib
   ../../imbuf
-  ../../makesdna
   ../../../../intern/guardedalloc
 )
 
@@ -33,6 +32,7 @@ set(SRC
 
 set(LIB
   ${JPEG_LIBRARIES}
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt
index 9d01247d7c7..e2b0ab6db08 100644
--- a/source/blender/io/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC
   ../../depsgraph
   ../../editors/include
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -117,6 +116,7 @@ set(LIB
   ${OPENCOLLADA_LIBRARIES}
   ${PCRE_LIBRARIES}
   ${XML2_LIBRARIES}
+  PRIVATE bf::dna
 )
 
 if(WITH_BUILDINFO)
diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt
index a897b2ed79f..1726db8d83e 100644
--- a/source/blender/io/common/CMakeLists.txt
+++ b/source/blender/io/common/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenkernel
   ../../blenlib
   ../../depsgraph
-  ../../makesdna
   ../../../../intern/guardedalloc
   ../../makesrna
 )
@@ -35,6 +34,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_io_common "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt
index 9213a4f1218..3444ab9abea 100644
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../bmesh
   ../../depsgraph
   ../../editors/include
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -42,6 +41,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_io_common
 )
 
diff --git a/source/blender/io/ply/CMakeLists.txt b/source/blender/io/ply/CMakeLists.txt
index c9da6f7f4a5..8d7692b48bb 100644
--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../../bmesh
   ../../depsgraph
   ../../geometry
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -56,6 +55,7 @@ set(SRC
 
 set(LIB
   bf_blenkernel
+  PRIVATE bf::dna
   bf_io_common
   extern_fmtlib
 )
diff --git a/source/blender/io/stl/CMakeLists.txt b/source/blender/io/stl/CMakeLists.txt
index f146e0ca8cc..4f0cea2da83 100644
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../bmesh/intern
   ../../depsgraph
   ../../editors/include
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../windowmanager
@@ -39,6 +38,7 @@ set(SRC
 
 set(LIB
   bf_blenkernel
+  PRIVATE bf::dna
   bf_io_common
 )
 
diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index bd150f6a072..d966935f683 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -54,7 +54,6 @@ set(INC
   ../../depsgraph
   ../../editors/include
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -130,6 +129,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_imbuf
   bf_io_common
 )
diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 8d54fb65b68..3dd050576e9 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../../bmesh/intern
   ../../depsgraph
   ../../editors/include
-  ../../makesdna
   ../../makesrna
   ../../nodes
   ../../windowmanager
@@ -59,6 +58,7 @@ set(SRC
 
 set(LIB
   bf_blenkernel
+  PRIVATE bf::dna
   bf_io_common
   extern_fmtlib
 )
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index c7a195a6704..83502647f91 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -5,11 +5,11 @@
 # message(STATUS "Configuring makesdna")
 
 set(INC
-  ..
+  PUBLIC ..
+  PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
   ../../blenlib
   ../../imbuf
   ../../../../intern/guardedalloc
-  ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set(INC_SYS
@@ -140,6 +140,8 @@ set_source_files_properties(
 )
 
 blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::dna ALIAS bf_dna)
+
 
 
 # -----------------------------------------------------------------------------
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index fb40aedd0eb..495f68635c1 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -229,7 +229,6 @@ set(INC
   ../../gpu
   ../../ikplugin
   ../../imbuf
-  ../../makesdna
   ../../modifiers
   ../../nodes
   ../../sequencer
@@ -243,10 +242,7 @@ set(INC
   ../../../../intern/memutil
   ../../../../intern/mantaflow/extern
 
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_CURRENT_BINARY_DIR}/../../makesrna/
 )
@@ -466,7 +462,7 @@ set(SRC
 )
 
 set(LIB
-  bf_dna
+  PRIVATE bf::dna
   bf_editor_space_api
 
   bf_editor_animation
@@ -490,5 +486,3 @@ set(LIB
 
 blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_blenkernel bf_dna)
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 59492773fd4..2d546092429 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
   ../editors/include
   ../functions
   ../geometry
-  ../makesdna
   ../makesrna
   ../nodes
   ../render
@@ -23,8 +22,6 @@ set(INC
   ../../../intern/eigen
   ../../../intern/guardedalloc
 
-  # dna_type_offsets.h in BLO_read_write.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -114,6 +111,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PUBLIC bf::dna
 )
 
 if(WITH_ALEMBIC)
@@ -220,9 +218,5 @@ endif()
 
 blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Some modifiers include BLO_read_write.h, which includes dna_type_offsets.h
-# which is generated by bf_dna. Need to ensure compilaiton order here.
-# Also needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_modifiers bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_modifiers bf_rna)
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 6ea3ce538e4..79d71e5bf91 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -26,15 +26,12 @@ set(INC
   ../geometry
   ../gpu
   ../imbuf
-  ../makesdna
   ../makesrna
   ../render
   ../windowmanager
   ../../../extern/fmtlib/include
   ../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -85,6 +82,7 @@ set(SRC
 
 set(LIB
   bf_bmesh
+  PRIVATE bf::dna
   bf_functions
   bf_nodes_composite
   bf_nodes_function
@@ -150,7 +148,5 @@ endif()
 
 blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_nodes bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_nodes bf_rna)
diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt
index 60f1c07f917..a3d8b287950 100644
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
   ../../functions
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
@@ -23,8 +22,6 @@ set(INC
   ../../compositor/realtime_compositor/cached_resources
   ../../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -132,6 +129,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_realtime_compositor
 )
 
@@ -166,7 +164,5 @@ if(WITH_UNITY_BUILD)
   set_target_properties(bf_nodes_composite PROPERTIES UNITY_BUILD_BATCH_SIZE 10)
 endif()
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_nodes_composite bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_nodes_composite bf_rna)
diff --git a/source/blender/nodes/function/CMakeLists.txt b/source/blender/nodes/function/CMakeLists.txt
index b1d86497339..6db290c38c1 100644
--- a/source/blender/nodes/function/CMakeLists.txt
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../blentranslation
   ../../editors/include
   ../../functions
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/guardedalloc
@@ -48,6 +47,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_functions
 )
 
diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index 9ba6c45c03c..65d388ab5cf 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
   ../../geometry
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
@@ -202,6 +201,7 @@ set(SRC
 
 set(LIB
   bf_bmesh
+  PRIVATE bf::dna
   bf_functions
   bf_geometry
   bf_nodes
diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
index 95d566d0332..1f351a1f076 100644
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
   ../../functions
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
@@ -129,6 +128,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_functions
   bf_intern_sky
   bf_nodes
diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt
index 2ae29460909..0cac2ce9d43 100644
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../imbuf
-  ../../makesdna
   ../../makesrna
   ../../render
   ../../windowmanager
@@ -61,6 +60,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_nodes
 )
 
diff --git a/source/blender/python/bmesh/CMakeLists.txt b/source/blender/python/bmesh/CMakeLists.txt
index ac5fa6564b8..75be92bb899 100644
--- a/source/blender/python/bmesh/CMakeLists.txt
+++ b/source/blender/python/bmesh/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blenlib
   ../../bmesh
   ../../depsgraph
-  ../../makesdna
   ../../../../intern/guardedalloc
 )
 
@@ -41,6 +40,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   bf_python_mathutils
 
   ${PYTHON_LINKFLAGS}
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 7f2340f36fb..bda96cbbf21 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenkernel
   ../../blenlib
   ../../gpu
-  ../../makesdna
   ../../makesrna
   ../../../../intern/clog
   ../../../../intern/guardedalloc
@@ -46,6 +45,7 @@ set(LIB
   ${Epoxy_LIBRARIES}
   ${PYTHON_LINKFLAGS}
   ${PYTHON_LIBRARIES}
+  PRIVATE bf::dna
 )
 
 if(WITH_PYTHON_MODULE)
diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt
index 0dac9ef617a..83b87c2b710 100644
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../editors/include
   ../../gpu
   ../../imbuf
-  ../../makesdna
   ../../../../intern/guardedalloc
 )
 
@@ -63,6 +62,7 @@ set(LIB
   ${Epoxy_LIBRARIES}
   ${PYTHON_LINKFLAGS}
   ${PYTHON_LIBRARIES}
+  PRIVATE bf::dna
 )
 
 blender_add_lib(bf_python_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 77588f904b0..4b88c60c2dc 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../../gpu
   ../../imbuf
   ../../imbuf/intern/oiio
-  ../../makesdna
   ../../makesrna
   ../../windowmanager
   ../../../../intern/clog
@@ -123,6 +122,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_editor_animation
   bf_editor_interface
   bf_editor_space_api
diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt
index f6fb3910916..16efefbc5e4 100644
--- a/source/blender/python/mathutils/CMakeLists.txt
+++ b/source/blender/python/mathutils/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../bmesh
   ../../depsgraph
   ../../imbuf
-  ../../makesdna
   ../../../../intern/guardedalloc
 )
 
@@ -45,6 +44,7 @@ set(SRC
 
 set(LIB
   bf_blenlib
+  PRIVATE bf::dna
   bf_imbuf
   bf_python_ext
 
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 4bb69d9df28..96cc185af63 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
   ../gpu
   ../gpu/intern
   ../imbuf
-  ../makesdna
   ../makesrna
   ../nodes
   ../sequencer
@@ -60,6 +59,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_realtime_compositor
   PRIVATE bf::intern::atomic
 )
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 89ad1054f9b..f05158c5c0c 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -12,15 +12,12 @@ set(INC
   ../blentranslation
   ../depsgraph
   ../imbuf
-  ../makesdna
   ../makesrna
   ../render
   ../windowmanager
   ../../../intern/clog
   ../../../intern/guardedalloc
 
-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -90,6 +87,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  PRIVATE bf::dna
   PRIVATE bf::intern::atomic
 )
 
@@ -108,7 +106,5 @@ endif()
 
 blender_add_lib(bf_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h.
-add_dependencies(bf_sequencer bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_sequencer bf_rna)
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt
index 6e4e01c184a..4ec15b557c4 100644
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../bmesh
   ../depsgraph
   ../editors/include
-  ../makesdna
   ../makesrna
   ../render
   ../windowmanager
@@ -46,6 +45,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
 )
 
 
diff --git a/source/blender/simulation/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt
index 14cdf946fd8..0934e2208ab 100644
--- a/source/blender/simulation/CMakeLists.txt
+++ b/source/blender/simulation/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../depsgraph
   ../functions
   ../imbuf
-  ../makesdna
   ../makesrna
   ../nodes
   ../../../intern/guardedalloc
@@ -35,6 +34,7 @@ set(SRC
 
 set(LIB
   bf_blenkernel
+  PRIVATE bf::dna
 )
 
 if(WITH_OPENMP_STATIC)
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index a8955c90ccf..0d5cb02e5bf 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INC
   ../draw
   ../gpu
   ../imbuf
-  ../makesdna
   ../makesrna
   ../nodes
   ../render
@@ -29,8 +28,6 @@ set(INC
   ../../../intern/memutil
   ../bmesh
 
-  # for writefile.c: dna_type_offsets.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
   # RNA_prototypes.h
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -102,6 +99,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_editor_screen
   bf_sequencer
 )
@@ -204,7 +202,5 @@ endif()
 
 blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_windowmanager bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_windowmanager bf_rna)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8f572d71a81..f1a4298a958 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -13,13 +13,13 @@ set(INC
   ../blender/imbuf
   ../blender/io/usd
   ../blender/bmesh
-  ../blender/makesdna
   ../blender/makesrna
   ../blender/render
   ../blender/windowmanager
 )
 
 set(LIB
+  PRIVATE bf::dna
   bf_windowmanager
 )