diff --git a/CMakeLists.txt b/CMakeLists.txt
index a82b15a..2b47ddc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,22 +10,26 @@ set(ZLIB_SRCS zlib/crc32.c)
 
 set(SRCS ${COMPAT_SRCS} ${LIBLO_SRCS} ${LIBMAPPER_SRCS} ${ZLIB_SRCS})
 
-include_directories(liblo liblo/src libmapper/include compat-idf/include zlib ${IDF_INCLUDES})
+include_directories(libmapper/include liblo compat-idf/include zlib ${IDF_INCLUDES})
 
 add_library(mapper STATIC ${SRCS})
 
 get_filename_component(compat_include compat-idf/include/compat.h ABSOLUTE)
-target_compile_options(mapper PRIVATE -DHAVE_CONFIG_H -include${compat_include} -w)
+target_compile_options(mapper PRIVATE -DHAVE_CONFIG_H -include${compat_include})
 
 add_custom_command(OUTPUT liblo/config.h
-                   COMMAND cp liblo_config.h liblo/config.h)
+                   COMMAND cp liblo_config.h liblo/config.h
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 add_custom_command(OUTPUT liblo/lo/lo.h
-                   COMMAND cp lo.h liblo/lo/lo.h)
+                   COMMAND cp lo.h liblo/lo/lo.h
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 add_custom_command(OUTPUT liblo/lo/lo_endian.h
-                   COMMAND cp lo_endian.h liblo/lo/lo_endian.h)
+                   COMMAND cp lo_endian.h liblo/lo/lo_endian.h
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 add_custom_command(OUTPUT libmapper/src/config.h
-                   COMMAND cp libmpr_config.h libmapper/src/config.h)
+                   COMMAND cp libmapper_config.h libmapper/src/config.h
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_custom_target(libmapper_config_headers DEPENDS liblo/config.h liblo/lo/lo.h liblo/lo/lo_endian.h libmapper/src/config.h)
-
+add_dependencies(mapper libmapper_config_headers)
 add_custom_command(TARGET mapper POST_BUILD COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/genlib.sh)
diff --git a/libmpr_config.h b/libmapper_config.h
similarity index 94%
rename from libmpr_config.h
rename to libmapper_config.h
index 73a9602..9c01884 100644
--- a/libmpr_config.h
+++ b/libmapper_config.h
@@ -89,19 +89,19 @@
 #define LT_OBJDIR ".libs/"
 
 /* Name of package */
-#define PACKAGE "libmpr"
+#define PACKAGE "libmapper"
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "dot_mapper@googlegroups.com"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "libmpr"
+#define PACKAGE_NAME "libmapper"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libmpr 1.2"
+#define PACKAGE_STRING "libmapper 1.2"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libmpr"
+#define PACKAGE_TARNAME "libmapper"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL "http://libmapper.org"
@@ -109,6 +109,9 @@
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "1.2"
 
+/* printf code for type long long int */
+#define PRINTF_LL "ll"
+
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 /* #undef PTHREAD_CREATE_JOINABLE */