Adjusted includes so no longer a clash with old and new includes

proc/.cvsignore

@@ -1,2 +1,3 @@
 libproc.so*
 *.o
+.depend

proc/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -77,7 +77,7 @@ VERSION = @VERSION@
 
 lib_LTLIBRARIES = libproc.la
 
-libproc_la_SOURCES = alloc.c compare.c compare.h devname.c devname.h                      ksym.c output.c procps.h pwcache.c readproc.c 					 readproc.h sig.c sig.h status.c status.h sysinfo.c 					 sysinfo.h tree.h version.c version.h whattime.c 					 whattime.h
+libproc_la_SOURCES = alloc.c compare.c compare.h devname.c devname.h                      ksym.c output.c procps.h pwcache.c readproc.c 					 readproc.h sig.c sig.h status.c status.h sysinfo.c 					 sysinfo.h version.c version.h whattime.c 					 whattime.h
 
 
 libproc_la_LDFLAGS = -version-info 3:0:0

proc/readproc.c

@@ -5,10 +5,10 @@
  * May be distributed under the conditions of the
  * GNU Library General Public License; a copy is in COPYING
  */
-#include "proc/version.h"
-#include "proc/readproc.h"
-#include "proc/devname.h"
-#include "proc/procps.h"
+#include "version.h"
+#include "readproc.h"
+#include "devname.h"
+#include "procps.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

proc/sysinfo.c

@@ -16,8 +16,8 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include "proc/version.h"
-#include "proc/sysinfo.h" /* include self to verify prototypes */
+#include "version.h"
+#include "sysinfo.h" /* include self to verify prototypes */
 
 #ifndef HZ
 #include <netinet/in.h>  /* htons */