diff --git a/ipmitool/lib/helper.c b/ipmitool/lib/helper.c
index 26dfcd6..c4f9794 100644
--- a/ipmitool/lib/helper.c
+++ b/ipmitool/lib/helper.c
@@ -49,7 +49,9 @@
 #endif
 
 #ifdef HAVE_PATHS_H
-# include <paths.h>  /* For _PATH_TTY */
+# include <paths.h>
+#else
+# define _PATH_VARRUN "/var/run/"
 #endif
 
 #include <ipmitool/helper.h>
diff --git a/ipmitool/lib/ipmi_sol.c b/ipmitool/lib/ipmi_sol.c
index b7e6555..36ff865 100644
--- a/ipmitool/lib/ipmi_sol.c
+++ b/ipmitool/lib/ipmi_sol.c
@@ -42,7 +42,9 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <config.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
 
 #if defined(HAVE_TERMIOS_H)
 # include <termios.h>
diff --git a/ipmitool/lib/ipmi_tsol.c b/ipmitool/lib/ipmi_tsol.c
index e5f5a89..5efec0f 100644
--- a/ipmitool/lib/ipmi_tsol.c
+++ b/ipmitool/lib/ipmi_tsol.c
@@ -49,7 +49,9 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 
-#include <config.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
 
 #if defined(HAVE_TERMIOS_H)
 # include <termios.h>
diff --git a/ipmitool/src/ipmievd.c b/ipmitool/src/ipmievd.c
index 7db6bd1..6bdec19 100644
--- a/ipmitool/src/ipmievd.c
+++ b/ipmitool/src/ipmievd.c
@@ -42,7 +42,9 @@
 #include <sys/stat.h>
 #include <signal.h>
 
-#include <config.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
 
 #ifdef HAVE_PATHS_H
 # include <paths.h>
diff --git a/ipmitool/src/plugins/ipmi_intf.c b/ipmitool/src/plugins/ipmi_intf.c
index 43318f7..7149095 100644
--- a/ipmitool/src/plugins/ipmi_intf.c
+++ b/ipmitool/src/plugins/ipmi_intf.c
@@ -33,8 +33,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <config.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
 #include <ipmitool/ipmi_intf.h>
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_sdr.h>
diff --git a/ipmitool/src/plugins/lanplus/lanplus_crypt.c b/ipmitool/src/plugins/lanplus/lanplus_crypt.c
index 1aa091b..f9b1414 100644
--- a/ipmitool/src/plugins/lanplus/lanplus_crypt.c
+++ b/ipmitool/src/plugins/lanplus/lanplus_crypt.c
@@ -32,7 +32,9 @@
 
 #include <assert.h>
 #include <string.h>
-#include <config.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
 #include <ipmitool/bswap.h>
 #include <ipmitool/log.h>
 #include "lanplus.h"
diff --git a/ipmitool/src/plugins/open/open.c b/ipmitool/src/plugins/open/open.c
index c0fde86..63899c4 100644
--- a/ipmitool/src/plugins/open/open.c
+++ b/ipmitool/src/plugins/open/open.c
@@ -45,7 +45,9 @@
 #include <ipmitool/helper.h>
 #include <ipmitool/log.h>
 
-#include <config.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
 
 #if defined(HAVE_OPENIPMI_H)
 # include <linux/compiler.h>