diff --git a/includes/icmp.h b/includes/icmp.h
index 947d6a3..f06f9a6 100644
--- a/includes/icmp.h
+++ b/includes/icmp.h
@@ -55,25 +55,23 @@ int icmp_get_fd(const icmp_handle_t *h);
 
 /* Send functions */
 int icmp_send_raw(icmp_handle_t *h, uint8_t type, uint8_t code,
-					uint32_t header_rest,
-					const void *payload, size_t len, struct in_addr dest,
-					uint8_t ttl);
+		uint32_t header_rest, const void *payload, size_t len,
+		struct in_addr dest, uint8_t ttl);
 
 int icmp_send_echo(icmp_handle_t *h, struct in_addr dest, uint16_t id,
-					uint16_t seq, uint8_t ttl,
-					const void *payload, size_t payload_len);
+		uint16_t seq, uint8_t ttl, const void *payload, size_t payload_len);
 
 /* Receive function */
 int icmp_process(icmp_handle_t *h, icmp_callback_t cb, void *userdata,
-				size_t max_packets);
+		size_t max_packets);
 
 /* ID/Sequence helpers */
 int icmp_reply_id_seq(const icmp_reply_t *reply, uint16_t *id,
-						uint16_t *seq);
+		uint16_t *seq);
 
 /* Error message helpers */
 int icmp_error_extract_offending(const icmp_reply_t *reply,
-								icmp_offending_packet_t *offending);
+		icmp_offending_packet_t *offending);
 
 /* Socket options */
 int icmp_set_dont_fragment(icmp_handle_t *h);
@@ -85,6 +83,6 @@ int icmp_should_retry(const icmp_handle_t *h);
 /* Time helpers */
 int icmp_get_time(struct timespec *ts);
 int64_t icmp_time_diff_ns(const struct timespec *start,
-							const struct timespec *end);
+		const struct timespec *end);
 
 #endif
diff --git a/includes/internal/icmp_packet_internal.h b/includes/internal/icmp_packet_internal.h
index 801d2a5..054d016 100644
--- a/includes/internal/icmp_packet_internal.h
+++ b/includes/internal/icmp_packet_internal.h
@@ -6,16 +6,15 @@
 #include <netinet/in.h>
 
 int icmp_build_packet(void *buffer, size_t buffer_len, uint8_t type,
-						uint8_t code, uint32_t header_rest,
-						const void *payload, size_t payload_len);
+		uint8_t code, uint32_t header_rest, const void *payload,
+		size_t payload_len);
 
 int icmp_parse_ip_header(const void *buffer, size_t buffer_len,
-						uint8_t *ttl, struct in_addr *src_addr,
-						size_t *ip_hdr_len, struct in_addr *dst_addr,
-						uint8_t *protocol);
+		uint8_t *ttl, struct in_addr *src_addr,
+		size_t *ip_hdr_len, struct in_addr *dst_addr, uint8_t *protocol);
 
 int icmp_parse_icmp_payload(const void *buffer, size_t buffer_len,
-							size_t ip_hdr_len, uint8_t *type, uint8_t *code,
-							const void **payload, size_t *payload_len);
+		size_t ip_hdr_len, uint8_t *type, uint8_t *code,
+		const void **payload, size_t *payload_len);
 
 #endif
diff --git a/includes/internal/icmp_recv.h b/includes/internal/icmp_recv.h
index c14653b..1f6dda1 100644
--- a/includes/internal/icmp_recv.h
+++ b/includes/internal/icmp_recv.h
@@ -1,11 +1,12 @@
 #ifndef ICMP_RECV_H
 #define ICMP_RECV_H
 
-#include "icmp.h"
-#include "internal/icmp_internal.h"
 #include <netinet/in.h>
 #include <sys/types.h>
 
+#include "icmp.h"
+#include "internal/icmp_internal.h"
+
 /* Validation helpers */
 int recv_validate_params(struct icmp_handle *h, icmp_callback_t cb);
 int recv_handle_receive_error(struct icmp_handle *h);
@@ -14,20 +15,17 @@ int recv_handle_receive_error(struct icmp_handle *h);
 ssize_t recv_receive_packet(int fd, void *buffer, size_t buffer_len,
 							struct sockaddr_in *from);
 
