diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 28aa5bd6..b359d91c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,7 @@ macro(upm_SWIG_PYTHON)
   if(BUILDSWIGPYTHON)
     set (CMAKE_C_FLAGS -DSWIGPYTHON=${SWIG_FOUND})
     set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON)
-    swig_add_module (pyupm_${libname} python pyupm_${libname}.i ${libname}.cxx)
+    swig_add_module (pyupm_${libname} python pyupm_${libname}.i ${module_src})
     swig_link_libraries (pyupm_${libname} ${PYTHON_LIBRARIES} ${MAA_LIBRARIES})
     target_include_directories ( ${SWIG_MODULE_pyupm_${libname}_REAL_NAME}
       PUBLIC
@@ -38,7 +38,7 @@ macro(upm_SWIG_NODE)
     set (CMAKE_CXX_FLAGS -DBUILDING_NODE_EXTENSION)
     set_source_files_properties (jsupm_${libname}.i PROPERTIES CPLUSPLUS ON)
     set_source_files_properties (jsupm_${libname}.i PROPERTIES SWIG_FLAGS "-node")
-    swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i ${libname}.cxx)
+    swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i ${module_src})
     swig_link_libraries (jsupm_${libname} ${MAA_LIBRARIES} ${NODE_LIBRARIES})
     target_include_directories ( ${SWIG_MODULE_jsupm_${libname}_REAL_NAME}
       PUBLIC
@@ -94,6 +94,7 @@ if (SWIG_FOUND)
 endif()
 
 macro(upm_module_init)
+  add_library (${libname} SHARED ${module_src})
   include_directories (${MAA_INCLUDE_DIR} .)
   target_link_libraries (${libname} ${MAA_LIBRARIES})
   set_target_properties(${libname} PROPERTIES PREFIX "libupm-")
@@ -104,7 +105,7 @@ macro(upm_module_init)
     upm_doxygen()
   endif()
   install (TARGETS ${libname} DESTINATION lib COMPONENT ${libname})
-  install (FILES ${libname}.h DESTINATION include/upm COMPONENT ${libname})
+  install (FILES ${module_h} DESTINATION include/upm COMPONENT ${libname})
 
   if (IPK)
     cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
diff --git a/src/buzzer/CMakeLists.txt b/src/buzzer/CMakeLists.txt
index 8de1b98a..02749c04 100644
--- a/src/buzzer/CMakeLists.txt
+++ b/src/buzzer/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "buzzer")
 set (libdescription "upm buzzer")
-add_library (buzzer SHARED buzzer.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/grove/CMakeLists.txt b/src/grove/CMakeLists.txt
index 8f570441..c102c2e2 100644
--- a/src/grove/CMakeLists.txt
+++ b/src/grove/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "grove")
 set (libdescription "upm grove module")
-add_library (grove SHARED grove.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/hcsr04/CMakeLists.txt b/src/hcsr04/CMakeLists.txt
index 103bf0c8..81e692de 100644
--- a/src/hcsr04/CMakeLists.txt
+++ b/src/hcsr04/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "hcsr04")
 set (libdescription "upm proximity sensor")
-add_library (hcsr04 SHARED hcsr04.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/hmc5883l/CMakeLists.txt b/src/hmc5883l/CMakeLists.txt
index 05b52deb..f97d75f2 100644
--- a/src/hmc5883l/CMakeLists.txt
+++ b/src/hmc5883l/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "hmc5883l")
 set (libdescription "libupm Digital Compass")
-add_library (hmc5883l SHARED hmc5883l.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/max44000/CMakeLists.txt b/src/max44000/CMakeLists.txt
index 69365ede..11090615 100644
--- a/src/max44000/CMakeLists.txt
+++ b/src/max44000/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "max44000")
 set (libdescription "upm MAX44000")
-add_library (max44000 SHARED max44000.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/mma7455/CMakeLists.txt b/src/mma7455/CMakeLists.txt
index cb67d1e4..a52cbc98 100644
--- a/src/mma7455/CMakeLists.txt
+++ b/src/mma7455/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "mma7455")
 set (libdescription "upm MMA7455")
-add_library (mma7455 SHARED mma7455.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/my9221/CMakeLists.txt b/src/my9221/CMakeLists.txt
index 30666220..714fe861 100644
--- a/src/my9221/CMakeLists.txt
+++ b/src/my9221/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "my9221")
 set (libdescription "upm ledbar")
-add_library (${libname} SHARED my9221.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/nrf24l01/CMakeLists.txt b/src/nrf24l01/CMakeLists.txt
index a91ad597..538d3a14 100644
--- a/src/nrf24l01/CMakeLists.txt
+++ b/src/nrf24l01/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "nrf24l01")
 set (libdescription "libupm NRF tx/rx")
-add_library (nrf24l01 SHARED nrf24l01.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()
diff --git a/src/tm1637/CMakeLists.txt b/src/tm1637/CMakeLists.txt
index f2de7b31..0779f44d 100644
--- a/src/tm1637/CMakeLists.txt
+++ b/src/tm1637/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "tm1637")
 set (libdescription "upm 4 digit display tm1637")
-add_library (${libname} SHARED tm1637.cxx)
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
 upm_module_init()