diff --git a/book/src/c/initial.md b/book/src/c/initial.md
index e9f4ce3..1e54140 100644
--- a/book/src/c/initial.md
+++ b/book/src/c/initial.md
@@ -43,7 +43,7 @@ application, implementing most of the new logic in Rust.
 The initial code is included in full below
 if you want to familiarize yourself with it:
 
-`src/main.cpp` - the entry point
+`src/main.c` - the entry point
 
 ```c
 #include "modules/file/file.h"
@@ -98,6 +98,7 @@ void print_result(const uint64_t result) {
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;
diff --git a/c/chap1/src/modules/file/file.c b/c/chap1/src/modules/file/file.c
index c770fc2..fb207c8 100644
--- a/c/chap1/src/modules/file/file.c
+++ b/c/chap1/src/modules/file/file.c
@@ -1,8 +1,6 @@
 #include "file.h"
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 File file_read(const char* filename) {
diff --git a/c/chap1/src/modules/file/file.h b/c/chap1/src/modules/file/file.h
index b4ee11b..5941534 100644
--- a/c/chap1/src/modules/file/file.h
+++ b/c/chap1/src/modules/file/file.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;
diff --git a/c/chap2/src/modules/file/file.c b/c/chap2/src/modules/file/file.c
index c770fc2..fb207c8 100644
--- a/c/chap2/src/modules/file/file.c
+++ b/c/chap2/src/modules/file/file.c
@@ -1,8 +1,6 @@
 #include "file.h"
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 File file_read(const char* filename) {
diff --git a/c/chap2/src/modules/file/file.h b/c/chap2/src/modules/file/file.h
index b4ee11b..5941534 100644
--- a/c/chap2/src/modules/file/file.h
+++ b/c/chap2/src/modules/file/file.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;
diff --git a/c/chap3/src/modules/file/file.c b/c/chap3/src/modules/file/file.c
index c770fc2..fb207c8 100644
--- a/c/chap3/src/modules/file/file.c
+++ b/c/chap3/src/modules/file/file.c
@@ -1,8 +1,6 @@
 #include "file.h"
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 File file_read(const char* filename) {
diff --git a/c/chap3/src/modules/file/file.h b/c/chap3/src/modules/file/file.h
index b4ee11b..5941534 100644
--- a/c/chap3/src/modules/file/file.h
+++ b/c/chap3/src/modules/file/file.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;
diff --git a/c/chap4/src/modules/file/file.c b/c/chap4/src/modules/file/file.c
index c770fc2..fb207c8 100644
--- a/c/chap4/src/modules/file/file.c
+++ b/c/chap4/src/modules/file/file.c
@@ -1,8 +1,6 @@
 #include "file.h"
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 File file_read(const char* filename) {
diff --git a/c/chap4/src/modules/file/file.h b/c/chap4/src/modules/file/file.h
index b4ee11b..5941534 100644
--- a/c/chap4/src/modules/file/file.h
+++ b/c/chap4/src/modules/file/file.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;
diff --git a/c/chap5/src/modules/file/file.c b/c/chap5/src/modules/file/file.c
index c770fc2..fb207c8 100644
--- a/c/chap5/src/modules/file/file.c
+++ b/c/chap5/src/modules/file/file.c
@@ -1,8 +1,6 @@
 #include "file.h"
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 File file_read(const char* filename) {
diff --git a/c/chap5/src/modules/file/file.h b/c/chap5/src/modules/file/file.h
index b4ee11b..5941534 100644
--- a/c/chap5/src/modules/file/file.h
+++ b/c/chap5/src/modules/file/file.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;
diff --git a/c/chap6/src/modules/file/file.c b/c/chap6/src/modules/file/file.c
index c770fc2..fb207c8 100644
--- a/c/chap6/src/modules/file/file.c
+++ b/c/chap6/src/modules/file/file.c
@@ -1,8 +1,6 @@
 #include "file.h"
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 File file_read(const char* filename) {
diff --git a/c/chap6/src/modules/file/file.h b/c/chap6/src/modules/file/file.h
index b4ee11b..5941534 100644
--- a/c/chap6/src/modules/file/file.h
+++ b/c/chap6/src/modules/file/file.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;
diff --git a/c/chap7/src/modules/file/file.c b/c/chap7/src/modules/file/file.c
index c770fc2..fb207c8 100644
--- a/c/chap7/src/modules/file/file.c
+++ b/c/chap7/src/modules/file/file.c
@@ -1,8 +1,6 @@
 #include "file.h"
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 File file_read(const char* filename) {
diff --git a/c/chap7/src/modules/file/file.h b/c/chap7/src/modules/file/file.h
index b4ee11b..5941534 100644
--- a/c/chap7/src/modules/file/file.h
+++ b/c/chap7/src/modules/file/file.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct File {
     const char* filename;