-int recv_parse_packet(const void *buffer, size_t buffer_len,
-					uint8_t *type, uint8_t *code,
-					uint8_t *ttl, struct in_addr *src_addr,
-					const void **payload, size_t *payload_len,
-					size_t *ip_hdr_len);
+int recv_parse_packet(const void *buffer, size_t buffer_len, uint8_t *type,
+		uint8_t *code, uint8_t *ttl, struct in_addr *src_addr,
+		const void **payload, size_t *payload_len, size_t *ip_hdr_len);
 
 /* Reply building */
 void recv_build_reply(icmp_reply_t *reply, uint8_t type, uint8_t code,
-					uint8_t ttl, struct in_addr src_addr,
-					const void *payload, size_t payload_len,
-					const void *buffer, size_t ip_hdr_len);
+		uint8_t ttl, struct in_addr src_addr, const void *payload,
+		size_t payload_len, const void *buffer, size_t ip_hdr_len);
 
 /* Process single packet */
 void recv_process_single_packet(uint8_t *buffer, ssize_t len,
-								icmp_callback_t cb, void *userdata);
+		icmp_callback_t cb, void *userdata);
 
 #endif
diff --git a/includes/internal/icmp_send.h b/includes/internal/icmp_send.h
index 3de83d3..7e9a9de 100644
--- a/includes/internal/icmp_send.h
+++ b/includes/internal/icmp_send.h
@@ -1,16 +1,17 @@
 #ifndef ICMP_SEND_H
 #define ICMP_SEND_H
 
-#include "internal/icmp_internal.h"
 #include <netinet/in.h>
 
+#include "internal/icmp_internal.h"
+
 void send_prepare_destination(struct sockaddr_in *addr, struct in_addr dest);
 int send_set_socket_ttl(struct icmp_handle *h, uint8_t ttl);
 int send_packet(struct icmp_handle *h, const void *buffer, size_t len,
-				struct sockaddr_in *dest);
+		struct sockaddr_in *dest);
 
 int send_validate_handle(struct icmp_handle *h);
 int send_to_destination(struct icmp_handle *h, const void *packet, size_t len,
-						struct in_addr dest, uint8_t ttl);
+		struct in_addr dest, uint8_t ttl);
 
 #endif
diff --git a/includes/internal/icmp_utils.h b/includes/internal/icmp_utils.h
index aa7f722..d11bb1a 100644
--- a/includes/internal/icmp_utils.h
+++ b/includes/internal/icmp_utils.h
@@ -11,6 +11,6 @@ uint16_t icmp_checksum(const void *data, size_t len);
 /* Time helpers */
 int icmp_get_time(struct timespec *ts);
 int64_t icmp_time_diff_ns(const struct timespec *start,
-                          const struct timespec *end);
+		const struct timespec *end);
 
 #endif
diff --git a/src/error/set_error.c b/src/error/set_error.c
index d40931c..61be3f7 100644
--- a/src/error/set_error.c
+++ b/src/error/set_error.c
@@ -1,6 +1,7 @@
-#include "internal/icmp_internal.h"
 #include <stdio.h>
 
