diff --git a/src/frontend/com_hardcopy.c b/src/frontend/com_hardcopy.c
index 71a2649c2..9734253bc 100644
--- a/src/frontend/com_hardcopy.c
+++ b/src/frontend/com_hardcopy.c
@@ -31,7 +31,9 @@ com_hardcopy(wordlist *wl)
     char buf[BSIZE_SP], device[BSIZE_SP];
     bool tempf = FALSE;
     char *devtype;
+#if defined(SYSTEM_PLOT5LPR) || defined(SYSTEM_PSLPR)
     char format[513];
+#endif
     int	printed;
     int hc_button;
     int foundit;
diff --git a/src/frontend/resource.c b/src/frontend/resource.c
index e46bbf772..8614230d0 100644
--- a/src/frontend/resource.c
+++ b/src/frontend/resource.c
@@ -43,8 +43,10 @@ $Id$
 /* static declarations */
 static void printres(char *name);
 static void fprintmem(FILE* stream, size_t memory);
+#ifndef HAVE__MEMAVL
 static RETSIGTYPE fault(void);
 static void * baseaddr(void);
+#endif
 
 #ifdef HAVE__MEMAVL
 size_t mem_avail;
@@ -125,8 +127,7 @@ char* copyword;
 void
 ft_ckspace(void)
 {
-    size_t usage;
-    size_t limit;
+    size_t usage, limit;
 
 #ifdef HAVE__MEMAVL
     size_t mem_avail_now;
@@ -277,10 +278,8 @@ printres(char *name)
     }
 
     if (!name || eq(name, "space")) {
-	size_t usage = 0;
-	size_t limit = 0;
+	size_t usage = 0, limit = 0;
 	
-    
 #ifdef HAVE__MEMAVL
          size_t mem_avail_now;
          
@@ -406,6 +405,8 @@ fprintmem(FILE* stream, size_t memory) {
 }
 
 
+#ifndef HAVE__MEMAVL
+
 #include <signal.h>
 #include <setjmp.h>
 
@@ -478,6 +479,7 @@ baseaddr(void)
 
 #endif
 }
+#endif
 
 #  ifdef notdef
 main( )
diff --git a/src/frontend/terminal.c b/src/frontend/terminal.c
index fae46830c..88c483b9a 100644
--- a/src/frontend/terminal.c
+++ b/src/frontend/terminal.c
@@ -9,7 +9,7 @@ $Id$
  * dependencies in here, and it isn't clear that versions of this stuff
  * can be written for every possible machine...
  */
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_SGTTY_H
 #include <sgtty.h>
@@ -19,6 +19,10 @@ $Id$
 #include <sys/ioctl.h>
 #endif
 
+#ifdef HAVE_LIBIBERTY_H /* asprintf */
+#include <libiberty.h>
+#endif
+
 #if 0
 /* Bad interaction with bool type in bool.h because curses also
    defines this symbol. */
@@ -32,7 +36,7 @@ $Id$
 #include <ncurses/termcap.h>
 #endif
 
-#include <ngspice.h>
+#include "ngspice.h"
 #include <cpdefs.h>
 
 #include "variable.h"