diff --git a/libxrdp/Makefile b/libxrdp/Makefile
index 6d2fe72e..5eedcd18 100644
--- a/libxrdp/Makefile
+++ b/libxrdp/Makefile
@@ -2,13 +2,12 @@
 LIBXRDPOBJ = libxrdp.o xrdp_tcp.o xrdp_iso.o xrdp_mcs.o \
              xrdp_sec.o xrdp_rdp.o xrdp_orders.o \
              xrdp_bitmap_compress.o \
-             ../common/os_calls.o \
-             ../common/ssl_calls.o \
-             ../common/file.o
+             os_calls.o ssl_calls.o file.o
 
 CFLAGS = -Wall -O2 -I../common -fPIC
-LDFLAGS = -shared
-LIBS = -ldl -lcrypto
+C_OS_FLAGS = $(CFLAGS) -c
+LDFLAGS = -ldl -shared
+LIBS = -lcrypto
 CC = gcc
 
 all: libxrdp
@@ -24,3 +23,12 @@ libxrdp: $(LIBXRDPOBJ)
 clean:
 	rm -f $(LIBXRDPOBJ) libxrdp.a libxrdp.so
 
+file.o:
+	$(CC) $(C_OS_FLAGS) ../common/file.c
+
+os_calls.o:
+	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
+
+ssl_calls.o:
+	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
+
diff --git a/rdp/Makefile b/rdp/Makefile
index c4f8ba4d..aa8c21c1 100644
--- a/rdp/Makefile
+++ b/rdp/Makefile
@@ -21,3 +21,4 @@ os_calls.o:
 
 ssl_calls.o:
 	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
+
diff --git a/xrdp/Makefile b/xrdp/Makefile
index 28617873..e1e52005 100644
--- a/xrdp/Makefile
+++ b/xrdp/Makefile
@@ -1,15 +1,13 @@
-
+# xrdp makefile
 XRDPOBJ = xrdp.o xrdp_process.o xrdp_listen.o \
           xrdp_bitmap.o xrdp_wm.o xrdp_painter.o \
           xrdp_region.o xrdp_cache.o xrdp_font.o funcs.o \
           xrdp_login_wnd.o xrdp_interface.o \
-          ../common/list.o \
-          ../common/file.o \
-          ../common/os_calls.o \
-          ../common/thread_calls.o
+          list.o file.o os_calls.o thread_calls.o
 
 #CFLAGS = -Wall -O2 -I../common -I../libxrdp -DXRDP_DEBUG
 CFLAGS = -Wall -O2 -I../common -I../libxrdp
+C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
 LIBS = -ldl -lpthread -lxrdp
 CC = gcc
@@ -22,3 +20,16 @@ xrdp: $(XRDPOBJ)
 
 clean:
 	rm -f $(XRDPOBJ) xrdp
+
+list.o:
+	$(CC) $(C_OS_FLAGS) ../common/list.c
+
+file.o:
+	$(CC) $(C_OS_FLAGS) ../common/file.c
+
+os_calls.o:
+	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
+
+thread_calls.o:
+	$(CC) $(C_OS_FLAGS) ../common/thread_calls.c
+