+#include "internal/icmp_internal.h"
+
 void
 icmp_set_error(struct icmp_handle *h, int code, const char *msg)
 {
diff --git a/src/error/set_error_fmt.c b/src/error/set_error_fmt.c
index edd546e..73e0c1c 100644
--- a/src/error/set_error_fmt.c
+++ b/src/error/set_error_fmt.c
@@ -1,7 +1,8 @@
-#include "internal/icmp_internal.h"
 #include <stdarg.h>
 #include <stdio.h>
 
+#include "internal/icmp_internal.h"
+
 void
 icmp_set_error_fmt(struct icmp_handle *h, int code, const char *fmt, ...)
 {
diff --git a/src/handle/create.c b/src/handle/create.c
index a9ff241..fb0b4f7 100644
--- a/src/handle/create.c
+++ b/src/handle/create.c
@@ -1,8 +1,9 @@
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "icmp.h"
 #include "internal/icmp_internal.h"
 #include "internal/icmp_socket.h"
-#include <stdlib.h>
-#include <unistd.h>
 
 /* Forward declarations */
 static int alloc_icmp_handle(struct icmp_handle **h);
diff --git a/src/handle/destroy.c b/src/handle/destroy.c
index 0678cc8..29ab460 100644
--- a/src/handle/destroy.c
+++ b/src/handle/destroy.c
@@ -1,8 +1,9 @@
-#include "icmp.h"
-#include "internal/icmp_internal.h"
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "icmp.h"
+#include "internal/icmp_internal.h"
+
 void
 icmp_destroy(icmp_handle_t *h)
 {
diff --git a/src/packet/build.c b/src/packet/build.c
index 1b4b743..2f79475 100644
--- a/src/packet/build.c
+++ b/src/packet/build.c
@@ -1,19 +1,20 @@
-#include "internal/icmp_packet_internal.h"
-#include "internal/icmp_packet.h"
-#include "internal/icmp_utils.h"
 #include <stddef.h>
 #include <string.h>
 #include <arpa/inet.h>
 
+#include "internal/icmp_packet_internal.h"
+#include "internal/icmp_packet.h"
+#include "internal/icmp_utils.h"
+
 /* Forward declarations */
 static void write_icmp_header(struct icmp_header *hdr, uint8_t type,
-								uint8_t code, uint32_t header_rest);
+		uint8_t code, uint32_t header_rest);
 /* -------------------- */
 
 int
 icmp_build_packet(void *buffer, size_t buffer_len, uint8_t type, uint8_t code,
-					uint32_t header_rest, const void *payload,
-					size_t payload_len)
+		uint32_t header_rest, const void *payload,
+		size_t payload_len)
 {
 	const size_t required_len = sizeof(struct icmp_header) + payload_len;
 	struct icmp_header *h;
@@ -37,7 +38,7 @@ icmp_build_packet(void *buffer, size_t buffer_len, uint8_t type, uint8_t code,
 
 static void
 write_icmp_header(struct icmp_header *hdr, uint8_t type, uint8_t code,
-					uint32_t header_rest)
+		uint32_t header_rest)
 {
 	hdr->type = type;
 	hdr->code = code;
diff --git a/src/packet/parse_icmp.c b/src/packet/parse_icmp.c
index ebba51c..b751ee6 100644
--- a/src/packet/parse_icmp.c
+++ b/src/packet/parse_icmp.c
@@ -1,6 +1,7 @@
+#include <stdint.h>
+
 #include "internal/icmp_packet_internal.h"
 #include "internal/icmp_packet.h"
-#include <stdint.h>
 
 /* ICMP header size */
 #define ICMP_HEADER_SIZE 8
@@ -8,15 +9,15 @@
 /* Forward declarations */
 static int validate_icmp_size(size_t buffer_len, size_t ip_hdr_len);
 static const struct icmp_header *get_icmp_header(const void *buffer,
-													size_t ip_hdr_len);
+		size_t ip_hdr_len);
 static void extract_icmp_fields(const struct icmp_header *hdr, uint8_t *type,
-								uint8_t *code);
+		uint8_t *code);
 /* -------------------- */
 
 int
 icmp_parse_icmp_payload(const void *buffer, size_t buffer_len,
-						size_t ip_hdr_len, uint8_t *type, uint8_t *code,
-						const void **payload, size_t *payload_len)
+		size_t ip_hdr_len, uint8_t *type, uint8_t *code, const void **payload,
+		size_t *payload_len)
 {
 	size_t payload_offset;
 	const struct icmp_header *hdr;
@@ -47,7 +48,7 @@ get_icmp_header(const void *buffer, size_t ip_hdr_len)
 
 static void
 extract_icmp_fields(const struct icmp_header *hdr, uint8_t *type,
-					uint8_t *code)
+		uint8_t *code)
 {
 	*type = hdr->type;
 	*code = hdr->code;
diff --git a/src/packet/parse_ip.c b/src/packet/parse_ip.c
index a09c98f..4ca40c9 100644
--- a/src/packet/parse_ip.c
+++ b/src/packet/parse_ip.c
@@ -1,10 +1,11 @@
-#include "internal/icmp_packet_internal.h"
-#include "internal/icmp_packet.h"
 #include <netinet/in.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
+#include "internal/icmp_packet_internal.h"
+#include "internal/icmp_packet.h"
+
 /* Minimum IP header size */
 #define MIN_IP_HEADER_SIZE 20
 
@@ -15,8 +16,8 @@ static size_t extract_ip_header_length(uint8_t version_ihl);
 
 int
 icmp_parse_ip_header(const void *buffer, size_t buffer_len, uint8_t *ttl,
-						struct in_addr *src_addr, size_t *ip_hdr_len,
-						struct in_addr *dst_addr, uint8_t *protocol)
+		struct in_addr *src_addr, size_t *ip_hdr_len, struct in_addr *dst_addr,
+		uint8_t *protocol)
 {
 	const struct ip_header *h;
 	size_t ihl_bytes;
diff --git a/src/recv/api/extract_id_seq.c b/src/recv/api/extract_id_seq.c
index efeab19..447f3de 100644
--- a/src/recv/api/extract_id_seq.c
+++ b/src/recv/api/extract_id_seq.c
@@ -1,4 +1,5 @@
 #include <netinet/in.h>
+
 #include "icmp.h"
 #include "icmp_types.h"
 #include "internal/icmp_packet.h"
diff --git a/src/recv/api/extract_offending.c b/src/recv/api/extract_offending.c
index 272a865..ae4cac1 100644
--- a/src/recv/api/extract_offending.c
+++ b/src/recv/api/extract_offending.c
@@ -1,9 +1,10 @@
+#include <netinet/in.h>
+#include <stdint.h>
+
 #include "icmp.h"
 #include "icmp_types.h"
 #include "internal/icmp_packet.h"
 #include "internal/icmp_packet_internal.h"
-#include <netinet/in.h>
-#include <stdint.h>
 
 #define MIN_ERROR_PAYLOAD_LEN 28
 #define MIN_ICMP_HEADER_LEN 8
@@ -13,17 +14,16 @@ static int is_error_type(uint8_t type);
 static int is_echo_type(uint8_t type);
 static int is_frag_needed(uint8_t type, uint8_t code);
 static int parse_embedded_ip(const icmp_reply_t *reply,
-							 icmp_offending_packet_t *offending,
-							 size_t *ip_hdr_len);
+		icmp_offending_packet_t *offending, size_t *ip_hdr_len);
 static const struct icmp_header *get_embedded_icmp(const icmp_reply_t *reply,
-												   size_t ip_hdr_len);
+		size_t ip_hdr_len);
 static void extract_icmp_fields(const struct icmp_header *hdr,
-								icmp_offending_packet_t *offending);
+		icmp_offending_packet_t *offending);
 /* -------------------- */
 
 int
