diff --git a/CMakeLists.txt b/CMakeLists.txt
index d044a11..a5c85f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,81 +6,79 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(NOT MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing")
+    add_compile_options(-Wno-narrowing)
 endif()
-  
+
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/boo AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/athena)
   message(STATUS "Preparing standalone build")
   add_subdirectory(boo)
   add_subdirectory(athena)
 endif()
 
-set(SOURCES
-    lib/AudioGroup.cpp
-    lib/AudioGroupData.cpp
-    lib/AudioGroupPool.cpp
-    lib/AudioGroupProject.cpp
-    lib/AudioGroupSampleDirectory.cpp
-    lib/DirectoryEnumerator.cpp
-    lib/Emitter.cpp
-    lib/Engine.cpp
-    lib/Envelope.cpp
-    lib/Listener.cpp
-    lib/Sequencer.cpp
-    lib/SoundMacroState.cpp
-    lib/SongConverter.cpp
-    lib/SongState.cpp
-    lib/Voice.cpp
-    lib/Submix.cpp
-    lib/Studio.cpp
-    lib/EffectReverb.cpp
-    lib/EffectChorus.cpp
-    lib/EffectDelay.cpp
-    lib/ContainerRegistry.cpp
-    lib/Common.cpp
-    lib/DSPCodec.cpp
-    lib/N64MusyXCodec.cpp
-    lib/VolumeTable.cpp)
+add_library(amuse
+  lib/AudioGroup.cpp
+  lib/AudioGroupData.cpp
+  lib/AudioGroupPool.cpp
+  lib/AudioGroupProject.cpp
+  lib/AudioGroupSampleDirectory.cpp
+  lib/Common.cpp
+  lib/ContainerRegistry.cpp
+  lib/DirectoryEnumerator.cpp
+  lib/DSPCodec.cpp
+  lib/EffectChorus.cpp
+  lib/EffectDelay.cpp
+  lib/EffectReverb.cpp
+  lib/Emitter.cpp
+  lib/Engine.cpp
+  lib/Envelope.cpp
+  lib/Listener.cpp
+  lib/N64MusyXCodec.cpp
+  lib/Sequencer.cpp
+  lib/SongConverter.cpp
+  lib/SongState.cpp
+  lib/SoundMacroState.cpp
+  lib/Studio.cpp
+  lib/Submix.cpp
+  lib/Voice.cpp
+  lib/VolumeTable.cpp
+
+  include/amuse/amuse.hpp
+  include/amuse/AudioGroup.hpp
+  include/amuse/AudioGroupData.hpp
+  include/amuse/AudioGroupPool.hpp
+  include/amuse/AudioGroupProject.hpp
+  include/amuse/AudioGroupSampleDirectory.hpp
+  include/amuse/Common.hpp
+  include/amuse/ContainerRegistry.hpp
+  include/amuse/DirectoryEnumerator.hpp
+  include/amuse/DSPCodec.hpp
+  include/amuse/EffectBase.hpp
+  include/amuse/EffectChorus.hpp
+  include/amuse/EffectDelay.hpp
+  include/amuse/EffectReverb.hpp
+  include/amuse/Emitter.hpp
+  include/amuse/Engine.hpp
+  include/amuse/Entity.hpp
+  include/amuse/Envelope.hpp
+  include/amuse/IBackendSubmix.hpp
+  include/amuse/IBackendVoice.hpp
+  include/amuse/IBackendVoiceAllocator.hpp
+  include/amuse/Listener.hpp
+  include/amuse/N64MusyXCodec.hpp
+  include/amuse/Sequencer.hpp
+  include/amuse/SongConverter.hpp
+  include/amuse/SoundMacroState.hpp
+  include/amuse/SongState.hpp
+  include/amuse/Submix.hpp
+  include/amuse/Studio.hpp
+  include/amuse/Voice.hpp
+  include/amuse/VolumeTable.hpp
+)
 
-set(HEADERS
-    include/amuse/AudioGroup.hpp
-    include/amuse/AudioGroupData.hpp
-    include/amuse/AudioGroupPool.hpp
-    include/amuse/AudioGroupProject.hpp
-    include/amuse/AudioGroupSampleDirectory.hpp
-    include/amuse/DirectoryEnumerator.hpp
-    include/amuse/Emitter.hpp
-    include/amuse/Engine.hpp
-    include/amuse/Entity.hpp
-    include/amuse/Envelope.hpp
-    include/amuse/Listener.hpp
-    include/amuse/Sequencer.hpp
-    include/amuse/SoundMacroState.hpp
-    include/amuse/SongConverter.hpp
-    include/amuse/SongState.hpp
-    include/amuse/Voice.hpp
-    include/amuse/Submix.hpp
-    include/amuse/Studio.hpp
-    include/amuse/IBackendSubmix.hpp
-    include/amuse/IBackendVoice.hpp
-    include/amuse/IBackendVoiceAllocator.hpp
-    include/amuse/EffectBase.hpp
-    include/amuse/EffectReverb.hpp
-    include/amuse/EffectChorus.hpp
-    include/amuse/EffectDelay.hpp
-    include/amuse/ContainerRegistry.hpp
-    include/amuse/Common.hpp
-    include/amuse/amuse.hpp
-    include/amuse/DSPCodec.hpp
-    include/amuse/N64MusyXCodec.hpp
-    include/amuse/VolumeTable.hpp)
 if(NX)
-  list(APPEND HEADERS include/switch_math.hpp)
+  target_sources(amuse PRIVATE include/switch_math.hpp)
 endif()
 
-add_library(amuse
-            ${SOURCES}
-            ${HEADERS})
 target_atdna(amuse atdna_AudioGroupPool.cpp include/amuse/AudioGroupPool.hpp)
 target_atdna(amuse atdna_AudioGroupProject.cpp include/amuse/AudioGroupProject.hpp)
 target_atdna(amuse atdna_AudioGroupSampleDirectory.cpp include/amuse/AudioGroupSampleDirectory.hpp)