diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt
index 8307795b2..12af24f1c 100644
--- a/Runtime/CMakeLists.txt
+++ b/Runtime/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${BOO_INCLUDE_DIR}
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${BOO_INCLUDE_DIR} ${LIBJPEG_INCLUDE_DIR}
                     ${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/DataSpec)
 
 macro(runtime_add_list rel_path a_list)
diff --git a/Runtime/Graphics/CMakeLists.txt b/Runtime/Graphics/CMakeLists.txt
index 617ce7ee8..537a89d6e 100644
--- a/Runtime/Graphics/CMakeLists.txt
+++ b/Runtime/Graphics/CMakeLists.txt
@@ -4,8 +4,6 @@ elseif(APPLE)
   set(PLAT_SRCS CLineRendererShadersMetal.cpp CModelShadersMetal.cpp)
 endif()
 
-include_directories(${LIBJPEG_INCLUDE_DIR})
-
 set(GRAPHICS_SOURCES
     IRenderer.hpp
     CBooRenderer.hpp CBooRenderer.cpp
diff --git a/amuse b/amuse
index 11739d86e..a62fa64fb 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit 11739d86e28bb556852f61c04fbe8cc04242d0b8
+Subproject commit a62fa64fb553d4fc1a4053bf78b495c281bfe4ad