-icmp_error_extract_offending(const icmp_reply_t *reply,
-							 icmp_offending_packet_t *offending)
+icmp_error_extract_offending(const icmp_reply_t *reply, icmp_offending_packet_t
+		*offending)
 {
 	size_t ip_hdr_len;
 	const struct icmp_header *hdr;
@@ -72,22 +72,24 @@ is_frag_needed(uint8_t type, uint8_t code)
 }
 
 static int
-parse_embedded_ip(const icmp_reply_t *reply, icmp_offending_packet_t *offending,
-				  size_t *ip_hdr_len)
+parse_embedded_ip(const icmp_reply_t *reply, icmp_offending_packet_t
+		*offending, size_t *ip_hdr_len)
 {
-	return icmp_parse_ip_header(reply->payload, reply->payload_len,
-								NULL, &offending->src, ip_hdr_len,
-								&offending->dst, &offending->protocol);
+	return icmp_parse_ip_header(reply->payload, reply->payload_len, NULL,
+			&offending->src, ip_hdr_len, &offending->dst,
+			&offending->protocol);
 }
 
 static const struct icmp_header *
 get_embedded_icmp(const icmp_reply_t *reply, size_t ip_hdr_len)
 {
-	return (const struct icmp_header *)((const uint8_t *)reply->payload + ip_hdr_len);
+	return (const struct icmp_header *)((const uint8_t *)reply->payload +
+			ip_hdr_len);
 }
 
 static void
