diff --git a/mongoose.c b/mongoose.c
index 8c7b0288fdefab093565d9ab5530217ed718707a..3de8b98d1c1357ca0a5dd8a72ac7fac59bb06bd6 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2167,10 +2167,10 @@ size_t mg_match_prefix(const char *pattern, int pattern_len, const char *str) {
  */
 
 /* Amalgamated: #include "common/cs_time.h" */
-/* Amalgamated: #include "mongoose/src/mg_dns.h" */
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_resolv.h" */
-/* Amalgamated: #include "mongoose/src/mg_util.h" */
+/* Amalgamated: #include "mg_dns.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_resolv.h" */
+/* Amalgamated: #include "mg_util.h" */
 
 #define MG_MAX_HOST_LEN 200
 
@@ -3167,7 +3167,7 @@ double mg_time(void) {
 #ifndef CS_MONGOOSE_SRC_NET_IF_SOCKET_H_
 #define CS_MONGOOSE_SRC_NET_IF_SOCKET_H_
 
-/* Amalgamated: #include "mongoose/src/mg_net_if.h" */
+/* Amalgamated: #include "mg_net_if.h" */
 
 #ifdef __cplusplus
 extern "C" {
@@ -3196,7 +3196,7 @@ extern const struct mg_iface_vtable mg_socket_iface_vtable;
 #define CS_MONGOOSE_SRC_NET_IF_SOCKS_H_
 
 #if MG_ENABLE_SOCKS
-/* Amalgamated: #include "mongoose/src/mg_net_if.h" */
+/* Amalgamated: #include "mg_net_if.h" */
 
 #ifdef __cplusplus
 extern "C" {
@@ -3212,9 +3212,9 @@ extern const struct mg_iface_vtable mg_socks_iface_vtable;
 #ifdef MG_MODULE_LINES
 #line 1 "mongoose/src/mg_net_if.c"
 #endif
-/* Amalgamated: #include "mongoose/src/mg_net_if.h" */
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_net_if_socket.h" */
+/* Amalgamated: #include "mg_net_if.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_net_if_socket.h" */
 
 extern const struct mg_iface_vtable mg_default_iface_vtable;
 
@@ -3263,9 +3263,9 @@ struct mg_iface *mg_find_iface(struct mg_mgr *mgr,
 
 #if MG_ENABLE_NET_IF_SOCKET
 
-/* Amalgamated: #include "mongoose/src/mg_net_if_socket.h" */
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_util.h" */
+/* Amalgamated: #include "mg_net_if_socket.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_util.h" */
 
 #define MG_TCP_RECV_BUFFER_SIZE 1024
 #define MG_UDP_RECV_BUFFER_SIZE 1500
@@ -5103,8 +5103,8 @@ int mg_ssl_if_mbed_random(void *ctx, unsigned char *buf, size_t len) {
  * All rights reserved
  */
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_uri.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_uri.h" */
 
 /*
  * scan string until encountering one of `seps`, keeping track of component
@@ -5370,8 +5370,8 @@ out:
 #if MG_ENABLE_HTTP
 
 /* Amalgamated: #include "common/cs_md5.h" */
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_util.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_util.h" */
 
 static const char *mg_version_header = "Mongoose/" MG_VERSION;
 
@@ -9787,8 +9787,8 @@ struct mg_connection *mg_connect_ws(
  */
 
 /* Amalgamated: #include "common/cs_base64.h" */
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_util.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_util.h" */
 
 /* For platforms with limited libc */
 #ifndef MAX
@@ -10129,8 +10129,8 @@ struct mg_str mg_url_encode(const struct mg_str src) {
 
 #include <string.h>
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_mqtt.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_mqtt.h" */
 
 static uint16_t getu16(const char *p) {
   const uint8_t *up = (const uint8_t *) p;
@@ -10594,8 +10594,8 @@ void mg_mqtt_disconnect(struct mg_connection *nc) {
  * All rights reserved
  */
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_mqtt_server.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_mqtt_server.h" */
 
 #if MG_ENABLE_MQTT_BROKER
 
@@ -10793,8 +10793,8 @@ struct mg_mqtt_session *mg_mqtt_next(struct mg_mqtt_broker *brk,
 
 #if MG_ENABLE_DNS
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_dns.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_dns.h" */
 
 static int mg_dns_tid = 0xa0;
 
@@ -11173,8 +11173,8 @@ void mg_set_protocol_dns(struct mg_connection *nc) {
 
 #if MG_ENABLE_DNS_SERVER
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/dns-server.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "dns-server.h" */
 
 struct mg_dns_reply mg_dns_create_reply(struct mbuf *io,
                                         struct mg_dns_message *msg) {
@@ -11247,8 +11247,8 @@ int mg_dns_reply_record(struct mg_dns_reply *reply,
 
 #if MG_ENABLE_ASYNC_RESOLVER
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_resolv.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_resolv.h" */
 
 #ifndef MG_DEFAULT_NAMESERVER
 #define MG_DEFAULT_NAMESERVER "8.8.8.8"
@@ -11552,8 +11552,8 @@ void mg_set_nameserver(struct mg_mgr *mgr, const char *nameserver) {
  * license, as set out in <https://www.cesanta.com/license>.
  */
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_coap.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_coap.h" */
 
 #if MG_ENABLE_COAP
 
@@ -12140,9 +12140,9 @@ int mg_set_protocol_coap(struct mg_connection *nc) {
  * All rights reserved
  */
 
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
-/* Amalgamated: #include "mongoose/src/mg_sntp.h" */
-/* Amalgamated: #include "mongoose/src/mg_util.h" */
+/* Amalgamated: #include "mg_internal.h" */
+/* Amalgamated: #include "mg_sntp.h" */
+/* Amalgamated: #include "mg_util.h" */
 
 #if MG_ENABLE_SNTP
 
@@ -12433,8 +12433,8 @@ struct mg_connection *mg_sntp_get_time(struct mg_mgr *mgr,
 
 #if MG_ENABLE_SOCKS
 
-/* Amalgamated: #include "mongoose/src/mg_socks.h" */
-/* Amalgamated: #include "mongoose/src/mg_internal.h" */
+/* Amalgamated: #include "mg_socks.h" */
+/* Amalgamated: #include "mg_internal.h" */
 
 /*
  *  https://www.ietf.org/rfc/rfc1928.txt paragraph 3, handle client handshake
diff --git a/mongoose.h b/mongoose.h
index 48c9db50147ce61e52e19ca8e7939f5ba4781625..15d54fe637e21e20c3eb01c9c7b749da1f6b2fb2 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -3402,8 +3402,8 @@ int mg_ssl_if_write(struct mg_connection *nc, const void *data, size_t len);
 #ifndef CS_MONGOOSE_SRC_NET_H_
 #define CS_MONGOOSE_SRC_NET_H_
 
-/* Amalgamated: #include "mongoose/src/mg_common.h" */
-/* Amalgamated: #include "mongoose/src/mg_net_if.h" */
+/* Amalgamated: #include "mg_common.h" */
+/* Amalgamated: #include "mg_net_if.h" */
 /* Amalgamated: #include "common/mbuf.h" */
 
 #ifndef MG_VPRINTF_BUFFER_SIZE
@@ -3978,7 +3978,7 @@ double mg_time(void);
 #ifndef CS_MONGOOSE_SRC_URI_H_
 #define CS_MONGOOSE_SRC_URI_H_
 
-/* Amalgamated: #include "mongoose/src/mg_net.h" */
+/* Amalgamated: #include "mg_net.h" */
 
 #ifdef __cplusplus
 extern "C" {
@@ -4050,8 +4050,8 @@ int mg_normalize_uri_path(const struct mg_str *in, struct mg_str *out);
 
 #include <stdio.h>
 
-/* Amalgamated: #include "mongoose/src/mg_common.h" */
-/* Amalgamated: #include "mongoose/src/mg_net_if.h" */
+/* Amalgamated: #include "mg_common.h" */
+/* Amalgamated: #include "mg_net_if.h" */
 
 #ifdef __cplusplus
 extern "C" {
@@ -4261,7 +4261,7 @@ struct mg_str mg_url_encode(const struct mg_str src);
 
 #if MG_ENABLE_HTTP
 
-/* Amalgamated: #include "mongoose/src/mg_net.h" */
+/* Amalgamated: #include "mg_net.h" */
 /* Amalgamated: #include "common/mg_str.h" */
 
 #ifdef __cplusplus
@@ -5246,7 +5246,7 @@ int mg_http_create_digest_auth_header(char *buf, size_t buf_len,
 #ifndef CS_MONGOOSE_SRC_MQTT_H_
 #define CS_MONGOOSE_SRC_MQTT_H_
 
-/* Amalgamated: #include "mongoose/src/mg_net.h" */
+/* Amalgamated: #include "mg_net.h" */
 
 struct mg_mqtt_message {
   int cmd;
@@ -5480,7 +5480,7 @@ int mg_mqtt_vmatch_topic_expression(const char *exp, struct mg_str topic);
 #if MG_ENABLE_MQTT_BROKER
 
 /* Amalgamated: #include "common/queue.h" */
-/* Amalgamated: #include "mongoose/src/mg_mqtt.h" */
+/* Amalgamated: #include "mg_mqtt.h" */
 
 #ifdef __cplusplus
 extern "C" {
@@ -5572,7 +5572,7 @@ struct mg_mqtt_session *mg_mqtt_next(struct mg_mqtt_broker *brk,
 #ifndef CS_MONGOOSE_SRC_DNS_H_
 #define CS_MONGOOSE_SRC_DNS_H_
 
-/* Amalgamated: #include "mongoose/src/mg_net.h" */
+/* Amalgamated: #include "mg_net.h" */
 
 #ifdef __cplusplus
 extern "C" {
@@ -5743,7 +5743,7 @@ void mg_set_protocol_dns(struct mg_connection *nc);
 
 #if MG_ENABLE_DNS_SERVER
 
-/* Amalgamated: #include "mongoose/src/mg_dns.h" */
+/* Amalgamated: #include "mg_dns.h" */
 
 #ifdef __cplusplus
 extern "C" {
@@ -5836,7 +5836,7 @@ void mg_dns_send_reply(struct mg_connection *nc, struct mg_dns_reply *r);
 #ifndef CS_MONGOOSE_SRC_RESOLV_H_
 #define CS_MONGOOSE_SRC_RESOLV_H_
 
-/* Amalgamated: #include "mongoose/src/mg_dns.h" */
+/* Amalgamated: #include "mg_dns.h" */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_coap.c b/src/mg_coap.c
index 15f97ecb1c089a8fb9af419fac14e03cad779e1b..29667b7c5f7c03e1ee8837d11d1106c3fb0dbdca 100644
--- a/src/mg_coap.c
+++ b/src/mg_coap.c
@@ -15,8 +15,8 @@
  * license, as set out in <https://www.cesanta.com/license>.
  */
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_coap.h"
+#include "mg_internal.h"
+#include "mg_coap.h"
 
 #if MG_ENABLE_COAP
 
diff --git a/src/mg_dns.c b/src/mg_dns.c
index 13bd1bdffd53a3152892c49d522b6f6d9add418a..21bc8c23201d53fc7909f58f3f215c58f9a38afc 100644
--- a/src/mg_dns.c
+++ b/src/mg_dns.c
@@ -5,8 +5,8 @@
 
 #if MG_ENABLE_DNS
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_dns.h"
+#include "mg_internal.h"
+#include "mg_dns.h"
 
 static int mg_dns_tid = 0xa0;
 
diff --git a/src/mg_dns.h b/src/mg_dns.h
index 5536b671ef9502eeaea07d99c76ca047123a2416..8a76f58c05387dac077c319fd0211a62bc022eea 100644
--- a/src/mg_dns.h
+++ b/src/mg_dns.h
@@ -10,7 +10,7 @@
 #ifndef CS_MONGOOSE_SRC_DNS_H_
 #define CS_MONGOOSE_SRC_DNS_H_
 
-#include "mongoose/src/mg_net.h"
+#include "mg_net.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_dns_server.c b/src/mg_dns_server.c
index 56568dfb38f35bf4bf2f366e4a8bdb0adffee3eb..2dafb46d5232e7b7567d1f4f647dfccc6043420b 100644
--- a/src/mg_dns_server.c
+++ b/src/mg_dns_server.c
@@ -5,8 +5,8 @@
 
 #if MG_ENABLE_DNS_SERVER
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/dns-server.h"
+#include "mg_internal.h"
+#include "dns-server.h"
 
 struct mg_dns_reply mg_dns_create_reply(struct mbuf *io,
                                         struct mg_dns_message *msg) {
diff --git a/src/mg_dns_server.h b/src/mg_dns_server.h
index 33bcbdec15e60790eccf9f91b9873ce686b4c648..168a17433891f1e4f7fdc5e2295dc3f6f5edf2a5 100644
--- a/src/mg_dns_server.h
+++ b/src/mg_dns_server.h
@@ -14,7 +14,7 @@
 
 #if MG_ENABLE_DNS_SERVER
 
-#include "mongoose/src/mg_dns.h"
+#include "mg_dns.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_http.c b/src/mg_http.c
index b08e43f9c7d37d352ae6e94c93d8646eb8270887..547b5d13eb2eb4fa44e2ecf151dbc79992bc6936 100644
--- a/src/mg_http.c
+++ b/src/mg_http.c
@@ -6,8 +6,8 @@
 #if MG_ENABLE_HTTP
 
 #include "common/cs_md5.h"
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_util.h"
+#include "mg_internal.h"
+#include "mg_util.h"
 
 static const char *mg_version_header = "Mongoose/" MG_VERSION;
 
diff --git a/src/mg_http.h b/src/mg_http.h
index 30a14564da9a7a4990692bbe89cf514f617583e2..c89d38f3245eceb5ee47745ec87fe7374fb15033 100644
--- a/src/mg_http.h
+++ b/src/mg_http.h
@@ -12,7 +12,7 @@
 
 #if MG_ENABLE_HTTP
 
-#include "mongoose/src/mg_net.h"
+#include "mg_net.h"
 #include "common/mg_str.h"
 
 #ifdef __cplusplus
diff --git a/src/mg_mqtt.c b/src/mg_mqtt.c
index 399f4a5c78582f795ff088e9ff5d743c1317e8ad..369b4561938339881b99f94f4ec8c75f38338ae3 100644
--- a/src/mg_mqtt.c
+++ b/src/mg_mqtt.c
@@ -7,8 +7,8 @@
 
 #include <string.h>
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_mqtt.h"
+#include "mg_internal.h"
+#include "mg_mqtt.h"
 
 static uint16_t getu16(const char *p) {
   const uint8_t *up = (const uint8_t *) p;
diff --git a/src/mg_mqtt.h b/src/mg_mqtt.h
index 2328e4a99ee5ac3f5a9af8e3f59fb9abae94678f..6067ccc42118e5a41087ca2caeea173763cd84ac 100644
--- a/src/mg_mqtt.h
+++ b/src/mg_mqtt.h
@@ -22,7 +22,7 @@
 #ifndef CS_MONGOOSE_SRC_MQTT_H_
 #define CS_MONGOOSE_SRC_MQTT_H_
 
-#include "mongoose/src/mg_net.h"
+#include "mg_net.h"
 
 struct mg_mqtt_message {
   int cmd;
diff --git a/src/mg_mqtt_server.c b/src/mg_mqtt_server.c
index 4083f282295f46a772f8d35bdff4d44d1f63d2c5..cb5664801122f06cef1793846b2bfb002878f016 100644
--- a/src/mg_mqtt_server.c
+++ b/src/mg_mqtt_server.c
@@ -3,8 +3,8 @@
  * All rights reserved
  */
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_mqtt_server.h"
+#include "mg_internal.h"
+#include "mg_mqtt_server.h"
 
 #if MG_ENABLE_MQTT_BROKER
 
diff --git a/src/mg_mqtt_server.h b/src/mg_mqtt_server.h
index ebbcfef7eab1f12c32c27d8160bb9ca608cc4a0d..8c34b5e64fa2e7d53046a9f074d838819a392b36 100644
--- a/src/mg_mqtt_server.h
+++ b/src/mg_mqtt_server.h
@@ -25,7 +25,7 @@
 #if MG_ENABLE_MQTT_BROKER
 
 #include "common/queue.h"
-#include "mongoose/src/mg_mqtt.h"
+#include "mg_mqtt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_net.c b/src/mg_net.c
index a597860733e72dcbfbbe91e6b0538e36c7828fc9..70e2cc84e2472d851f8f741ecc7c957e48a1a452 100644
--- a/src/mg_net.c
+++ b/src/mg_net.c
@@ -17,10 +17,10 @@
  */
 
 #include "common/cs_time.h"
-#include "mongoose/src/mg_dns.h"
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_resolv.h"
-#include "mongoose/src/mg_util.h"
+#include "mg_dns.h"
+#include "mg_internal.h"
+#include "mg_resolv.h"
+#include "mg_util.h"
 
 #define MG_MAX_HOST_LEN 200
 
diff --git a/src/mg_net.h b/src/mg_net.h
index 8b5b02e7678f80e1bc42e71eef736df7fac1d5fb..90b42b47af6dc936c4fb4e282c609e8a858edc4b 100644
--- a/src/mg_net.h
+++ b/src/mg_net.h
@@ -28,8 +28,8 @@
 #ifndef CS_MONGOOSE_SRC_NET_H_
 #define CS_MONGOOSE_SRC_NET_H_
 
-#include "mongoose/src/mg_common.h"
-#include "mongoose/src/mg_net_if.h"
+#include "mg_common.h"
+#include "mg_net_if.h"
 #include "common/mbuf.h"
 
 #ifndef MG_VPRINTF_BUFFER_SIZE
diff --git a/src/mg_net_if.c b/src/mg_net_if.c
index 6a7864b2cf7ae57f0b6cddfc5077cb25c6fa99d2..2a93dcfd4a8440d235b8cf39d911bc213cf0e4a5 100644
--- a/src/mg_net_if.c
+++ b/src/mg_net_if.c
@@ -1,6 +1,6 @@
-#include "mongoose/src/mg_net_if.h"
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_net_if_socket.h"
+#include "mg_net_if.h"
+#include "mg_internal.h"
+#include "mg_net_if_socket.h"
 
 extern const struct mg_iface_vtable mg_default_iface_vtable;
 
diff --git a/src/mg_net_if_socket.c b/src/mg_net_if_socket.c
index 014761ea5b3bc9d8e2d5d2f5e14709f6f34f5609..0d15764c5859a16971c1c02e106754a8d31de125 100644
--- a/src/mg_net_if_socket.c
+++ b/src/mg_net_if_socket.c
@@ -5,9 +5,9 @@
 
 #if MG_ENABLE_NET_IF_SOCKET
 
-#include "mongoose/src/mg_net_if_socket.h"
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_util.h"
+#include "mg_net_if_socket.h"
+#include "mg_internal.h"
+#include "mg_util.h"
 
 #define MG_TCP_RECV_BUFFER_SIZE 1024
 #define MG_UDP_RECV_BUFFER_SIZE 1500
diff --git a/src/mg_net_if_socket.h b/src/mg_net_if_socket.h
index 9ce65baf7d603939980817d2626ca05d82f6300e..744fc0f4fe6c6e943c33850efbea94da7d95bda0 100644
--- a/src/mg_net_if_socket.h
+++ b/src/mg_net_if_socket.h
@@ -6,7 +6,7 @@
 #ifndef CS_MONGOOSE_SRC_NET_IF_SOCKET_H_
 #define CS_MONGOOSE_SRC_NET_IF_SOCKET_H_
 
-#include "mongoose/src/mg_net_if.h"
+#include "mg_net_if.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_net_if_socks.h b/src/mg_net_if_socks.h
index 0257a95fed137d58e7f2c8cb37e0fef3d674aa8f..80e3107c743d53c5bfc14091301fb1205c35f71d 100644
--- a/src/mg_net_if_socks.h
+++ b/src/mg_net_if_socks.h
@@ -7,7 +7,7 @@
 #define CS_MONGOOSE_SRC_NET_IF_SOCKS_H_
 
 #if MG_ENABLE_SOCKS
-#include "mongoose/src/mg_net_if.h"
+#include "mg_net_if.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_resolv.c b/src/mg_resolv.c
index a4c771fd30c313998dcda10ec260fb2b180b4c96..e445ac50e45529949b8b96cc3bd0c2a22bfc05d6 100644
--- a/src/mg_resolv.c
+++ b/src/mg_resolv.c
@@ -5,8 +5,8 @@
 
 #if MG_ENABLE_ASYNC_RESOLVER
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_resolv.h"
+#include "mg_internal.h"
+#include "mg_resolv.h"
 
 #ifndef MG_DEFAULT_NAMESERVER
 #define MG_DEFAULT_NAMESERVER "8.8.8.8"
diff --git a/src/mg_resolv.h b/src/mg_resolv.h
index 51e4f2be7f4e7dc9f23d8bb98936d01ce78f2df7..a604c1790e93777e60f7e6b55b3c70240eff9329 100644
--- a/src/mg_resolv.h
+++ b/src/mg_resolv.h
@@ -10,7 +10,7 @@
 #ifndef CS_MONGOOSE_SRC_RESOLV_H_
 #define CS_MONGOOSE_SRC_RESOLV_H_
 
-#include "mongoose/src/mg_dns.h"
+#include "mg_dns.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_sntp.c b/src/mg_sntp.c
index 0d74cff037f9851d3333b01111144f994a2f7a3c..5d40e1afe1a3aab2dadd88ecca76ddc6a7a7a1b2 100644
--- a/src/mg_sntp.c
+++ b/src/mg_sntp.c
@@ -3,9 +3,9 @@
  * All rights reserved
  */
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_sntp.h"
-#include "mongoose/src/mg_util.h"
+#include "mg_internal.h"
+#include "mg_sntp.h"
+#include "mg_util.h"
 
 #if MG_ENABLE_SNTP
 
diff --git a/src/mg_socks.c b/src/mg_socks.c
index 3fb18491e95da2bb2a532e648490bb6053e9b459..56b2d5c0edfabbeff19c807bcb8254712834e337 100644
--- a/src/mg_socks.c
+++ b/src/mg_socks.c
@@ -5,8 +5,8 @@
 
 #if MG_ENABLE_SOCKS
 
-#include "mongoose/src/mg_socks.h"
-#include "mongoose/src/mg_internal.h"
+#include "mg_socks.h"
+#include "mg_internal.h"
 
 /*
  *  https://www.ietf.org/rfc/rfc1928.txt paragraph 3, handle client handshake
diff --git a/src/mg_uri.c b/src/mg_uri.c
index 34c0626569369779efbdc13984dd81f37fc4934d..9b6228b893a9df27c87f354af9d66a667e8ce8bb 100644
--- a/src/mg_uri.c
+++ b/src/mg_uri.c
@@ -3,8 +3,8 @@
  * All rights reserved
  */
 
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_uri.h"
+#include "mg_internal.h"
+#include "mg_uri.h"
 
 /*
  * scan string until encountering one of `seps`, keeping track of component
diff --git a/src/mg_uri.h b/src/mg_uri.h
index 476ef6cd34fa52a3fbcce2d17ec62db529eda525..f79e547ca3cc7d639d6345fbe6d7268518542c83 100644
--- a/src/mg_uri.h
+++ b/src/mg_uri.h
@@ -10,7 +10,7 @@
 #ifndef CS_MONGOOSE_SRC_URI_H_
 #define CS_MONGOOSE_SRC_URI_H_
 
-#include "mongoose/src/mg_net.h"
+#include "mg_net.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mg_util.c b/src/mg_util.c
index a58148603839f62a473440e0cda976be1fc133ec..485ba276ea7542cf86791d38e1b1042ac9f226d0 100644
--- a/src/mg_util.c
+++ b/src/mg_util.c
@@ -4,8 +4,8 @@
  */
 
 #include "common/cs_base64.h"
-#include "mongoose/src/mg_internal.h"
-#include "mongoose/src/mg_util.h"
+#include "mg_internal.h"
+#include "mg_util.h"
 
 /* For platforms with limited libc */
 #ifndef MAX
diff --git a/src/mg_util.h b/src/mg_util.h
index 742f98e2bd9126d63f5d6e112e154f79ea3a93ca..e6f2e48130c43cbe9f15111f4277c9477a1582c8 100644
--- a/src/mg_util.h
+++ b/src/mg_util.h
@@ -12,8 +12,8 @@
 
 #include <stdio.h>
 
-#include "mongoose/src/mg_common.h"
-#include "mongoose/src/mg_net_if.h"
+#include "mg_common.h"
+#include "mg_net_if.h"
 
 #ifdef __cplusplus
 extern "C" {