diff --git a/xmake.lua b/xmake.lua
index 6bd68e8..79ca7d5 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -47,9 +47,16 @@ end
 
 target("SimpleProtocolLib")
     add_includedirs("include")
-    add_headerfiles("include/(sp/common/**.h)", "include/(sp/common/**.h)", "include/(sp/common/**.h)")
+    add_files("src/sp/**.cpp")
+    
+    local includeFolders = {"common", "default", "io", "protocol"}
+    for _, folder in ipairs(includeFolders) do
+        add_headerfiles("include/(sp/" .. folder .. "/**.h)")
+    end
+
+    -- we don't want extensions
+    remove_files("src/sp/extensions/**.cpp")
     set_group("Library")
-    add_files("src/sp/common/*.cpp")
     set_kind("$(kind)")
 
 -- Tests