-extract_icmp_fields(const struct icmp_header *hdr, icmp_offending_packet_t *offending)
+extract_icmp_fields(const struct icmp_header *hdr,
+		icmp_offending_packet_t *offending)
 {
 	offending->icmp_type = hdr->type;
 	offending->icmp_code = hdr->code;
diff --git a/src/recv/api/process.c b/src/recv/api/process.c
index 6eeda34..31bc637 100644
--- a/src/recv/api/process.c
+++ b/src/recv/api/process.c
@@ -1,7 +1,8 @@
+#include <stdint.h>
+
 #include "icmp.h"
 #include "internal/icmp_internal.h"
 #include "internal/icmp_recv.h"
-#include <stdint.h>
 
 /* Buffer for incoming packets: IP header + ICMP */
 #define RECV_BUFFER_SIZE 1500
diff --git a/src/recv/core/parse_packet.c b/src/recv/core/parse_packet.c
index 1ed665e..ddb01d1 100644
--- a/src/recv/core/parse_packet.c
+++ b/src/recv/core/parse_packet.c
@@ -2,18 +2,16 @@
 #include "internal/icmp_packet_internal.h"
 
 int
-recv_parse_packet(const void *buffer, size_t buffer_len,
-				uint8_t *type, uint8_t *code,
-				uint8_t *ttl, struct in_addr *src_addr,
-				const void **payload, size_t *payload_len,
-				size_t *ip_hdr_len)
+recv_parse_packet(const void *buffer, size_t buffer_len, uint8_t *type,
+		uint8_t *code, uint8_t *ttl, struct in_addr *src_addr,
+		const void **payload, size_t *payload_len, size_t *ip_hdr_len)
 {
-	if (icmp_parse_ip_header(buffer, buffer_len, ttl, src_addr,
-							ip_hdr_len, NULL, NULL) < 0)
+	if (icmp_parse_ip_header(buffer, buffer_len, ttl, src_addr, ip_hdr_len,
+				NULL, NULL) < 0)
 		return -1;
 
-	if (icmp_parse_icmp_payload(buffer, buffer_len, *ip_hdr_len,
-								type, code, payload, payload_len) < 0)
+	if (icmp_parse_icmp_payload(buffer, buffer_len, *ip_hdr_len, type, code,
+				payload, payload_len) < 0)
 		return -1;
 
 	return 0;
diff --git a/src/recv/core/process_single_packet.c b/src/recv/core/process_single_packet.c
index 034c8c4..ca757ab 100644
--- a/src/recv/core/process_single_packet.c
+++ b/src/recv/core/process_single_packet.c
@@ -1,9 +1,8 @@
 #include "internal/icmp_recv.h"
 
-// TODO: check ssize_t -> size_t cast
 void
 recv_process_single_packet(uint8_t *buffer, ssize_t len, icmp_callback_t cb,
-							void *userdata)
+		void *userdata)
 {
 	icmp_reply_t reply;
 	uint8_t type, code, ttl;
@@ -12,10 +11,10 @@ recv_process_single_packet(uint8_t *buffer, ssize_t len, icmp_callback_t cb,
 	size_t payload_len, ip_hdr_len;
 
 	if (recv_parse_packet(buffer, (size_t)(len), &type, &code, &ttl, &src_addr,
-						&payload, &payload_len, &ip_hdr_len) < 0)
+				&payload, &payload_len, &ip_hdr_len) < 0)
 		return;
 	recv_build_reply(&reply, type, code, ttl, src_addr, payload, payload_len,
-					buffer, ip_hdr_len);
+			buffer, ip_hdr_len);
 	reply.ip_payload_len = (size_t)(len) - ip_hdr_len;
 	cb(&reply, userdata);
 }
diff --git a/src/recv/core/receive_packet.c b/src/recv/core/receive_packet.c
index 159c6ac..1e6d96d 100644
--- a/src/recv/core/receive_packet.c
+++ b/src/recv/core/receive_packet.c
@@ -1,11 +1,12 @@
-#include "internal/icmp_recv.h"
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
 
