diff --git a/extern/fmtlib/CMakeLists.txt b/extern/fmtlib/CMakeLists.txt
index 0e901c11729..aaed34147e0 100644
--- a/extern/fmtlib/CMakeLists.txt
+++ b/extern/fmtlib/CMakeLists.txt
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(INC
-  PUBLIC include
 )
 
 set(INC_SYS
+  PUBLIC include
 )
 
 set(SRC
diff --git a/source/blender/animrig/CMakeLists.txt b/source/blender/animrig/CMakeLists.txt
index 0a7615875eb..afcc1fec204 100644
--- a/source/blender/animrig/CMakeLists.txt
+++ b/source/blender/animrig/CMakeLists.txt
@@ -8,12 +8,12 @@ set(INC
 
   ../editors/include
   ../makesrna
-  ../../../extern/fmtlib/include
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
 set(INC_SYS
+  ../../../extern/fmtlib/include
 )
 
 set(SRC
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 1b4b622668f..8460d7ca596 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -8,12 +8,12 @@ set(INC
   ../space_graph
   ../../asset_system
   ../../makesrna
-  ../../../../extern/fmtlib/include
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
 set(INC_SYS
+  ../../../../extern/fmtlib/include
 )
 
 set(SRC
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 5a601c9e6e6..5fdf6a925f4 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -8,12 +8,12 @@ set(INC
   ../space_graph
   ../../makesrna
   ../../nodes
-  ../../../../extern/fmtlib/include
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
 set(INC_SYS
+  ../../../../extern/fmtlib/include
 )
 
 set(SRC
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index 7f00d0b8b28..f445671dd60 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -6,14 +6,12 @@ set(INC
   ../include
   ../../blenfont
   ../../makesrna
-
-  ../../../../extern/fmtlib/include
-
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
 set(INC_SYS
+  ../../../../extern/fmtlib/include
 )
 
 set(SRC
diff --git a/source/blender/io/grease_pencil/CMakeLists.txt b/source/blender/io/grease_pencil/CMakeLists.txt
index 67fdc38e343..467ba7f2ea2 100644
--- a/source/blender/io/grease_pencil/CMakeLists.txt
+++ b/source/blender/io/grease_pencil/CMakeLists.txt
@@ -10,10 +10,10 @@ set(INC
   ../../makesrna
   ../../../../intern/guardedalloc
   ../../../../intern/utfconv
-  ../../../../extern/fmtlib/include
 )
 
 set(INC_SYS
+  ../../../../extern/fmtlib/include
 )
 
 set(SRC
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 4c3945ddb3f..6b0f88ddad0 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -263,7 +263,6 @@ set(INC
   ../../render
   ../../../../intern/clog
   ../../../../intern/cycles/blender
-  ../../../../extern/fmtlib/include
   ../../../../intern/memutil
   ../../../../intern/mantaflow/extern
 
@@ -273,7 +272,7 @@ set(INC
 )
 
 set(INC_SYS
-
+  ../../../../extern/fmtlib/include
 )
 
 if(WITH_CYCLES)