4 files changed, 5 insertions, 3 deletions
diff --git a/libxrdp/Makefile b/libxrdp/Makefile
index 097785d7..925b125a 100644
--- a/libxrdp/Makefile
+++ b/libxrdp/Makefile
@@ -10,7 +10,8 @@ PIDDIR = /var/run
 MANDIR = /usr/local/man
 DOCDIR = /usr/doc/xrdp
 
-DEFINES =
+DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
+          -DXRDP_KEY_FILE=\"$(CFGDIR)/rsakeys.ini\"
 
 CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
 C_OS_FLAGS = $(CFLAGS) -c
diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h
index e725e968..1084a728 100644
--- a/libxrdp/libxrdp.h
+++ b/libxrdp/libxrdp.h
@@ -32,6 +32,7 @@
 #include "list.h"
 #include "file.h"
 #include "libxrdpinc.h"
+#include "file_loc.h"
 
 /* tcp */
 struct xrdp_tcp
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index a1d5df6b..8715eb7c 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -57,7 +57,7 @@ xrdp_rdp_read_config(struct xrdp_client_info* client_info)
   char* item;
   char* value;
 
-  fd = g_file_open("xrdp.ini");
+  fd = g_file_open(XRDP_CFG_FILE); /* xrdp.ini */
   if (fd > 0)
   {
     items = list_create();
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index 1b44751c..980c20fa 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -187,7 +187,7 @@ xrdp_sec_create(struct xrdp_rdp* owner, int sck)
   g_random(self->server_random, 32);
   self->mcs_layer = xrdp_mcs_create(self, sck, &self->client_mcs_data,
                                     &self->server_mcs_data);
-  fd = g_file_open("rsakeys.ini");
+  fd = g_file_open(XRDP_KEY_FILE); /* rsakeys.ini */
   if (fd > 0)
   {
     items = list_create();