diff --git a/src/c/Mex/CMakeLists.txt b/src/c/Mex/CMakeLists.txt
index 1c0a082c976ae88dc3ab28296f1838109ea48f33..c655c795f36f59122346934402a7d3d9b77089e0 100644
--- a/src/c/Mex/CMakeLists.txt
+++ b/src/c/Mex/CMakeLists.txt
@@ -1,6 +1,9 @@
 # Setup MEX interface if Matlab was found
 add_library(HydraMex MODULE "")
 
+# Set up custom post-build command to run MATLAB build scripts
+include(autoBuildMex.cmake)
+
 # Require c++11 and set build definition to MEX_BUILD
 target_compile_features(HydraMex PRIVATE cxx_std_11)
 target_compile_definitions(HydraMex PRIVATE MEX_BUILD)
@@ -13,7 +16,7 @@ endif()
 # Link against Matlab libraries
 target_link_libraries(HydraMex PRIVATE HydraCudaLib ${Matlab_MX_LIBRARY} ${Matlab_MEX_LIBRARY})
 
-# Change output library name to Hydra.mex<plaform>
+# Change output library name to <ModuleName>.mex<plaform>
 set_target_properties(HydraMex
     PROPERTIES
         OUTPUT_NAME ${HYDRA_MODULE_NAME}
@@ -28,7 +31,6 @@ target_include_directories(HydraMex PRIVATE ${Matlab_INCLUDE_DIRS})
 # Setup src include directories
 target_include_directories(HydraMex
     PRIVATE
-        $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds>
diff --git a/src/c/Python/CMakeLists.txt b/src/c/Python/CMakeLists.txt
index 0ad2b8f2ffd8214bac8611651243e3dd47a02b02..350f6bc7809bd766f0ccbcfc3e69f65d4ee86e30 100644
--- a/src/c/Python/CMakeLists.txt
+++ b/src/c/Python/CMakeLists.txt
@@ -19,6 +19,7 @@ set_target_properties(HydraPy
         OUTPUT_NAME ${HYDRA_MODULE_NAME}
         PREFIX ""
         POSITION_INDEPENDENT_CODE ON
+        LIBRARY_OUTPUT_DIRECTORY $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/Python>
 )
 
 # On windows specifically set the suffix to .pyd
@@ -32,7 +33,6 @@ target_include_directories(HydraPy PRIVATE Python::Python Python::NumPy)
 # Setup src include directories
 target_include_directories(HydraPy
     PRIVATE
-        $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds>