Remove needless smob.h includes

* libguile/continuations.c: Fix printer.
* libguile/async.c:
* libguile/debug.c:
* libguile/filesys.c:
* libguile/gc.c:
* libguile/init.c:
* libguile/inline.c:
* libguile/keywords.c:
* libguile/macros.c:
* libguile/modules.c:
* libguile/numbers.c:
* libguile/ports.c:
* libguile/srfi-14.c:
* libguile/symbols.c:
* libguile/threads.c:
* libguile/threads.h:
* libguile/variable.c: Remove smob.h includes.

libguile/async.c

@@ -1,4 +1,4 @@
-/* Copyright 1995-1998,2000-2002,2004,2006,2008-2011,2014,2018-2019
+/* Copyright 1995-1998,2000-2002,2004,2006,2008-2011,2014,2018-2019,2025
      Free Software Foundation, Inc.
 
    This file is part of Guile.
@@ -35,7 +35,6 @@
 #include "gsubr.h"
 #include "list.h"
 #include "pairs.h"
-#include "smob.h"
 #include "throw.h"
 
 #include "async.h"

libguile/continuations.c

@@ -48,7 +48,6 @@
 #include "pairs.h"
 #include "ports.h"
 #include "programs.h"
-#include "smob.h"
 #include "stackchk.h"
 #include "stacks.h"
 #include "symbols.h"
@@ -114,7 +113,7 @@ scm_i_print_continuation (SCM obj, SCM port, scm_print_state *state SCM_UNUSED)
   scm_puts ("#<continuation ", port);
   scm_intprint (continuation->num_stack_items, 10, port);
   scm_puts (" @ ", port);
-  scm_uintprint (SCM_SMOB_DATA_1 (obj), 16, port);
+  scm_uintprint (SCM_UNPACK (obj), 16, port);
   scm_putc ('>', port);
   return 1;
 }

libguile/debug.c

@@ -54,7 +54,6 @@
 #include "procprop.h"
 #include "programs.h"
 #include "read.h"
-#include "smob.h"
 #include "stackchk.h"
 #include "strports.h"
 #include "struct.h"

libguile/filesys.c

@@ -90,7 +90,6 @@
 #include "ports-internal.h"
 #include "ports.h"
 #include "posix.h"
-#include "smob.h"
 #include "srfi-13.h"
 #include "strings.h"
 #include "symbols.h"

libguile/gc.c

@@ -48,7 +48,6 @@
 #include "ports.h"
 #include "procs.h"
 #include "simpos.h"
-#include "smob.h"
 #include "stackchk.h"
 #include "stime.h"
 #include "strings.h"

libguile/init.c

@@ -370,15 +370,15 @@ scm_i_init_guile (struct gc_stack_addr base)
   scm_init_struct ();             /* Requires strings */
   scm_smob_prehistory ();
   scm_init_variable ();
-  scm_init_continuations ();      /* requires smob_prehistory */
+  scm_init_continuations ();
-  scm_init_threads ();            /* requires smob_prehistory */
+  scm_init_threads ();
   scm_init_gsubr ();
   scm_init_procprop ();
   scm_init_alist ();
-  scm_init_async ();              /* requires smob_prehistory */
+  scm_init_async ();
   scm_init_boolean ();
   scm_init_chars ();
-  scm_init_dynwind ();            /* requires smob_prehistory */
+  scm_init_dynwind ();
   scm_init_eq ();
   scm_init_error ();
   scm_init_fluids ();
@@ -397,16 +397,16 @@ scm_i_init_guile (struct gc_stack_addr base)
   scm_init_gc_protect_object ();  /* requires threads_prehistory */
   scm_init_gettext ();
   scm_init_ioext ();
-  scm_init_keywords ();    /* Requires smob_prehistory */
+  scm_init_keywords ();
   scm_init_fports_keywords ();
   scm_init_list ();
-  scm_init_random ();      /* Requires smob_prehistory */
+  scm_init_random ();
-  scm_init_macros ();      /* Requires smob_prehistory and random */
+  scm_init_macros ();      /* Requires random */
-  scm_init_modules ();     /* Requires smob_prehistory */
+  scm_init_modules ();
   scm_init_numbers ();
   scm_init_options ();
   scm_init_pairs ();
-  scm_init_filesys ();     /* Requires smob_prehistory */
+  scm_init_filesys ();
 #ifdef HAVE_POSIX
   scm_init_posix ();
 #endif
@@ -425,11 +425,11 @@ scm_i_init_guile (struct gc_stack_addr base)
   scm_init_generalized_vectors ();
   scm_init_vectors ();  /* Requires array-handle, */
   scm_init_uniform ();
-  scm_init_bitvectors ();  /* Requires smob_prehistory, array-handle */
+  scm_init_bitvectors ();  /* Requires array-handle */
-  scm_bootstrap_srfi_4 ();  /* Requires smob_prehistory, array-handle */
+  scm_bootstrap_srfi_4 ();  /* Requires array-handle */
-  scm_init_arrays ();    /* Requires smob_prehistory, array-handle */
+  scm_init_arrays ();    /* Requires array-handle */
 
-  scm_init_frames ();   /* Requires smob_prehistory */
+  scm_init_frames ();
   scm_init_stacks ();   /* Requires strings, struct, frames */
   scm_init_symbols ();
   scm_init_values ();   /* Requires struct */
