diff --git a/include/udp_socket_wp.h b/include/udp_socket_wp.h
index 1e5b7b62f198ce05345eae6bbbb2f9e6e719cbbe..7a5a102ce2786577fbdcd4a0c361332ccd8a6151 100644
--- a/include/udp_socket_wp.h
+++ b/include/udp_socket_wp.h
@@ -55,7 +55,7 @@ public:
 	 * @see bind()
 	 * @throws socket_error if bind fails
 	 */
-	void bind_wp(const struct sockaddr *__addr, size_t __len);
+	void bind_wp(const sockaddr *__addr, size_t __len);
 
 	/**
 	 * More OO wrapper for bind() function.
@@ -70,14 +70,14 @@ public:
 	 * @throw const char* exception if there is an error while receiving the packet.
 	 * It contains the cause of the error.
 	 */
-	udp_packet_wp recvfrom_wp(struct sockaddr *sender_address, socklen_t *sender_address_len);
+	udp_packet_wp recvfrom_wp(sockaddr *sender_address, socklen_t *sender_address_len);
 
 	/**
 	 * Bare wrapper for sendto() function.
 	 * @see sendto()
 	 */
 	void sendto_wp(const void *__buf, size_t __n,
-		       int __flags, const struct sockaddr *__addr,
+		       int __flags, const sockaddr *__addr,
 		       socklen_t __addr_len);
 
 	/**
@@ -93,7 +93,7 @@ public:
 	 * @param msg The dns message to send to.
 	 * @see sendto()
 	 */
-	void sendto_wp(const dns_message_em &msg, int __flags, const struct sockaddr *__addr,
+	void sendto_wp(const dns_message_em &msg, int __flags, const sockaddr *__addr,
 		       socklen_t __addr_len);
 
 	/**
diff --git a/main.cpp b/main.cpp
index 0431d4e54525a70d0354743b8115c6403e579398..c1a77b90b380af020356eb9c7ea26654cf651773 100644
--- a/main.cpp
+++ b/main.cpp
@@ -158,8 +158,8 @@ int main(int argc, char *argv[])
 	}
 
 	// Init server
-	struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT; //IN6ADDR_LOOPBACK_INIT;
-	struct sockaddr_in6 server_address;
+	in6_addr in6_addr_any = IN6ADDR_ANY_INIT; //IN6ADDR_LOOPBACK_INIT;
+	sockaddr_in6 server_address;
 	memset(&server_address, 0, sizeof(server_address));
 	server_address.sin6_family = AF_INET6;
 	server_address.sin6_addr = in6_addr_any;
diff --git a/src/dns_server.cpp b/src/dns_server.cpp
index 1df28681c590df7006c05dd9c9310a1aa634d54e..f6eb6956112e79e27e648842488e7f3440f5a203 100644
--- a/src/dns_server.cpp
+++ b/src/dns_server.cpp
@@ -74,7 +74,7 @@ void dns_server::shutdown() {
 }
 
 void dns_server::serve_one_request() {
-	struct sockaddr_in6 sender;
+	sockaddr_in6 sender;
 	socklen_t slen = sizeof(sender);
 	dns_message_em query;
 	udp_packet_wp received_packet;
diff --git a/src/udp_socket_wp.cpp b/src/udp_socket_wp.cpp
index 30c184a425d559dbc5fe6fc008ba4fab94616f55..ab8784e8d29ef021a62c0ccf64820d502fea8777 100644
--- a/src/udp_socket_wp.cpp
+++ b/src/udp_socket_wp.cpp
@@ -31,7 +31,7 @@ void udp_socket_wp::setsockopt_wp(int __level, int __optname, const void* __optv
 	}
 }
 
-void udp_socket_wp::bind_wp(const struct sockaddr* __addr, size_t __len) {
+void udp_socket_wp::bind_wp(const sockaddr* __addr, size_t __len) {
 	if (bind(fd, __addr, __len) < 0) {
 		throw socket_error(strerror(errno));
 	}
@@ -54,7 +54,7 @@ udp_packet_wp udp_socket_wp::recvfrom_wp(sockaddr *sender_address, socklen_t* se
 }
 
 void udp_socket_wp::sendto_wp(const void *__buf, size_t __n,
-							int __flags, const struct sockaddr *__addr,
+							int __flags, const sockaddr *__addr,
 							socklen_t __addr_len) {
 	sendto(fd, __buf, __n, __flags, __addr, __addr_len);
 }
@@ -63,7 +63,7 @@ void udp_socket_wp::sendto_wp(const void* __buf, size_t __n, int __flags, const
 	this->sendto_wp(__buf, __n, __flags, wrapped_sockaddr.get_sockaddr(), wrapped_sockaddr.get_addr_len());
 }
 
-void udp_socket_wp::sendto_wp(const dns_message_em &msg, int __flags, const struct sockaddr *__addr, socklen_t __addr_len) {
+void udp_socket_wp::sendto_wp(const dns_message_em &msg, int __flags, const sockaddr *__addr, socklen_t __addr_len) {
 	udp_packet_wp pckt;
 	pckt.address.set_sockaddr(__addr, __addr_len);
 	pckt<<msg;