diff --git a/Makefile b/Makefile
index bb776f0..1ee054e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 TARGET = ciadpi
 CC ?= gcc
 CFLAGS += -std=c99 -O2 -D_XOPEN_SOURCE=500 
-SOURCES = packets.c main.c conev.c proxy.c desync.c error.c
+SOURCES = packets.c main.c conev.c proxy.c desync.c
 
 all:
 	$(CC) $(CFLAGS) $(SOURCES) -I . -o $(TARGET)
diff --git a/error.c b/error.c
deleted file mode 100644
index d3ca8ff..0000000
--- a/error.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#endif
-
-int unie(int e)
-{
-    #ifdef _WIN32
-    switch (e) {
-        case WSAEWOULDBLOCK:
-            return EAGAIN;
-        case WSAETIMEDOUT:
-            return ETIMEDOUT;
-        case WSAENETUNREACH:
-            return ENETUNREACH;
-        case WSAEHOSTUNREACH:
-            return EHOSTUNREACH;
-        case WSAECONNREFUSED:
-            return ECONNREFUSED;
-    }
-    #endif
-    return e;
-}
-
-int get_e()
-{
-    #ifdef _WIN32
-    int e = WSAGetLastError();
-    return unie(e);
-    #else
-    return errno;
-    #endif
-}
-
-void uniperror(char *str)
-{
-    #ifdef _WIN32
-    int e = WSAGetLastError();
-    fprintf(stderr, "%s: %d\n", str, e);
-    #else
-    perror(str);
-    #endif
-}
diff --git a/error.h b/error.h
index bc10868..3b8a16c 100644
--- a/error.h
+++ b/error.h
@@ -1,4 +1,41 @@
-int unie(int e);
-void uniperror(char *str);
-int get_e();
-void uniperror(char *str);
+#include <stdio.h>
+#include <errno.h>
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
+#ifdef _WIN32
+#define get_e() \
+    unie(WSAGetLastError())
+#else
+#define get_e() \
+    errno
+#endif
+
+#ifdef _WIN32
+#define uniperror(str) \
+    fprintf(stderr, "%s: %d\n", str, WSAGetLastError())
+#else
+#define uniperror(str) \
+    perror(str)
+#endif
+
+inline const int unie(int e)
+{
+    #ifdef _WIN32
+    switch (e) {
+        case WSAEWOULDBLOCK:
+            return EAGAIN;
+        case WSAETIMEDOUT:
+            return ETIMEDOUT;
+        case WSAENETUNREACH:
+            return ENETUNREACH;
+        case WSAEHOSTUNREACH:
+            return EHOSTUNREACH;
+        case WSAECONNREFUSED:
+            return ECONNREFUSED;
+    }
+    #endif
+    return e;
+}