diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6457d09..983300a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,6 @@ generateBuildInfo(${FLAGS})
 include_directories(include srclib/libhelper/include srclib/libpartition_map/include)
 
 # Add libraries
-add_subdirectory(srclib/libhelper)
-add_subdirectory(srclib/libpartition_map)
+add_subdirectory(srclib)
 
 # NOTE: pmt is not ready, this CMakeFiles.txt only builds libraries
diff --git a/srclib/CMakeLists.txt b/srclib/CMakeLists.txt
new file mode 100644
index 0000000..8aab8f7
--- /dev/null
+++ b/srclib/CMakeLists.txt
@@ -0,0 +1,20 @@
+#
+#  Copyright 2025 Yağız Zengin
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+# Add libraries
+add_subdirectory(libhelper)
+add_subdirectory(libpartition_map)
+
diff --git a/srclib/libhelper/CMakeLists.txt b/srclib/libhelper/CMakeLists.txt
index cefcdba..0054f8d 100644
--- a/srclib/libhelper/CMakeLists.txt
+++ b/srclib/libhelper/CMakeLists.txt
@@ -14,7 +14,7 @@
 #  limitations under the License.
 #
 
-set(LIBHELPER_FLAGS -Wall -DLIB_BUILD_MODE)
+set(LIBHELPER_FLAGS -DLIB_BUILD_MODE)
 set(LIBHELPER_SOURCES
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Checkers.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Classes.cpp
diff --git a/srclib/libpartition_map/CMakeLists.txt b/srclib/libpartition_map/CMakeLists.txt
index d2cf665..2ed51f1 100644
--- a/srclib/libpartition_map/CMakeLists.txt
+++ b/srclib/libpartition_map/CMakeLists.txt
@@ -20,7 +20,7 @@ set(LIBPARTITION_MAP_SOURCES
 	${CMAKE_CURRENT_SOURCE_DIR}/src/PartitionMap.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Type.cpp
 )
-set(LIBPARTITION_MAP_FLAGS -Wall -Werror -DLOG_FILE="/storage/emulated/0/.last_pmt.log" -DPROGRAM_NAME="libpartition_map")
+set(LIBPARTITION_MAP_FLAGS -DLOG_FILE="/storage/emulated/0/.last_pmt.log" -DPROGRAM_NAME="libpartition_map")
 
 # Add targets
 add_library(partition_map_shared SHARED ${LIBPARTITION_MAP_SOURCES})