diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ac226d..c0f05eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,6 @@ option(USE_WERROR "Enable SQLite3 support" OFF)
 
 if(USE_SQLITE3)
     find_package(SQLite3 REQUIRED)
-    # pkg_check_modules(SQLITE3 REQUIRED sqlite3)
     add_definitions(-DUSE_SQLITE3)
 endif()
 
diff --git a/src/db_delete_user.c b/src/db_delete_user.c
index cc65f87..c4fcce9 100644
--- a/src/db_delete_user.c
+++ b/src/db_delete_user.c
@@ -1,5 +1,8 @@
+#ifdef USE_SQLITE3
 #include "database.h"
 #include "sql.h"
+#endif
+
 #include "user.h"
 
 bool db_delete_user(const int id) {
diff --git a/src/db_get_all_users.c b/src/db_get_all_users.c
index fd3bc27..9c64856 100644
--- a/src/db_get_all_users.c
+++ b/src/db_get_all_users.c
@@ -1,7 +1,9 @@
-#include <string.h>
-
 #include "database.h"
+
+#ifdef USE_SQLITE3
 #include "sql.h"
+#endif
+
 #include "user.h"
 
 #ifndef USE_SQLITE3
diff --git a/src/db_get_user_by_id.c b/src/db_get_user_by_id.c
index 57e92f4..e65a0f8 100644
--- a/src/db_get_user_by_id.c
+++ b/src/db_get_user_by_id.c
@@ -1,4 +1,7 @@
+#ifndef USE_SQLITE3
 #include "cJSON.h"
+#endif
+
 #include "database.h"
 
 #ifdef USE_SQLITE3
diff --git a/src/db_get_user_by_username.c b/src/db_get_user_by_username.c
index 2707d77..35da766 100644
--- a/src/db_get_user_by_username.c
+++ b/src/db_get_user_by_username.c
@@ -1,4 +1,7 @@
+#ifndef USE_SQLITE3
 #include "cJSON.h"
+#endif
+
 #include "database.h"
 
 #ifdef USE_SQLITE3
diff --git a/src/db_get_users_from_file.c b/src/db_get_users_from_file.c
index a76bbd3..1730021 100644
--- a/src/db_get_users_from_file.c
+++ b/src/db_get_users_from_file.c
@@ -1,6 +1,4 @@
 #include <cJSON.h>
-// #include <sqlite3.h>
-
 #include "file.h"
 #include "user.h"
 
diff --git a/src/db_insert_user.c b/src/db_insert_user.c
index e90f2b2..6268409 100644
--- a/src/db_insert_user.c
+++ b/src/db_insert_user.c
@@ -1,4 +1,7 @@
+#ifndef USE_SQLITE3
 #include "cJSON.h"
+#endif
+
 #include "database.h"
 
 #ifdef USE_SQLITE3
diff --git a/src/db_update_user.c b/src/db_update_user.c
index 4e9ca24..260579c 100644
--- a/src/db_update_user.c
+++ b/src/db_update_user.c
@@ -1,5 +1,8 @@
+#ifdef USE_SQLITE3
 #include "database.h"
 #include "sql.h"
+#endif
+
 #include "user.h"
 
 User *db_update_user(const int userid, const char *username, const char *email,
diff --git a/src/db_update_user_field.c b/src/db_update_user_field.c
index 7f8c31e..51ea097 100644
--- a/src/db_update_user_field.c
+++ b/src/db_update_user_field.c
@@ -1,5 +1,8 @@
+#ifdef USE_SQLITE3
 #include "database.h"
 #include "sql.h"
+#endif
+
 #include "user.h"
 
 bool db_update_user_field(const int id, const char *field, const char *value) {