4 files changed, 12 insertions, 11 deletions
diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
index 2e34bd81688..51b70baa9ca 100644
--- a/gdb/config/i386/i386lynx.mh
+++ b/gdb/config/i386/i386lynx.mh
@@ -1,6 +1,6 @@
 # Host: Intel 386 running Lynx
 XDEPFILES= 
-NATDEPFILES= exec.o fork-child.o infptrace.o inftarg.o corelow.o i386lynx-nat.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o i386lynx-nat.o
 XM_FILE= xm-i386lynx.h
 NAT_FILE= nm-i386lynx.h
 REGEX=regex.o
diff --git a/gdb/config/i386/i386lynx.mt b/gdb/config/i386/i386lynx.mt
index 0af5657a2e9..2b83ad9f6cb 100644
--- a/gdb/config/i386/i386lynx.mt
+++ b/gdb/config/i386/i386lynx.mt
@@ -1,3 +1,3 @@
 # Target: Intel 386 running Lynx
-TDEPFILES= i386-tdep.o i386-pinsn.o
+TDEPFILES= exec.o i386-tdep.o i386-pinsn.o i386lynx-tdep.o
 TM_FILE= tm-i386lynx.h
diff --git a/gdb/config/i386/nm-i386lynx.h b/gdb/config/i386/nm-i386lynx.h
index 3a2d318ef70..e67ec1dc9cb 100644
--- a/gdb/config/i386/nm-i386lynx.h
+++ b/gdb/config/i386/nm-i386lynx.h
@@ -20,6 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef NM_I386LYNX_H
 #define NM_I386LYNX_H
 
+#include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/mem.h>
 #include <sys/signal.h>
@@ -55,4 +56,13 @@ i386_register_u_addr PARAMS ((int, int));
 #define CHILD_WAIT
 extern int child_wait PARAMS ((int *status));
 
+/* Lynx needs a special definition of this so that we can
+   print out the pid and thread number seperatly.  */
+
+#undef target_pid_to_str
+
+#define target_pid_to_str(PID) \
+	i386lynx_pid_to_str (PID)
+extern char *i386lynx_pid_to_str PARAMS ((int pid));
+
 #endif /* NM_I386LYNX_H */
diff --git a/gdb/config/i386/tm-i386lynx.h b/gdb/config/i386/tm-i386lynx.h
index adf5c7c98d8..d5db133848a 100644
--- a/gdb/config/i386/tm-i386lynx.h
+++ b/gdb/config/i386/tm-i386lynx.h
@@ -31,13 +31,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define SAVED_PC_AFTER_CALL i386lynx_saved_pc_after_call
 CORE_ADDR i386lynx_saved_pc_after_call ();
 
-/* Lynx needs a special definition of this so that we can
-   print out the pid and thread number seperatly.  */
-
-#undef target_pid_to_str
-
-#define target_pid_to_str(PID) \
-	i386lynx_pid_to_str (PID)
-extern char *i386lynx_pid_to_str PARAMS ((int pid));
-
 #endif /* TM_I386LYNX_H */