diff --git a/level1.c b/level1.c
index 6018b97..ee01ec3 100644
--- a/level1.c
+++ b/level1.c
@@ -27,50 +27,33 @@
  *
  */
 
-/*
- * $SonyRCSfile: level1.c,v $  
- * $SonyRevision: 1.4 $ 
- * $SonyDate: 1995/04/17 10:36:08 $
- *
- * $Id: level1.c,v 1.2 2004/07/20 15:55:43 hiroo Exp $
- */
-
+#include "config.h"
 
 #include "sj_sysvdef.h" 
-#include <stdio.h>
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <netinet/in.h>
+
 #include <netdb.h>
 #include <pwd.h>
-#include <string.h>
-#include <sys/un.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#ifdef TLI              
-#include <fcntl.h>
-#include <tiuser.h>
-#include <stropts.h>
-#include <netdir.h>
-#include <netconfig.h>
-#else
-#include <sys/socket.h>
-#endif
 #include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "Const.h"
 #include "sj3cmd.h"
 #include "sj3err.h"
+
 #include "sj3lib.h"
 
 #ifdef SVR4
 #define signal sigset
 #endif
 
-#ifndef lint
-static	char	rcsid_sony[] = "$SonyId: level1.c,v 1.4 1995/04/17 10:36:08 notanaka Exp $ SONY;";
-static	char	rcsid_patch[] = "$Id: level1.c,v 1.2 2004/07/20 15:55:43 hiroo Exp $";
-#endif
-
 int	sj3_error_number;
 char	*sj3_socket_name	= SocketName;
 char	*sj3_port_name	= PortName;
diff --git a/sj3lib.c b/sj3lib.c
index 1f8b61c..957f4e4 100644
--- a/sj3lib.c
+++ b/sj3lib.c
@@ -27,14 +27,10 @@
  *
  */
 
-/*
- * $SonyRCSfile: sj.c,v $  
- * $SonyRevision: 1.2 $ 
- * $SonyDate: 1994/12/09 11:27:09 $
- *
- * $Id$
- */
+#include "config.h"
 
+#include <sys/file.h>
+#include <sys/types.h>
 
 #include <ctype.h>
 #include <locale.h>
@@ -43,15 +39,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/file.h>
 #include <unistd.h>
-#include "sj_const.h"
+
 #include "Const.h"
 #include "sj3err.h"
-#include "sj3lib.h"
+#include "sj_const.h"
 #include "sj_hinsi.h"
 
+#include "sj3lib.h"
+
 extern	int	sj3_error_number;
 #ifdef __sony_news
 extern  int     _sys_code; 
diff --git a/sj3stat.c b/sj3stat.c
index a5017b4..c4ecf3e 100644
--- a/sj3stat.c
+++ b/sj3stat.c
@@ -27,17 +27,11 @@
  * written authorization from Software Research Associates.
  */
 
-/*
- * $SonyRCSfile: sj3stat.c,v $
- * $SonyRevision: 1.2 $
- * $SonyDate: 1997/01/23 11:09:41 $
- *
- * $Id$
- */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+
 #include "Const.h"
 #include "sj3err.h"
 #include "sj3lib.h"
diff --git a/string.c b/string.c
index 8a356c6..853719b 100644
--- a/string.c
+++ b/string.c
@@ -27,24 +27,16 @@
  *
  */
 
-/*
- * $SonyRCSfile: string.c,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:03:58 $
- */
-
-
-
+#include "config.h"
 
 #include "sj_sysvdef.h"
+
+#include <ctype.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <locale.h>
+
 #include "sj_euc.h"
-#if defined(__sony_news) && defined(SVR4)
-#include <sonyils.h>
-#endif
-#include <ctype.h>
 
 #ifndef TRUE
 #define TRUE (1)