+#include "internal/icmp_recv.h"
+
 ssize_t
 recv_receive_packet(int fd, void *buffer, size_t buffer_len,
-					struct sockaddr_in *from)
+		struct sockaddr_in *from)
 {
 	socklen_t from_len;
 	ssize_t n;
diff --git a/src/recv/helpers/build_reply.c b/src/recv/helpers/build_reply.c
index d241aec..9fc8fc7 100644
--- a/src/recv/helpers/build_reply.c
+++ b/src/recv/helpers/build_reply.c
@@ -1,12 +1,12 @@
-#include "internal/icmp_recv.h"
-#include "internal/icmp_utils.h"
 #include <string.h>
 
+#include "internal/icmp_recv.h"
+#include "internal/icmp_utils.h"
+
 void
-recv_build_reply(icmp_reply_t *reply, uint8_t type, uint8_t code,
-				uint8_t ttl, struct in_addr src_addr,
-				const void *payload, size_t payload_len,
-				const void *buffer, size_t ip_hdr_len)
+recv_build_reply(icmp_reply_t *reply, uint8_t type, uint8_t code, uint8_t ttl,
+		struct in_addr src_addr, const void *payload, size_t payload_len, const
+		void *buffer, size_t ip_hdr_len)
 {
 	memset(reply, 0, sizeof(icmp_reply_t));
 	reply->type = type;
diff --git a/src/recv/helpers/handle_receive_error.c b/src/recv/helpers/handle_receive_error.c
index e52cefb..4e37d90 100644
--- a/src/recv/helpers/handle_receive_error.c
+++ b/src/recv/helpers/handle_receive_error.c
@@ -1,8 +1,9 @@
-#include "internal/icmp_internal.h"
-#include "internal/icmp_recv.h"
 #include <errno.h>
 #include <string.h>
 
+#include "internal/icmp_internal.h"
+#include "internal/icmp_recv.h"
+
 int
 recv_handle_receive_error(struct icmp_handle *h)
 {
@@ -10,6 +11,6 @@ recv_handle_receive_error(struct icmp_handle *h)
 
 	saved_errno = errno;
 	icmp_set_error_fmt(h, ICMP_ERR_RECV, "recvfrom() failed: %s",
-					strerror(saved_errno));
+			strerror(saved_errno));
 	return -1;
 }
diff --git a/src/recv/helpers/validate_params.c b/src/recv/helpers/validate_params.c
index cedba51..e511553 100644
--- a/src/recv/helpers/validate_params.c
+++ b/src/recv/helpers/validate_params.c
@@ -1,6 +1,7 @@
+#include <stddef.h>
+
 #include "internal/icmp_internal.h"
 #include "internal/icmp_recv.h"
-#include <stddef.h>
 
 int
 recv_validate_params(struct icmp_handle *h, icmp_callback_t cb)
diff --git a/src/send/api/echo.c b/src/send/api/echo.c
index 172113e..e65231e 100644
--- a/src/send/api/echo.c
+++ b/src/send/api/echo.c
@@ -1,12 +1,12 @@
-#include "icmp.h"
-#include "icmp_types.h"
 #include <arpa/inet.h>
 #include <stdint.h>
 
+#include "icmp.h"
+#include "icmp_types.h"
+
 int
 icmp_send_echo(icmp_handle_t *h, struct in_addr dest, uint16_t id,
-				uint16_t seq, uint8_t ttl,
-				const void *payload, size_t payload_len)
+		uint16_t seq, uint8_t ttl, const void *payload, size_t payload_len)
 {
 	union {
 		struct { uint16_t id; uint16_t seq; } echo;
@@ -15,6 +15,6 @@ icmp_send_echo(icmp_handle_t *h, struct in_addr dest, uint16_t id,
 
 	hdr_rest.echo.id = htons(id);
 	hdr_rest.echo.seq = htons(seq);
-	return icmp_send_raw(h, ICMP_TYPE_ECHO_REQUEST, 0, hdr_rest.raw,
-						payload, payload_len, dest, ttl);
+	return icmp_send_raw(h, ICMP_TYPE_ECHO_REQUEST, 0, hdr_rest.raw, payload,
+			payload_len, dest, ttl);
 }
diff --git a/src/send/api/raw.c b/src/send/api/raw.c
index e46fa87..183b568 100644
--- a/src/send/api/raw.c
+++ b/src/send/api/raw.c
@@ -1,8 +1,9 @@
+#include <stddef.h>
+
 #include "icmp.h"
 #include "internal/icmp_internal.h"
 #include "internal/icmp_packet_internal.h"
 #include "internal/icmp_send.h"
-#include <stddef.h>
 
 /* MTU(1500) - IP header(20) - ICMP header(8) = 1472 */
 #define MAX_PAYLOAD_SIZE 1472
@@ -10,14 +11,13 @@
 
 /* Forward declarations */
 static int validate_payload(struct icmp_handle *h, const void *payload,
-							size_t len);
+		size_t len);
 /* -------------------- */
 
 int
 icmp_send_raw(icmp_handle_t *h, uint8_t type, uint8_t code,
-				uint32_t header_rest,
-				const void *payload, size_t len, struct in_addr dest,
-				uint8_t ttl)
+		uint32_t header_rest, const void *payload, size_t len,
+		struct in_addr dest, uint8_t ttl)
 {
 	uint8_t buffer[ICMP_HEADER_SIZE + MAX_PAYLOAD_SIZE];
 	int packet_len;
@@ -53,7 +53,7 @@ validate_payload(struct icmp_handle *h, const void *payload, size_t len)
 	if (len > MAX_PAYLOAD_SIZE)
 	{
 		icmp_set_error_fmt(h, ICMP_ERR_INVALID,
-					"Payload too large (max %d bytes)", MAX_PAYLOAD_SIZE);
+				"Payload too large (max %d bytes)", MAX_PAYLOAD_SIZE);
 		return 0;
 	}
 	return 1;
