--- Makefile~	2014-08-19 02:28:33.000000000 -0500
+++ Makefile	2016-01-07 12:06:13.980741121 -0600
@@ -92,10 +92,12 @@
 FRIBIDI_LIB:=$(shell $(PKG_CONFIG) --libs fribidi)
 FRIBIDI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags fribidi)
 
-windows_ARCH_LINKS:=-lintl $(PNG) -lzdll -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv
+COMMON_LIB=-lm -lz
+
+windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB)
 osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
-beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB)
-linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
+beos_ARCH_LINKS:=-lintl $(PNG) -lbe -liconv $(FRIBIDI_LIB) $(COMMON_LIB)
+linux_ARCH_LINKS:=$(PNG) $(FRIBIDI_LIB) $(PAPER_LIB) $(COMMON_LIB)
 ARCH_LINKS:=$($(OS)_ARCH_LINKS)
 
 windows_ARCH_HEADERS:=src/win32_print.h