diff --git a/Makefile b/Makefile
index be85af3..ee11970 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,20 @@ LFLAGS = -lssl -lcrypto
 CFILES = $(shell find src -name "*.c")
 HFILES = $(shell find src -name "*.h")
 
-EXAMPLES_CLIENT := $(basename $(shell ls examples/client/*.c 2>/dev/null))
-EXAMPLES_SERVER := $(basename $(shell ls examples/server/*.c 2>/dev/null))
-EXAMPLES_ENGINE := $(basename $(shell ls examples/engine/*.c 2>/dev/null))
+# Detect OS and set executable extension
+ifeq ($(OS),Windows_NT)
+    EXT = .exe
+else
+    EXT = .out
+endif
+
+EXAMPLES_CLIENT_SRC := $(shell ls examples/client/*.c 2>/dev/null)
+EXAMPLES_SERVER_SRC := $(shell ls examples/server/*.c 2>/dev/null)
+EXAMPLES_ENGINE_SRC := $(shell ls examples/engine/*.c 2>/dev/null)
+
+EXAMPLES_CLIENT := $(patsubst %.c,%$(EXT),$(EXAMPLES_CLIENT_SRC))
+EXAMPLES_SERVER := $(patsubst %.c,%$(EXT),$(EXAMPLES_SERVER_SRC))
+EXAMPLES_ENGINE := $(patsubst %.c,%$(EXT),$(EXAMPLES_ENGINE_SRC))
 
 all: chttp.c chttp.h examples
 
@@ -17,15 +28,15 @@ chttp.c chttp.h: $(HFILES) $(CFILES)
 
 examples: $(EXAMPLES_CLIENT) $(EXAMPLES_SERVER) $(EXAMPLES_ENGINE)
 
-examples/client/%: examples/client/%.c chttp.c chttp.h
+examples/client/%$(EXT): examples/client/%.c chttp.c chttp.h
 	$(CC) $(CFLAGS) $< chttp.c -o $@ $(LFLAGS)
 
-examples/server/%: examples/server/%.c chttp.c chttp.h
+examples/server/%$(EXT): examples/server/%.c chttp.c chttp.h
 	$(CC) $(CFLAGS) $< chttp.c -o $@ $(LFLAGS)
 
-examples/engine/%: examples/engine/%.c chttp.c chttp.h
+examples/engine/%$(EXT): examples/engine/%.c chttp.c chttp.h
 	$(CC) $(CFLAGS) $< chttp.c -o $@ $(LFLAGS)
 
 clean:
 	rm -f client_example server_example
-	rm -f examples/client/* examples/server/* examples/engine/*
+	rm -f examples/client/*$(EXT) examples/server/*$(EXT) examples/engine/*$(EXT)
diff --git a/examples/client/000_get_request b/examples/client/000_get_request
deleted file mode 100644
index ba61598..0000000
Binary files a/examples/client/000_get_request and /dev/null differ
diff --git a/examples/client/client_example b/examples/client/client_example
deleted file mode 100644
index c0dbefb..0000000
Binary files a/examples/client/client_example and /dev/null differ
diff --git a/examples/client/web_crawler b/examples/client/web_crawler
deleted file mode 100644
index dd4fec8..0000000
Binary files a/examples/client/web_crawler and /dev/null differ
diff --git a/examples/server/000_http_server b/examples/server/000_http_server
deleted file mode 100644
index c03d7ee..0000000
Binary files a/examples/server/000_http_server and /dev/null differ
diff --git a/examples/server/010_zero_copy_api b/examples/server/010_zero_copy_api
deleted file mode 100644
index 5955f8c..0000000
Binary files a/examples/server/010_zero_copy_api and /dev/null differ
diff --git a/examples/server/020_response_undo b/examples/server/020_response_undo
deleted file mode 100644
index 0b2c31f..0000000
Binary files a/examples/server/020_response_undo and /dev/null differ