diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4fd973694..448f4a20bc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+Tue Sep 28 17:53:26 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config/nm-sysv4.h: Include solib.h.  Define SVR4_SHARED_LIBS.
+	* config/tm-sysv4.h: Don't include solib.h.
+	* config/xm-sysv4.h: Don't define SVR4_SHARED_LIBS.
+	* config/i386/i386v4.mt (TDEPFILES): Move solib.o from here...
+	* config/i386/i386v4.mh (NATDEPFILES): ...to here.
+	* config/i386/nm-i386v4.h: Include nm-sysv4.h.
+	* config/m68k/amix.mt (TDEPFIES): Move solib.o from here...
+	* config/m68k/amix.mh (NATDEPFILES): ...to here.
+
 Tue Sep 28 09:45:38 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* symmisc.c (print_symbol): Use %02x not %2x for LOC_CONST_BYTES.
diff --git a/gdb/config/i386/i386v4.mt b/gdb/config/i386/i386v4.mt
index 818bee2253..89df671a0b 100644
--- a/gdb/config/i386/i386v4.mt
+++ b/gdb/config/i386/i386v4.mt
@@ -1,3 +1,3 @@
 # Target: Intel 386 running SVR4
-TDEPFILES= i386-pinsn.o i386-tdep.o i387-tdep.o solib.o exec.o
+TDEPFILES= i386-pinsn.o i386-tdep.o i387-tdep.o exec.o
 TM_FILE= tm-i386v4.h
diff --git a/gdb/config/m68k/amix.mh b/gdb/config/m68k/amix.mh
index b445d436f0..e66d3ffe6c 100644
--- a/gdb/config/m68k/amix.mh
+++ b/gdb/config/m68k/amix.mh
@@ -1,6 +1,6 @@
 # Host: Commodore Amiga running SVR4.
 NAT_FILE= nm-sysv4.h
-NATDEPFILES= corelow.o core-svr4.o procfs.o fork-child.o
+NATDEPFILES= corelow.o core-svr4.o solib.o procfs.o fork-child.o
 XDEPFILES=
 XM_FILE= xm-amix.h
 SYSV_DEFINE=-DSYSV
diff --git a/gdb/config/m68k/amix.mt b/gdb/config/m68k/amix.mt
index 91166b92e5..ea92eef994 100644
--- a/gdb/config/m68k/amix.mt
+++ b/gdb/config/m68k/amix.mt
@@ -1,3 +1,3 @@
 # Target: Commodore Amiga running SVR4
-TDEPFILES= m68k-pinsn.o exec.o m68k-tdep.o solib.o
+TDEPFILES= m68k-pinsn.o exec.o m68k-tdep.o
 TM_FILE= tm-amix.h
diff --git a/gdb/config/nm-sysv4.h b/gdb/config/nm-sysv4.h
index 4aff700891..d8f5c3cd65 100644
--- a/gdb/config/nm-sysv4.h
+++ b/gdb/config/nm-sysv4.h
@@ -18,6 +18,12 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#include "solib.h"	/* Support for shared libraries. */
+
+/* Use SVR4 style shared library support */
+
+#define SVR4_SHARED_LIBS
+
 /* SVR4 has /proc support, so use it instead of ptrace. */
 
 #define USE_PROC_FS
diff --git a/gdb/config/tm-sysv4.h b/gdb/config/tm-sysv4.h
index f63d1749d9..18c88efa29 100644
--- a/gdb/config/tm-sysv4.h
+++ b/gdb/config/tm-sysv4.h
@@ -18,8 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "solib.h"	/* Support for shared libraries. */
-
 /* For SVR4 shared libraries, each call to a library routine goes through
    a small piece of trampoline code in the ".init" section.  Although each
    of these fragments is labeled with the name of the routine being called,
diff --git a/gdb/config/xm-sysv4.h b/gdb/config/xm-sysv4.h
index 6ce3bc0bf2..9c97646b4f 100644
--- a/gdb/config/xm-sysv4.h
+++ b/gdb/config/xm-sysv4.h
@@ -18,10 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* Use SVR4 style shared library support */
-
-#define SVR4_SHARED_LIBS
-
 /* SVR4 has termios facilities. */
 
 #undef HAVE_TERMIO