4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index 1b42c3f2669..25b76f549a2 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -25,7 +25,6 @@ set(INC
 	../../makesdna
 	../../makesrna
 	../../windowmanager
-	../../../../intern/elbeem/extern
 	../../../../intern/guardedalloc
 	../../../../intern/glew-mx
 )
@@ -55,6 +54,9 @@ set(LIB
 )
 
 if(WITH_MOD_FLUID)
+	list(APPEND INC
+		../../../../intern/elbeem/extern
+	)
 	add_definitions(-DWITH_MOD_FLUID)
 endif()
 
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 9192d1c2fe9..d3b57a09a9e 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -45,8 +45,6 @@
 
 #include "DEG_depsgraph.h"
 
-#include "LBM_fluidsim.h"
-
 #include "ED_screen.h"
 
 #include "WM_types.h"
@@ -57,6 +55,8 @@
 /* enable/disable overall compilation */
 #ifdef WITH_MOD_FLUID
 
+#include "LBM_fluidsim.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_path_util.h"
 #include "BLI_math.h"
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index 41650f07101..a7d128a261d 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -39,11 +39,10 @@ set(LIB
 )
 
 if(WITH_AUDASPACE)
-	add_definitions(-DWITH_AUDASPACE)
-
 	list(APPEND INC_SYS
 		${AUDASPACE_C_INCLUDE_DIRS}
 	)
+	add_definitions(-DWITH_AUDASPACE)
 endif()
 
 if(WITH_CODEC_FFMPEG)
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index 53c228cd9c9..391d0dff0f5 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -49,11 +49,10 @@ set(LIB
 )
 
 if(WITH_AUDASPACE)
-	add_definitions(-DWITH_AUDASPACE)
-
 	list(APPEND INC_SYS
 		${AUDASPACE_C_INCLUDE_DIRS}
 	)
+	add_definitions(-DWITH_AUDASPACE)
 endif()
 
 if(WITH_INTERNATIONAL)