diff --git a/src/send/core/send_packet.c b/src/send/core/send_packet.c
index 4d9779a..1bd8ddb 100644
--- a/src/send/core/send_packet.c
+++ b/src/send/core/send_packet.c
@@ -1,21 +1,22 @@
-#include "internal/icmp_internal.h"
-#include "internal/icmp_send.h"
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <string.h>
 
+#include "internal/icmp_internal.h"
+#include "internal/icmp_send.h"
+
 /* Forward declarations */
 static int handle_send_error(struct icmp_handle *h);
 /* -------------------- */
 int
 send_packet(struct icmp_handle *h, const void *buffer, size_t len,
-			struct sockaddr_in *dest)
+		struct sockaddr_in *dest)
 {
 	ssize_t bytes_sent;
 
 	bytes_sent = sendto(h->fd, buffer, len, 0, (struct sockaddr *)dest,
-						sizeof(struct sockaddr_in));
+			sizeof(struct sockaddr_in));
 
 	if (bytes_sent < 0)
 		return handle_send_error(h);
@@ -23,7 +24,7 @@ send_packet(struct icmp_handle *h, const void *buffer, size_t len,
 	if ((size_t)bytes_sent != len)
 	{
 		icmp_set_error_fmt(h, ICMP_ERR_SEND, "Partial send (%zd/%zu bytes)",
-						bytes_sent, len);
+				bytes_sent, len);
 		return -1;
 	}
 
@@ -39,10 +40,10 @@ handle_send_error(struct icmp_handle *h)
 	if (EAGAIN == saved_errno || EWOULDBLOCK == saved_errno)
 	{
 		icmp_set_error_fmt(h, ICMP_ERR_EAGAIN,
-					"Send would block (buffer full, retry later)");
+				"Send would block (buffer full, retry later)");
 		return -1;
 	}
 	icmp_set_error_fmt(h, ICMP_ERR_SEND, "sendto() failed: %s",
-					strerror(saved_errno));
+			strerror(saved_errno));
 	return -1;
 }
diff --git a/src/send/core/send_to_destination.c b/src/send/core/send_to_destination.c
index bb1b288..89d098b 100644
--- a/src/send/core/send_to_destination.c
+++ b/src/send/core/send_to_destination.c
@@ -1,10 +1,11 @@
+#include <netinet/in.h>
+
 #include "internal/icmp_internal.h"
 #include "internal/icmp_send.h"
