diff --git a/Makefile.in b/Makefile.in
index 554b2f48..b1b1270f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,6 +39,8 @@ CLEAN     := znc *.o core core.*
 DISTCLEAN := Makefile config.log config.status znc-config znc-buildmod .depend \
 	modules/.depend modules/Makefile man/Makefile znc.pc znc-uninstalled.pc
 
+CXXFLAGS += -D_MODDIR_=\"$(MODDIR)\" -D_DATADIR_=\"$(DATADIR)\"
+
 ifneq "$(V)" ""
 VERBOSE=1
 endif
diff --git a/configure b/configure
index db9749bb..21e7b547 100755
--- a/configure
+++ b/configure
@@ -4210,9 +4210,6 @@ $as_echo "$as_me: WARNING: libiconv was not found, disabling the charset module"
 	fi
 fi
 
-appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\""
-appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
-
 
 
 
diff --git a/configure.in b/configure.in
index 6011ef10..22dae2e5 100644
--- a/configure.in
+++ b/configure.in
@@ -439,9 +439,6 @@ then
 	fi
 fi
 
-appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\""
-appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
-
 AC_SUBST([CXXFLAGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([MODFLAGS])
diff --git a/main.h b/main.h
index dc47b799..a144ff45 100644
--- a/main.h
+++ b/main.h
@@ -20,14 +20,6 @@
 #define VERSION_EXTRA ""
 #endif
 
-#ifndef _MODDIR_
-#define _MODDIR_ "/usr/lib/znc"
-#endif
-
-#ifndef _DATADIR_
-#define _DATADIR_ "/usr/share/znc"
-#endif
-
 #define NOTHING (void)0
 
 #define ALLMODULECALL(macFUNC, macEXITER)                                     \