diff --git a/doc/wsock_trace.Doxyfile b/doc/wsock_trace.Doxyfile
index 759a7729..b8d54378 100644
--- a/doc/wsock_trace.Doxyfile
+++ b/doc/wsock_trace.Doxyfile
@@ -777,7 +777,7 @@ INPUT = main_page.dox            \
        ../src/idna.c             \
        ../src/inet_util.c        \
        ../src/init.c             \
-       ../src/in_addr.c          \
+       ../src/inet_addr.c        \
        ../src/ip2loc.c           \
        ../src/miniz.c            \
        ../src/non-export.c       \
@@ -801,7 +801,7 @@ INPUT = main_page.dox            \
        ../src/idna.h             \
        ../src/inet_util.h        \
        ../src/init.h             \
-       ../src/in_addr.h          \
+       ../src/inet_addr.h        \
        ../src/overlap.h          \
        ../src/services.h         \
        ../src/smartlist.h        \
diff --git a/doc/wsock_trace.chm b/doc/wsock_trace.chm
index 529dcedb..5bef9c6d 100644
Binary files a/doc/wsock_trace.chm and b/doc/wsock_trace.chm differ
diff --git a/src/Geo-IP/IPFire/src/fake-OpenSSL/openssl/applink.c b/src/Geo-IP/IPFire/src/fake-OpenSSL/openssl/applink.c
index 8b15e5d0..334b249e 100644
--- a/src/Geo-IP/IPFire/src/fake-OpenSSL/openssl/applink.c
+++ b/src/Geo-IP/IPFire/src/fake-OpenSSL/openssl/applink.c
@@ -23,7 +23,7 @@
 #endif
 
 #include "common.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 
 #undef  LIBLOC_PRIVATE
 #define LIBLOC_PRIVATE
diff --git a/src/Makefile.CygWin b/src/Makefile.CygWin
index aa2d930d..8416d122 100644
--- a/src/Makefile.CygWin
+++ b/src/Makefile.CygWin
@@ -80,7 +80,7 @@ SOURCES = asn.c             \
           hosts.c           \
           iana.c            \
           idna.c            \
-          in_addr.c         \
+          inet_addr.c       \
           inet_util.c       \
           init.c            \
           ip2loc.c          \