-#include <netinet/in.h>
 
 int
 send_to_destination(struct icmp_handle *h, const void *packet, size_t len,
-					struct in_addr dest, uint8_t ttl)
+		struct in_addr dest, uint8_t ttl)
 {
 	struct sockaddr_in addr;
 
diff --git a/src/send/helpers/prepare_destination.c b/src/send/helpers/prepare_destination.c
index 39546e7..76383d9 100644
--- a/src/send/helpers/prepare_destination.c
+++ b/src/send/helpers/prepare_destination.c
@@ -1,6 +1,7 @@
-#include "internal/icmp_send.h"
 #include <string.h>
 
+#include "internal/icmp_send.h"
+
 void
 send_prepare_destination(struct sockaddr_in *addr, struct in_addr dest)
 {
diff --git a/src/send/helpers/set_socket_ttl.c b/src/send/helpers/set_socket_ttl.c
index 427cd00..7c0a7d6 100644
--- a/src/send/helpers/set_socket_ttl.c
+++ b/src/send/helpers/set_socket_ttl.c
@@ -1,9 +1,10 @@
-#include "internal/icmp_send.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <errno.h>
 #include <string.h>
 
+#include "internal/icmp_send.h"
+
 int
 send_set_socket_ttl(struct icmp_handle *h, uint8_t ttl)
 {
@@ -14,7 +15,7 @@ send_set_socket_ttl(struct icmp_handle *h, uint8_t ttl)
 	{
 		saved_errno = errno;
 		icmp_set_error_fmt(h, ICMP_ERR_SOCKET, "Failed to set TTL: %s",
-						strerror(saved_errno));
+				strerror(saved_errno));
 		return -1;
 	}
 
diff --git a/src/send/helpers/validate_handle.c b/src/send/helpers/validate_handle.c
index 4b7defc..e7af8cf 100644
--- a/src/send/helpers/validate_handle.c
+++ b/src/send/helpers/validate_handle.c
@@ -1,6 +1,7 @@
+#include <stddef.h>
+
 #include "internal/icmp_internal.h"
 #include "internal/icmp_send.h"
-#include <stddef.h>
 
 int
 send_validate_handle(struct icmp_handle *h)
diff --git a/src/socket/configure.c b/src/socket/configure.c
index 5a5b1fa..dbe9b9b 100644
--- a/src/socket/configure.c
+++ b/src/socket/configure.c
@@ -1,9 +1,10 @@
-#include "internal/icmp_internal.h"
-#include "internal/icmp_socket.h"
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
 
+#include "internal/icmp_internal.h"
+#include "internal/icmp_socket.h"
+
 /* Forward declarations */
 static void handle_configure_error(struct icmp_handle *h, const char *func);
 /* -------------------- */
diff --git a/src/socket/create.c b/src/socket/create.c
index 8d8a415..9591906 100644
--- a/src/socket/create.c
+++ b/src/socket/create.c
@@ -1,10 +1,11 @@
-#include "internal/icmp_internal.h"
-#include "internal/icmp_socket.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <errno.h>
 #include <string.h>
 
+#include "internal/icmp_internal.h"
+#include "internal/icmp_socket.h"
+
 /* Forward declarations */
 static void handle_socket_error(struct icmp_handle *h, int err);
 /* -------------------- */
diff --git a/src/utils/time.c b/src/utils/time.c
index 006d770..68909ff 100644
--- a/src/utils/time.c
+++ b/src/utils/time.c
@@ -1,6 +1,7 @@
-#include "internal/icmp_utils.h"
 #include <stdint.h>
 
+#include "internal/icmp_utils.h"
+
 int
 icmp_get_time(struct timespec *ts)
 {
@@ -13,5 +14,5 @@ int64_t
 icmp_time_diff_ns(const struct timespec *start,  const struct timespec *end)
 {
 	return (end->tv_sec - start->tv_sec) * 1000000000LL +
-			(end->tv_nsec - start->tv_nsec);
+		(end->tv_nsec - start->tv_nsec);
 }