diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index be551652bcb..16e663fa1cc 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -29,6 +29,8 @@ set(SRC
   src/config_hurd.h
   src/config_linux.h
   src/config_mac.h
+  src/config_netbsd.h
+  src/config_openbsd.h
 
   src/base/commandlineflags.h
   src/base/googleinit.h
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index a187eaa7126..5652dcbf066 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -451,6 +451,8 @@ set(SRC
   BKE_node.h
   BKE_node.hh
   BKE_node_runtime.hh
+  BKE_node_tree_anonymous_attributes.hh
+  BKE_node_tree_dot_export.hh
   BKE_node_tree_update.h
   BKE_node_tree_zones.hh
   BKE_object.h
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index d68277de2d2..b1406ada8cb 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -99,10 +99,12 @@ set(SRC
   intern/draw_manager_texture.c
   intern/draw_pbvh.cc
   intern/draw_pointcloud.cc
+  intern/draw_resource.cc
   intern/draw_select_buffer.c
   intern/draw_shader.cc
   intern/draw_texture_pool.cc
   intern/draw_view.c
+  intern/draw_view.cc
   intern/draw_view_data.cc
   intern/draw_volume.cc
   engines/basic/basic_engine.c
@@ -190,7 +192,6 @@ set(SRC
   engines/gpencil/gpencil_draw_data.c
   engines/gpencil/gpencil_engine.c
   engines/gpencil/gpencil_engine.cc
-  engines/gpencil/gpencil_engine.h
   engines/gpencil/gpencil_render.c
   engines/gpencil/gpencil_shader.c
   engines/gpencil/gpencil_shader.cc
@@ -259,14 +260,12 @@ set(SRC
   intern/draw_manager_text.h
   intern/draw_pass.hh
   intern/draw_pbvh.h
-  intern/draw_resource.cc
   intern/draw_resource.hh
   intern/draw_shader.h
   intern/draw_shader_shared.h
   intern/draw_state.h
   intern/draw_subdivision.h
   intern/draw_texture_pool.h
-  intern/draw_view.cc
   intern/draw_view.h
   intern/draw_view.hh
   intern/draw_view_data.h
@@ -302,6 +301,14 @@ set(SRC
   engines/eevee_next/eevee_view.hh
   engines/eevee_next/eevee_world.hh
   engines/external/external_engine.h
+  engines/gpencil/gpencil_antialiasing.hh
+  engines/gpencil/gpencil_engine.h
+  engines/gpencil/gpencil_layer.hh
+  engines/gpencil/gpencil_light.hh
+  engines/gpencil/gpencil_material.hh
+  engines/gpencil/gpencil_object.hh
+  engines/gpencil/gpencil_shader.hh
+  engines/gpencil/gpencil_vfx.hh
   engines/image/image_batches.hh
   engines/image/image_buffer_cache.hh
   engines/image/image_drawing_mode.hh
@@ -316,18 +323,25 @@ set(SRC
   engines/image/image_space_node.hh
   engines/image/image_texture_info.hh
   engines/image/image_usage.hh
+  engines/overlay/overlay_engine.h
+  engines/overlay/overlay_next_background.hh
+  engines/overlay/overlay_next_empty.hh
+  engines/overlay/overlay_next_grid.hh
+  engines/overlay/overlay_next_instance.hh
+  engines/overlay/overlay_next_metaball.hh
+  engines/overlay/overlay_next_prepass.hh
+  engines/overlay/overlay_next_private.hh
+  engines/overlay/overlay_private.hh
+  engines/select/select_defines.h
+  engines/select/select_engine.h
+  engines/select/select_instance.hh
+  engines/select/select_private.h
   engines/workbench/workbench_defines.hh
   engines/workbench/workbench_engine.h
   engines/workbench/workbench_enums.hh
   engines/workbench/workbench_private.h
   engines/workbench/workbench_private.hh
   engines/workbench/workbench_shader_shared.h
-  engines/select/select_engine.h
-  engines/select/select_private.h
-  engines/overlay/overlay_engine.h
-  engines/overlay/overlay_next_instance.hh
-  engines/overlay/overlay_next_private.hh
-  engines/overlay/overlay_private.hh
 )
 
 set(LIB
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index baa46dfc488..cbf57e53179 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -55,6 +55,7 @@ set(SRC
   ../include/ED_gizmo_library.h
   ../include/ED_gizmo_utils.h
   ../include/ED_gpencil_legacy.h
+  ../include/ED_grease_pencil.h
   ../include/ED_grease_pencil_draw.h
   ../include/ED_image.h
   ../include/ED_info.h