@@ -109,7 +109,7 @@ WS_TOOL_OBJ = $(addprefix $(OBJ_DIR)/, \
                 hosts.o                \
                 iana.o                 \
                 idna.o                 \
-                in_addr.o              \
+                inet_addr.o            \
                 init.o                 \
                 inet_util.o            \
                 ip2loc.o               \
diff --git a/src/Makefile.MingW b/src/Makefile.MingW
index 0c2cec1a..88f840c1 100644
--- a/src/Makefile.MingW
+++ b/src/Makefile.MingW
@@ -108,7 +108,7 @@ SOURCES = asn.c             \
           hosts.c           \
           iana.c            \
           idna.c            \
-          in_addr.c         \
+          inet_addr.c       \
           inet_util.c       \
           init.c            \
           ip2loc.c          \
@@ -137,7 +137,7 @@ WS_TOOL_OBJ = $(addprefix $(OBJ_DIR)/, \
                 hosts.o                \
                 iana.o                 \
                 idna.o                 \
-                in_addr.o              \
+                inet_addr.o            \
                 init.o                 \
                 inet_util.o            \
                 ip2loc.o               \
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index f77d4589..c91244b8 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -123,7 +123,7 @@ WSOCK_TRACE_OBJ = $(OBJ_DIR)\asn.obj             \
                   $(OBJ_DIR)\hosts.obj           \
                   $(OBJ_DIR)\iana.obj            \
                   $(OBJ_DIR)\idna.obj            \
-                  $(OBJ_DIR)\in_addr.obj         \
+                  $(OBJ_DIR)\inet_addr.obj       \
                   $(OBJ_DIR)\inet_util.obj       \
                   $(OBJ_DIR)\init.obj            \
                   $(OBJ_DIR)\ip2loc.obj          \
@@ -159,12 +159,12 @@ WS_TOOL_OBJ = $(OBJ_DIR)\asn.obj             \
               $(OBJ_DIR)\hosts.obj           \
               $(OBJ_DIR)\iana.obj            \
               $(OBJ_DIR)\idna.obj            \
-              $(OBJ_DIR)\in_addr.obj         \
+              $(OBJ_DIR)\inet_addr.obj       \
               $(OBJ_DIR)\inet_util.obj       \
               $(OBJ_DIR)\init.obj            \
               $(OBJ_DIR)\ip2loc.obj          \
               $(OBJ_DIR)\overlap.obj         \
-              $(OBJ_DIR)\services.obj       \
+              $(OBJ_DIR)\services.obj        \
               $(OBJ_DIR)\smartlist.obj       \
               $(OBJ_DIR)\stkwalk.obj         \
               $(OBJ_DIR)\test.obj            \
@@ -320,49 +320,49 @@ wsock_trace_d.def: wsock_trace.def Makefile.VC6
 
 common.h: wsock_defs.h
 
-$(OBJ_DIR)\asn.obj: asn.c common.h in_addr.h common.h  \
-                    csv.h smartlist.h inet_util.h      \
-                    in_addr.h init.h iana.h asn.h      \
-                    $(LIBLOC_ROOT)\libloc\libloc.h     \
-                    $(LIBLOC_ROOT)\libloc\compat.h     \
-                    $(LIBLOC_ROOT)\libloc\database.h   \
-                    $(LIBLOC_ROOT)\libloc\network.h    \
-                    $(LIBLOC_ROOT)\libloc\format.h     \
-                    $(LIBLOC_ROOT)\libloc\as.h         \
-                    $(LIBLOC_ROOT)\libloc\stringpool.h \
-                    $(LIBLOC_ROOT)\libloc\country.h    \
-                    $(LIBLOC_ROOT)\libloc\resolv.h     \
+$(OBJ_DIR)\asn.obj: asn.c common.h inet_addr.h common.h \
+                    csv.h smartlist.h inet_util.h       \
+                    inet_addr.h init.h iana.h asn.h     \
+                    $(LIBLOC_ROOT)\libloc\libloc.h      \
+                    $(LIBLOC_ROOT)\libloc\compat.h      \
+                    $(LIBLOC_ROOT)\libloc\database.h    \
+                    $(LIBLOC_ROOT)\libloc\network.h     \
+                    $(LIBLOC_ROOT)\libloc\format.h      \
+                    $(LIBLOC_ROOT)\libloc\as.h          \
+                    $(LIBLOC_ROOT)\libloc\stringpool.h  \
+                    $(LIBLOC_ROOT)\libloc\country.h     \
+                    $(LIBLOC_ROOT)\libloc\resolv.h      \
                     $(LIBLOC_ROOT)\libloc\windows\syslog.h
 
 $(OBJ_DIR)\common.obj:      common.c common.h smartlist.h init.h dump.h wsock_trace.rc
 $(OBJ_DIR)\cpu.obj:         cpu.c common.h init.h cpu.h
 $(OBJ_DIR)\csv.obj:         csv.c common.h init.h csv.h
-$(OBJ_DIR)\dump.obj:        dump.c common.h in_addr.h init.h geoip.h smartlist.h \
-                            idna.h inet_util.h hosts.h wsock_trace.h dnsbl.h dump.h
-$(OBJ_DIR)\dnsbl.obj:       dnsbl.c dnsbl.h common.h init.h in_addr.h inet_util.h geoip.h smartlist.h
-$(OBJ_DIR)\hosts.obj:       hosts.c common.h init.h smartlist.h in_addr.h hosts.h
-$(OBJ_DIR)\geoip.obj:       geoip.c common.h smartlist.h init.h in_addr.h inet_util.h geoip.h
+$(OBJ_DIR)\dump.obj:        dump.c common.h inet_addr.h init.h geoip.h smartlist.h \
+                            idna.h inet_addr.h inet_util.h hosts.h wsock_trace.h dnsbl.h dump.h
+$(OBJ_DIR)\dnsbl.obj:       dnsbl.c dnsbl.h common.h init.h inet_addr.h inet_util.h geoip.h smartlist.h
+$(OBJ_DIR)\hosts.obj:       hosts.c common.h init.h smartlist.h inet_addr.h hosts.h
+$(OBJ_DIR)\geoip.obj:       geoip.c common.h smartlist.h init.h inet_addr.h inet_util.h geoip.h
 
-$(OBJ_DIR)\iana.obj:        iana.c common.h in_addr.h common.h csv.h smartlist.h asn.h \
-                            inet_util.h in_addr.h init.h iana.h
+$(OBJ_DIR)\iana.obj:        iana.c common.h inet_addr.h common.h csv.h smartlist.h asn.h \
+                            inet_util.h inet_addr.h init.h iana.h
 
 $(OBJ_DIR)\idna.obj:        idna.c common.h init.h smartlist.h idna.h
-$(OBJ_DIR)\inet_util.obj:   inet_util.c inet_util.h common.h init.h in_addr.h
+$(OBJ_DIR)\inet_util.obj:   inet_util.c inet_util.h common.h init.h inet_addr.h
 $(OBJ_DIR)\init.obj:        init.c common.h wsock_trace.h wsock_trace_lua.h \
                             dnsbl.h dump.h geoip.h smartlist.h idna.h stkwalk.h \
                             overlap.h hosts.h cpu.h init.h
-$(OBJ_DIR)\in_addr.obj:     in_addr.c common.h in_addr.h
+$(OBJ_DIR)\inet_addr.obj:   inet_addr.c common.h inet_addr.h
 $(OBJ_DIR)\overlap.obj:     overlap.c common.h init.h smartlist.h overlap.h
 $(OBJ_DIR)\services.obj:    services.c common.h wsock_defs.h init.h smartlist.h csv.h wsock_trace.h services.h
 $(OBJ_DIR)\smartlist.obj:   smartlist.c common.h vm_dump.h smartlist.h
 $(OBJ_DIR)\stkwalk.obj:     stkwalk.c common.h init.h stkwalk.h smartlist.h
 $(OBJ_DIR)\vm_dump.obj:     vm_dump.c common.h cpu.h vm_dump.h
 $(OBJ_DIR)\ws_tool.obj:     csv.c backtrace.c geoip.c iana.c firewall.c dnsbl.c idna.c
-$(OBJ_DIR)\wsock_trace.obj: wsock_trace.c common.h in_addr.h \
+$(OBJ_DIR)\wsock_trace.obj: wsock_trace.c common.h inet_addr.h \
                             init.h cpu.h stkwalk.h smartlist.h \
                             overlap.h dump.h wsock_trace_lua.h \
                             wsock_trace.h wsock_hooks.c
-$(OBJ_DIR)\ip2loc.obj:      ip2loc.c common.h init.h geoip.h smartlist.h in_addr.h
+$(OBJ_DIR)\ip2loc.obj:      ip2loc.c common.h init.h geoip.h smartlist.h inet_addr.h
 $(OBJ_DIR)\disasm.obj:      mhook\disasm.c mhook\disasm.h
 $(OBJ_DIR)\mhook.obj:       mhook\mhook.c mhook\disasm.h mhook\mhook.h
 $(OBJ_DIR)\mhook-test.obj:  mhook\mhook.c mhook\mhook.h
diff --git a/src/Wsock-trace.vcxproj b/src/Wsock-trace.vcxproj
index 76f35840..587925f7 100644
--- a/src/Wsock-trace.vcxproj
+++ b/src/Wsock-trace.vcxproj
@@ -288,7 +288,7 @@
     <ClCompile Include="iana.c" />
     <ClCompile Include="idna.c" />
     <ClCompile Include="init.c" />
-    <ClCompile Include="in_addr.c" />
+    <ClCompile Include="inet_addr.c" />
     <ClCompile Include="inet_util.c" />
     <ClCompile Include="ip2loc.c" />
     <ClCompile Include="non-export.c" />
diff --git a/src/asn.c b/src/asn.c
index 6a9dc646..5d0dd334 100644
--- a/src/asn.c
+++ b/src/asn.c
@@ -17,7 +17,7 @@
 #include "smartlist.h"
 #include "xz_decompress.h"
 #include "inet_util.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 #include "init.h"
 #include "iana.h"
 #include "asn.h"
diff --git a/src/dnsbl.c b/src/dnsbl.c
index 95eec7f9..06b9c96b 100644
--- a/src/dnsbl.c
+++ b/src/dnsbl.c
@@ -33,10 +33,10 @@
 
 #include "common.h"
 #include "init.h"
-#include "in_addr.h"
 #include "smartlist.h"
 #include "geoip.h"
 #include "getopt.h"
+#include "inet_addr.h"
 #include "inet_util.h"
 #include "dnsbl.h"
 
diff --git a/src/dump.c b/src/dump.c
index b99c725e..518bed84 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -13,15 +13,14 @@
 #include <ctype.h>
 
 #include "common.h"
-#include "in_addr.h"
 #include "init.h"
 #include "geoip.h"
 #include "asn.h"
 #include "iana.h"
 #include "idna.h"
-#include "in_addr.h"
 #include "hosts.h"
 #include "wsock_trace.h"
+#include "inet_addr.h"
 #include "inet_util.h"
 #include "_ipproto.h"
 #include "dnsbl.h"
diff --git a/src/firewall.c b/src/firewall.c
index b12f476b..5654ac56 100644
--- a/src/firewall.c
+++ b/src/firewall.c
@@ -58,7 +58,6 @@
 #include "common.h"
 #include "smartlist.h"
 #include "init.h"
-#include "in_addr.h"
 #include "getopt.h"
 #include "dump.h"
 #include "cpu.h"
@@ -66,6 +65,7 @@
 #include "dnsbl.h"
 #include "asn.h"
 #include "iana.h"
+#include "inet_addr.h"
 #include "inet_util.h"
 #include "services.h"
 #include "wsock_trace.h"
diff --git a/src/geoip.c b/src/geoip.c
index f2e09ce2..5cc2dc8e 100644
--- a/src/geoip.c
+++ b/src/geoip.c
@@ -65,7 +65,7 @@
 #include "common.h"
 #include "smartlist.h"
 #include "init.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 #include "inet_util.h"
 #include "iana.h"
 #include "asn.h"
diff --git a/src/hosts.c b/src/hosts.c
index 0ab7b528..9447dae3 100644
--- a/src/hosts.c
+++ b/src/hosts.c
@@ -9,7 +9,7 @@
 #include "common.h"
 #include "init.h"
 #include "smartlist.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 #include "csv.h"
 #include "hosts.h"
 
diff --git a/src/iana.c b/src/iana.c
index 8c7ea6cf..5a20f7d5 100644
--- a/src/iana.c
+++ b/src/iana.c
@@ -21,8 +21,8 @@
 #include "smartlist.h"
 #include "asn.h"
 #include "getopt.h"
+#include "inet_addr.h"
 #include "inet_util.h"
-#include "in_addr.h"
 #include "init.h"
 #include "iana.h"
 
diff --git a/src/in_addr.c b/src/inet_addr.c
similarity index 99%
rename from src/in_addr.c
rename to src/inet_addr.c
index 93d7ef4a..88bac3d8 100644
--- a/src/in_addr.c
+++ b/src/inet_addr.c
@@ -36,7 +36,7 @@
 
 #include "common.h"
 #include "init.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 
 /**
  * \todo
diff --git a/src/in_addr.h b/src/inet_addr.h
similarity index 96%
rename from src/in_addr.h
rename to src/inet_addr.h
index 671e8a1a..d679f204 100644
--- a/src/in_addr.h
+++ b/src/inet_addr.h
@@ -1,8 +1,8 @@
-/**\file    in_addr.h
+/**\file    inet_addr.h
  * \ingroup inet_util
  */
-#ifndef _IN_ADDR_H
-#define _IN_ADDR_H
+#ifndef _INET_ADDR_H
+#define _INET_ADDR_H
 
 #define INT16SZ     2
 #define INADDRSZ    4
diff --git a/src/inet_util.c b/src/inet_util.c
index dd148fd6..1ac6518a 100644
--- a/src/inet_util.c
+++ b/src/inet_util.c
@@ -37,7 +37,7 @@
 
 #include "common.h"
 #include "init.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 #include "inet_util.h"
 
 #define USER_AGENT_A    "Wsock-trace"
diff --git a/src/init.c b/src/init.c
index caf45963..b966d467 100644
--- a/src/init.c
+++ b/src/init.c
@@ -34,7 +34,7 @@
 #include "asn.h"
 #include "iana.h"
 #include "dnsbl.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 #include "init.h"
 
 #define FREE(p)   (p ? (void) (free(p), p = NULL) : (void)0)
diff --git a/src/ip2loc.c b/src/ip2loc.c
index 7175bfa5..a8c68650 100644
--- a/src/ip2loc.c
+++ b/src/ip2loc.c
@@ -24,7 +24,7 @@
 
 #include "common.h"
 #include "init.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 #include "inet_util.h"
 #include "geoip.h"
 
diff --git a/src/non-export.c b/src/non-export.c
index 95a3bfdf..ba943d77 100644
--- a/src/non-export.c
+++ b/src/non-export.c
@@ -20,7 +20,7 @@
 #endif
 
 #include "common.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 
 GCC_PRAGMA (GCC diagnostic ignored "-Wmissing-braces")
 
diff --git a/src/wsock_trace.c b/src/wsock_trace.c
index 3677876b..62aec189 100644
--- a/src/wsock_trace.c
+++ b/src/wsock_trace.c
@@ -43,7 +43,7 @@
 
 #include "common.h"
 #include "bfd_gcc.h"
-#include "in_addr.h"
+#include "inet_addr.h"
 #include "init.h"
 #include "idna.h"
 #include "cpu.h"