@@ -438,22 +438,22 @@ scm_i_init_guile (struct gc_stack_addr base)
   scm_init_read ();
   scm_init_strorder ();
   scm_init_srfi_13 ();
-  scm_boot_srfi_14 ();  /* Requires smob_prehistory */
+  scm_boot_srfi_14 ();
   scm_init_exceptions ();
-  scm_init_throw ();    /* Requires smob_prehistory */
+  scm_init_throw ();
   scm_init_version ();
   scm_init_standard_ports ();  /* Requires fports */
   scm_init_expand ();   /* Requires structs */
-  scm_init_memoize ();  /* Requires smob_prehistory */
+  scm_init_memoize ();
-  scm_init_eval ();     /* Requires smob_prehistory */
+  scm_init_eval ();
   scm_init_load_path ();
   scm_init_eval_in_scheme ();
   scm_init_evalext ();
-  scm_init_debug ();	/* Requires macro smobs */
+  scm_init_debug ();
   scm_init_simpos ();
   scm_init_syntax ();
 #if HAVE_MODULES
-  scm_init_dynamic_linking (); /* Requires smob_prehistory */
+  scm_init_dynamic_linking ();
 #endif
   scm_bootstrap_i18n ();
   scm_init_script ();

libguile/inline.c

@@ -1,4 +1,4 @@
-/* Copyright 2001,2006,2008,2011-2013,2018-2019
+/* Copyright 2001,2006,2008,2011-2013,2018-2019,2025
      Free Software Foundation, Inc.
 
    This file is part of Guile.
@@ -29,5 +29,4 @@
 #include "gc.h"
 #include "pairs.h"
 #include "ports.h"
-#include "smob.h"
 #include "strings.h"

libguile/keywords.c

@@ -1,4 +1,4 @@
-/* Copyright 1995-2001,2003-2004,2006,2008-2009,2011,2013,2015,2018
+/* Copyright 1995-2001,2003-2004,2006,2008-2009,2011,2013,2015,2018,2025
      Free Software Foundation, Inc.
 
    This file is part of Guile.
@@ -33,7 +33,6 @@
 #include "list.h"
 #include "pairs.h"
 #include "ports.h"
-#include "smob.h"
 #include "strings.h"
 #include "symbols.h"
 

libguile/macros.c

@@ -31,7 +31,6 @@
 #include "private-options.h"
 #include "procs.h"
 #include "random.h"
-#include "smob.h"
 #include "symbols.h"
 #include "variable.h"
 

libguile/modules.c

@@ -1,4 +1,4 @@
-/* Copyright 1998,2000-2004,2006-2012,2017-2019
+/* Copyright 1998,2000-2004,2006-2012,2017-2019,2025
      Free Software Foundation, Inc.
 
    This file is part of Guile.
@@ -35,7 +35,6 @@
 #include "list.h"
 #include "pairs.h"
 #include "procprop.h"
-#include "smob.h"
 #include "struct.h"
 #include "symbols.h"
 #include "threads.h"

libguile/numbers.c

@@ -70,7 +70,6 @@
 #include "pairs.h"
 #include "ports.h"
 #include "simpos.h"
-#include "smob.h"
 #include "strings.h"
 #include "values.h"
 

libguile/ports.c

@@ -70,7 +70,6 @@
 #include "ports-internal.h"
 #include "private-options.h"
 #include "procs.h"
-#include "smob.h"
 #include "strings.h"
 #include "symbols.h"
 #include "syscalls.h"

libguile/srfi-14.c

@@ -37,7 +37,6 @@
 #include "pairs.h"
 #include "ports.h"
 #include "procs.h"
-#include "smob.h"
 #include "strings.h"
 #include "symbols.h"
 #include "values.h"

libguile/symbols.c

@@ -40,7 +40,6 @@
 #include "pairs.h"
 #include "private-options.h"
 #include "read.h"
-#include "smob.h"
 #include "srfi-13.h"
 #include "strings.h"
 #include "strorder.h"

libguile/threads.c

@@ -75,7 +75,7 @@
 
 
 #define SCM_MUTEXP(x)     SCM_HAS_TYP16 (x, scm_tc16_mutex)
-#define SCM_CONDVARP(x)       SCM_SMOB_PREDICATE (scm_tc16_condition_variable, x)
+#define SCM_CONDVARP(x)   SCM_HAS_TYP16 (x, scm_tc16_condition_variable)
 #define SCM_VALIDATE_CONDVAR(_pos, _obj)			\
   SCM_ASSERT_TYPE (SCM_CONDVARP (_obj), (_obj), (_pos), FUNC_NAME, "condvar")
 #define SCM_VALIDATE_MUTEX(_pos, _obj)			\

libguile/threads.h

@@ -26,7 +26,6 @@
 #include "libguile/throw.h"
 #include "libguile/dynstack.h"
 #include "libguile/iselect.h"
-#include "libguile/smob.h"
 #include "libguile/vm.h"
 
 #if SCM_USE_PTHREAD_THREADS

libguile/variable.c

@@ -1,4 +1,4 @@
-/* Copyright 1995-1998,2000-2001,2006,2008,2011,2018
+/* Copyright 1995-1998,2000-2001,2006,2008,2011,2018,2025
      Free Software Foundation, Inc.
 
    This file is part of Guile.
@@ -30,7 +30,6 @@
 #include "gsubr.h"
 #include "list.h"
 #include "ports.h"
-#include "smob.h"
 
 #include "variable.h"