Index: railcontrol/Makefile
===================================================================
--- railcontrol.orig/Makefile	2025-05-01 06:57:12.475180182 +0200
+++ railcontrol/Makefile	2025-05-01 06:57:58.362463176 +0200
@@ -1,11 +1,10 @@
 
 RAILCONTROL_VERSION := 24
 
-CFLAGSSQLITE=-g -O2 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DHAVE_USLEEP
 CXXFLAGS=-I. -g -O2 -Wall -Wextra -pedantic -Werror -Wno-missing-braces -std=c++11 -D_GNU_SOURCE
 CXXFLAGSAMALGAMATION=-I. -g -O2 -Wall -Wextra -pedantic -Werror -Wno-missing-braces -std=c++11
 LDFLAGS=-g
-LIBS=-lpthread -ldl -lz
+LIBS=-lpthread -ldl -lz -lsqlite3
 LIBSAMALGAMATION=-lpthread -ldl
 
 ifeq ($(OS),Windows_NT)
@@ -16,7 +15,7 @@
 TMPDIRCYGWIN=/RailControl
 
 CXXOBJ= $(patsubst %.cpp,%.o,$(sort Version.cpp $(wildcard *.cpp)) $(wildcard Server/Web/*.cpp Server/CS2/*.cpp Server/Z21/*.cpp DataModel/*.cpp Hardware/*.cpp Hardware/Protocols/*.cpp Logger/*.cpp Network/*.cpp Storage/*.cpp Utils/*.cpp))
-OBJ=Storage/sqlite/sqlite3.o $(CXXOBJ)
+OBJ=$(CXXOBJ)
 
 all: $(OBJ)
 	$(CXX) $(LDFLAGS) $(OBJ) -o railcontrol $(LIBS)
@@ -53,8 +52,8 @@
 amalgamation.cpp:
 	./amalgamation.bash
 
-amalgamation: amalgamation.o Version.cpp Storage/sqlite/sqlite3.o
-	$(CXX) -g amalgamation.o Storage/sqlite/sqlite3.o -o railcontrol $(LIBSAMALGAMATION)
+amalgamation: amalgamation.o Version.cpp
+	$(CXX) -g amalgamation.o -o railcontrol $(LIBSAMALGAMATION)
 	strip railcontrol
 	rm -f amalgamation.o
 	rm -f amalgamation.cpp
@@ -65,9 +64,6 @@
 Version.o: Version.cpp Version.h
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-Storage/sqlite/sqlite3.o: Storage/sqlite/sqlite3.c Storage/sqlite/sqlite3.h
-	$(CC) $(CFLAGSSQLITE) -c -o $@ $<
-
 %.o: %.cpp *.h DataModel/*.h Hardware/*.h Hardware/Protocols/*.h Logger/*.h Network/*.h Storage/*.h Utils/*.h Server/Web/*.h Server/CS2/*.h Server/Z21/*.h
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
Index: railcontrol/Storage/Sqlite.h
===================================================================
--- railcontrol.orig/Storage/Sqlite.h	2025-05-01 06:57:12.475180182 +0200
+++ railcontrol/Storage/Sqlite.h	2025-05-01 06:57:12.471180245 +0200
@@ -24,7 +24,7 @@
 
 #include "DataModel/DataModel.h"
 #include "Logger/Logger.h"
-#include "Storage/sqlite/sqlite3.h"
+#include <sqlite3.h>
 #include "Storage/StorageInterface.h"
 #include "Storage/StorageParams.h"