diff --git a/asminc/module.mac b/asminc/module.mac
new file mode 100644
index 000000000..d844ec104
--- /dev/null
+++ b/asminc/module.mac
@@ -0,0 +1,13 @@
+.ifndef DYN_DRV
+        DYN_DRV = 1
+.endif
+
+.macro  module_header   module_label
+        .if DYN_DRV
+                .segment        "HEADER"
+        .else
+                .data
+                .export         module_label
+                module_label:
+        .endif
+.endmacro
diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index b222b4aac..32cf0b80b 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -4321,16 +4321,14 @@ The package defines the following macros:
 
 <sect1><tt>.MACPACK atari</tt><p>
 
-The atari macro package will define a macro named <tt/scrcode/. It takes a
-string as argument and places this string into memory translated into screen
-codes.
+This macro package defines a macro named <tt/scrcode/. It takes a string
+as argument and places this string into memory translated into screen codes.
 
 
 <sect1><tt>.MACPACK cbm</tt><p>
 
-The cbm macro package will define a macro named <tt/scrcode/. It takes a
-string as argument and places this string into memory translated into screen
-codes.
+This macro package defines a macro named <tt/scrcode/. It takes a string
+as argument and places this string into memory translated into screen codes.
 
 
 <sect1><tt>.MACPACK cpu</tt><p>
@@ -4386,6 +4384,13 @@ it is possible to determine if the
 instruction is supported, which is the case for the 65SC02, 65C02 and 65816
 CPUs (the latter two are upwards compatible to the 65SC02).
 
+  
+<sect1><tt>.MACPACK module</tt><p>
+
+This macro package defines a macro named <tt/module_header/. It takes an
+identifier as argument and is used to define the header of a module both
+in the dynamic and static variant.
+
 
 
 <sect>Predefined constants<label id="predefined-constants"><p>
diff --git a/libsrc/Makefile b/libsrc/Makefile
index 75e5c3681..6a801695a 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -207,38 +207,39 @@ endif
 define DRVTYPE_template
 
 $1_SRCDIR = $$(SRCDIR)/$1
-$1_OBJDIR = ../libwrk/$$(TARGET)/$1
+$1_STCDIR = ../libwrk/$$(TARGET)
+$1_DYNDIR = ../libwrk/$$(TARGET)/$1
 $1_DRVDIR = ../$1
 
-$1_OBJPAT = $$($1_OBJDIR)/$$(OBJPFX)%.o
+$1_SRCPAT = $$($1_SRCDIR)/$$(OBJPFX)%.s
+$1_STCPAT = $$($1_STCDIR)/$$(OBJPFX)%-$1.o
+$1_DYNPAT = $$($1_DYNDIR)/$$(OBJPFX)%.o
 $1_DRVPAT = $$($1_DRVDIR)/$$(DRVPFX)%.$1
-$1_STCPAT = ../libwrk/$$(TARGET)/$$(DRVPFX)%-$1.o
 
-$1_OBJS := $$(patsubst $$($1_SRCDIR)/%.s,$$($1_OBJDIR)/%.o,$$(wildcard $$($1_SRCDIR)/*.s))
+$1_SRCS := $$(wildcard $$($1_SRCDIR)/*.s)
+$1_STCS = $$(patsubst $$($1_SRCPAT),$$($1_STCPAT),$$($1_SRCS))
+$1_DYNS = $$(patsubst $$($1_SRCPAT),$$($1_DYNPAT),$$($1_SRCS))
+$1_DRVS = $$(patsubst $$($1_DYNPAT),$$($1_DRVPAT),$$($1_DYNS))
 
-$1_DRVS = $$(patsubst $$($1_OBJPAT),$$($1_DRVPAT),$$($1_OBJS))
+$$($1_STCPAT): $$($1_SRCPAT)
+	@echo $$(TARGET) - $$< - static
+	@$$(CA65) -t $$(TARGET) -D DYN_DRV=0 $$(CA65FLAGS) --create-dep $$(@:.o=.d) -o $$@ $$<
 
-$1_STCS = $$(patsubst $$($1_DRVPAT),$$($1_STCPAT),$$($1_DRVS))
+OBJS += $$($1_STCS)
+DEPS += $$($1_STCS:.o=.d)
 
-$$($1_OBJS): | $$($1_OBJDIR)
+$$($1_DYNS): | $$($1_DYNDIR)
 
-$$($1_DRVPAT): $$($1_OBJPAT) $$(ZPOBJ) | $$($1_DRVDIR)
+$$($1_DRVPAT): $$($1_DYNPAT) $$(ZPOBJ) | $$($1_DRVDIR)
 	@echo $$(TARGET) - $$(<F)
 	@$$(LD65) -o $$@ -t module $$^
 
-$$($1_OBJDIR) $$($1_DRVDIR):
+$$($1_DYNDIR) $$($1_DRVDIR):
 	@$$(call MKDIR,$$@)
 
 $(TARGET): $$($1_DRVS)
 
-$$($1_STCPAT): $$($1_DRVPAT)
-	@echo $$(TARGET) - $$(<F)
-	@$$(CO65) -o $$(@:.o=.s) --code-label _$$(subst -,_,$$(subst .,_,$$(<F))) $$<
-	@$$(CA65) -t $$(TARGET) -o $$@ $$(@:.o=.s)
-
-OBJS += $$($1_STCS)
-
-DEPS += $$($1_OBJS:.o=.d)
+DEPS += $$($1_DYNS:.o=.d)
 
 endef # DRVTYPE_template
 
@@ -247,7 +248,6 @@ $(foreach drvtype,$(DRVTYPES),$(eval $(call DRVTYPE_template,$(drvtype))))
 AR65 := $(if $(wildcard ../bin/ar65*),../bin/ar65,ar65)
 CA65 := $(if $(wildcard ../bin/ca65*),../bin/ca65,ca65)
 CC65 := $(if $(wildcard ../bin/cc65*),../bin/cc65,cc65)
-CO65 := $(if $(wildcard ../bin/co65*),../bin/co65,co65)
 LD65 := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
 
 export CC65_HOME := $(abspath ..)
diff --git a/libsrc/apple2/emd/a2.auxmem.s b/libsrc/apple2/emd/a2.auxmem.s
index b48090638..5ef2564b1 100644
--- a/libsrc/apple2/emd/a2.auxmem.s
+++ b/libsrc/apple2/emd/a2.auxmem.s
@@ -10,10 +10,16 @@
         .include        "em-kernel.inc"
         .include        "em-error.inc"
 
+        .macpack        module
+
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        .ifdef  __APPLE2ENH__
+        module_header   _a2e_auxmem_emd
+        .else
+        module_header   _a2_auxmem_emd
+        .endif
 
 ; Driver signature
 
diff --git a/libsrc/apple2/joy/a2.stdjoy.s b/libsrc/apple2/joy/a2.stdjoy.s
index f82616275..e4097e043 100644
--- a/libsrc/apple2/joy/a2.stdjoy.s
+++ b/libsrc/apple2/joy/a2.stdjoy.s
@@ -13,6 +13,8 @@
         .include        "joy-error.inc"
         .include        "apple2.inc"
 
+        .macpack        module
+
 ; ------------------------------------------------------------------------
 
 ; Constants
@@ -29,7 +31,11 @@ PREAD   :=      $FB1E   ; Read paddle in X, return AD conv. value in Y
 
 ; Header. Includes jump table.
 
-        .segment        "HEADER"
+        .ifdef  __APPLE2ENH__
+        module_header   _a2e_stdjoy_joy
+        .else
+        module_header   _a2_stdjoy_joy
+        .endif
 
 ; Driver signature
 
diff --git a/libsrc/apple2/mou/a2.stdmou.s b/libsrc/apple2/mou/a2.stdmou.s
index cb2f35fd5..c3d10f057 100644
--- a/libsrc/apple2/mou/a2.stdmou.s
+++ b/libsrc/apple2/mou/a2.stdmou.s
@@ -8,6 +8,8 @@
         .include        "mouse-kernel.inc"
         .include        "apple2.inc"
 
+        .macpack        module
+
 ; ------------------------------------------------------------------------
 
 SETMOUSE        = $12   ; Sets mouse mode
@@ -28,7 +30,11 @@ status          := $0778
 
 ; ------------------------------------------------------------------------
 
-        .segment        "HEADER"
+        .ifdef  __APPLE2ENH__
+        module_header   _a2e_stdmou_mou
+        .else
+        module_header   _a2_stdmou_mou
+        .endif
 
         ; Driver signature
         .byte   $6D, $6F, $75           ; "mou"
diff --git a/libsrc/apple2/ser/a2.ssc.s b/libsrc/apple2/ser/a2.ssc.s
index 6cd8d65fe..d5c567165 100644
--- a/libsrc/apple2/ser/a2.ssc.s
+++ b/libsrc/apple2/ser/a2.ssc.s
@@ -25,10 +25,16 @@
         .include        "ser-kernel.inc"
         .include        "ser-error.inc"
 
+        .macpack        module
+
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment        "HEADER"
+        .ifdef  __APPLE2ENH__
+        module_header   _a2e_ssc_ser
+        .else
+        module_header   _a2_ssc_ser
+        .endif
 
         ; Driver signature
         .byte   $73, $65, $72           ; "ser"
diff --git a/libsrc/apple2/tgi/a2.hi.s b/libsrc/apple2/tgi/a2.hi.s
index 6454e1972..18f5724b5 100644
--- a/libsrc/apple2/tgi/a2.hi.s
+++ b/libsrc/apple2/tgi/a2.hi.s
@@ -11,6 +11,8 @@
         .include        "tgi-error.inc"
         .include        "apple2.inc"
 
+        .macpack        module
+
 ; ------------------------------------------------------------------------
 
 ; Zero page stuff
@@ -68,7 +70,11 @@ Y2      :=      ptr4
 
 ; ------------------------------------------------------------------------
 
-        .segment        "HEADER"
+        .ifdef  __APPLE2ENH__
+        module_header   _a2e_hi_tgi
+        .else
+        module_header   _a2_hi_tgi
+        .endif
 
 ; Header. Includes jump table and constants.
 
diff --git a/libsrc/apple2/tgi/a2.lo.s b/libsrc/apple2/tgi/a2.lo.s
index d7d53d255..045b0044f 100644
--- a/libsrc/apple2/tgi/a2.lo.s
+++ b/libsrc/apple2/tgi/a2.lo.s
@@ -11,6 +11,8 @@
         .include        "tgi-error.inc"
         .include        "apple2.inc"
 
+        .macpack        module
+
 ; ------------------------------------------------------------------------
 
 ; Zero page stuff
@@ -38,7 +40,11 @@ Y2      :=      ptr4
 
 ; ------------------------------------------------------------------------
 
-        .segment        "HEADER"
+        .ifdef  __APPLE2ENH__
+        module_header   _a2e_lo_tgi
+        .else
+        module_header   _a2_lo_tgi
+        .endif
 
 ; Header. Includes jump table and constants.
 
diff --git a/libsrc/atari/emd/atr130.s b/libsrc/atari/emd/atr130.s
index 7082609bb..f2d5777d5 100644
--- a/libsrc/atari/emd/atr130.s
+++ b/libsrc/atari/emd/atr130.s
@@ -31,12 +31,17 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+.ifdef __ATARIXL__
+        module_header   _atrx130_emd
+.else
+        module_header   _atr130_emd
+.endif
 
 ; Driver signature
 
diff --git a/libsrc/atari/joy/atrmj8.s b/libsrc/atari/joy/atrmj8.s
index 6aa3eda15..46766070b 100644
--- a/libsrc/atari/joy/atrmj8.s
+++ b/libsrc/atari/joy/atrmj8.s
@@ -14,12 +14,17 @@
         .include        "atari.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+.ifdef __ATARIXL__
+        module_header   _atrxmj8_joy
+.else
+        module_header   _atrmj8_joy
+.endif
 
 ; Driver signature
 
diff --git a/libsrc/atari/joy/atrstd.s b/libsrc/atari/joy/atrstd.s
index f2331aa9a..fc7aa55f4 100644
--- a/libsrc/atari/joy/atrstd.s
+++ b/libsrc/atari/joy/atrstd.s
@@ -13,12 +13,17 @@
         .include        "atari.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+.ifdef __ATARIXL__
+        module_header   _atrxstd_joy
+.else
+        module_header   _atrstd_joy
+.endif
 
 ; Driver signature
 
diff --git a/libsrc/atari/mou/atrjoy.s b/libsrc/atari/mou/atrjoy.s
index 2f77ac8db..7f1085fb8 100644
--- a/libsrc/atari/mou/atrjoy.s
+++ b/libsrc/atari/mou/atrjoy.s
@@ -10,11 +10,16 @@
         .include        "atari.inc"
 
         .macpack        generic
+        .macpack        module
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+.ifdef __ATARIXL__
+        module_header   _atrxjoy_mou
+.else
+        module_header   _atrjoy_mou
+.endif
 
 HEADER:
 
diff --git a/libsrc/atari/mou/atrst.s b/libsrc/atari/mou/atrst.s
index 4f475f9b6..17d2affb5 100644
--- a/libsrc/atari/mou/atrst.s
+++ b/libsrc/atari/mou/atrst.s
@@ -23,6 +23,7 @@ DISABLE_TIMEOUT =       30              ; # of vertical blank interrupts after w
         .include        "atari.inc"
 
         .macpack        generic
+        .macpack        module
 
 .if .not ( .defined (AMIGA_MOUSE) .or .defined (TRAK_MOUSE))
         ST_MOUSE = 1
@@ -31,7 +32,31 @@ DISABLE_TIMEOUT =       30              ; # of vertical blank interrupts after w
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+.if .defined (ST_MOUSE)
+
+.ifdef __ATARIXL__
+        module_header   _atrxst_mou
+.else
+        module_header   _atrst_mou
+.endif
+
+.elseif .defined (AMIGA_MOUSE)
+
+.ifdef __ATARIXL__
+        module_header   _atrxami_mou
+.else
+        module_header   _atrami_mou
+.endif
+
+.elseif .defined (TRAK_MOUSE)
+
+.ifdef __ATARIXL__
+        module_header   _atrxtrk_mou
+.else
+        module_header   _atrtrk_mou
+.endif
+
+.endif
 
 HEADER:
 
diff --git a/libsrc/atari/mou/atrtt.s b/libsrc/atari/mou/atrtt.s
index 56f62636c..f1f2cde63 100644
--- a/libsrc/atari/mou/atrtt.s
+++ b/libsrc/atari/mou/atrtt.s
@@ -9,11 +9,16 @@
         .include        "atari.inc"
 
         .macpack        generic
+        .macpack        module
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+.ifdef __ATARIXL__
+        module_header   _atrxtt_mou
+.else
+        module_header   _atrtt_mou
+.endif
 
 HEADER:
 
diff --git a/libsrc/atari/ser/atrrdev.s b/libsrc/atari/ser/atrrdev.s
index 714d3edb6..3a7bc21c2 100644
--- a/libsrc/atari/ser/atrrdev.s
+++ b/libsrc/atari/ser/atrrdev.s
@@ -10,11 +10,17 @@
         .include        "ser-error.inc"
         .include        "atari.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+.ifdef __ATARIXL__
+        module_header   _atrxrdev_ser
+.else
+        module_header   _atrrdev_ser
+.endif
 
 ; Driver signature
 
diff --git a/libsrc/atari/tgi/atari_tgi_common.inc b/libsrc/atari/tgi/atari_tgi_common.inc
index 5d45e495c..f4ef68165 100644
--- a/libsrc/atari/tgi/atari_tgi_common.inc
+++ b/libsrc/atari/tgi/atari_tgi_common.inc
@@ -3,6 +3,7 @@
 ;
 
 .macpack longbranch
+.macpack module
 
 .ifdef __ATARIXL__
         CIO_vec := my_CIOV
@@ -18,7 +19,19 @@
         ;
         ; ----------------------------------------------------------------------
 
-.segment        "HEADER"
+.ifdef __ATARIXL__
+        .define LABEL_X "x"
+.else
+        .define LABEL_X ""
+.endif
+
+.if pages = 2
+        .define LABEL_P2 "p2"
+.else
+        .define LABEL_P2 ""
+.endif
+
+        module_header   .ident (.sprintf ("_atr%s%d%s_tgi", LABEL_X, ::grmode, LABEL_P2))
 
 ; Header
 
diff --git a/libsrc/atari5200/joy/atr5200std.s b/libsrc/atari5200/joy/atr5200std.s
index 890e1ff61..3483cc11a 100644
--- a/libsrc/atari5200/joy/atr5200std.s
+++ b/libsrc/atari5200/joy/atr5200std.s
@@ -10,11 +10,13 @@
         .include        "joy-error.inc"
         .include        "atari5200.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _atr5200std_joy
 
 ; Driver signature
 
diff --git a/libsrc/atmos/joy/atmos-pase.s b/libsrc/atmos/joy/atmos-pase.s
index 920fa1698..26d7c74d8 100644
--- a/libsrc/atmos/joy/atmos-pase.s
+++ b/libsrc/atmos/joy/atmos-pase.s
@@ -11,11 +11,13 @@
         .include        "joy-error.inc"
         .include        "atmos.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _atmos_pase_joy
 
 ; Driver signature
 
diff --git a/libsrc/atmos/ser/atmos-acia.s b/libsrc/atmos/ser/atmos-acia.s
index 20bea595f..79fbc1bbe 100644
--- a/libsrc/atmos/ser/atmos-acia.s
+++ b/libsrc/atmos/ser/atmos-acia.s
@@ -28,10 +28,13 @@
         .include        "ser-error.inc"
         .include        "atmos.inc"
 
+        .macpack        module
+
+
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment        "HEADER"
+        module_header   _atmos_acia_ser
 
         ; Driver signature
         .byte   $73, $65, $72           ; "ser"
diff --git a/libsrc/atmos/tgi/atmos-228-200-3.s b/libsrc/atmos/tgi/atmos-228-200-3.s
index f00f502f7..30b7ca65f 100644
--- a/libsrc/atmos/tgi/atmos-228-200-3.s
+++ b/libsrc/atmos/tgi/atmos-228-200-3.s
@@ -12,6 +12,7 @@
         .include        "atmos.inc"
 
         .macpack        generic
+        .macpack        module
 
 XSIZE   =       6               ; System font width
 YSIZE   =       8               ; System font height
@@ -19,7 +20,7 @@ YSIZE   =       8               ; System font height
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _atmos_228_200_3_tgi
 
 ; The first part of the header is a structure that has a signature,
 ; and defines the capabilities of the driver.
diff --git a/libsrc/atmos/tgi/atmos-240-200-2.s b/libsrc/atmos/tgi/atmos-240-200-2.s
index 7c4c05b78..600d93193 100644
--- a/libsrc/atmos/tgi/atmos-240-200-2.s
+++ b/libsrc/atmos/tgi/atmos-240-200-2.s
@@ -12,6 +12,7 @@
         .include        "atmos.inc"
 
         .macpack        generic
+        .macpack        module
 
 XSIZE   =       6                       ; System font width
 YSIZE   =       8                       ; System font height
@@ -19,7 +20,7 @@ YSIZE   =       8                       ; System font height
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _atmos_240_200_2_tgi
 
 ; First part of the header is a structure that has a magic and defines the
 ; capabilities of the driver
diff --git a/libsrc/c128/emd/c128-georam.s b/libsrc/c128/emd/c128-georam.s
index 23ae86852..7511c6841 100644
--- a/libsrc/c128/emd/c128-georam.s
+++ b/libsrc/c128/emd/c128-georam.s
@@ -13,14 +13,14 @@
         .include        "em-kernel.inc"
         .include        "em-error.inc"
 
-
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_georam_emd
 
 ; Driver signature
 
diff --git a/libsrc/c128/emd/c128-ram.s b/libsrc/c128/emd/c128-ram.s
index bd1984333..bef0a15ee 100644
--- a/libsrc/c128/emd/c128-ram.s
+++ b/libsrc/c128/emd/c128-ram.s
@@ -11,14 +11,14 @@
         .include        "em-error.inc"
         .include        "c128.inc"
 
-
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_ram_emd
 
 ; Driver signature
 
diff --git a/libsrc/c128/emd/c128-ram2.s b/libsrc/c128/emd/c128-ram2.s
index d15b794f6..7d2703fa5 100644
--- a/libsrc/c128/emd/c128-ram2.s
+++ b/libsrc/c128/emd/c128-ram2.s
@@ -14,14 +14,14 @@
         .include        "em-error.inc"
         .include        "c128.inc"
 
-
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_ram2_emd
 
 ; Driver signature
 
diff --git a/libsrc/c128/emd/c128-ramcart.s b/libsrc/c128/emd/c128-ramcart.s
index 2d632a869..e72d053ac 100644
--- a/libsrc/c128/emd/c128-ramcart.s
+++ b/libsrc/c128/emd/c128-ramcart.s
@@ -12,14 +12,14 @@
         .include        "em-kernel.inc"
         .include        "em-error.inc"
 
-
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_ramcart_emd
 
 ; Driver signature
 
diff --git a/libsrc/c128/emd/c128-reu.s b/libsrc/c128/emd/c128-reu.s
index 786974f4d..a858c591e 100644
--- a/libsrc/c128/emd/c128-reu.s
+++ b/libsrc/c128/emd/c128-reu.s
@@ -11,14 +11,14 @@
         .include        "em-error.inc"
         .include        "c128.inc"
 
-
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_reu_emd
 
 ; Driver signature
 
diff --git a/libsrc/c128/emd/c128-vdc.s b/libsrc/c128/emd/c128-vdc.s
index af7dfaf02..d915fdf25 100644
--- a/libsrc/c128/emd/c128-vdc.s
+++ b/libsrc/c128/emd/c128-vdc.s
@@ -9,14 +9,14 @@
         .include        "em-kernel.inc"
         .include        "em-error.inc"
 
-
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_vdc_emd
 
 ; Driver signature
 
diff --git a/libsrc/c128/joy/c128-ptvjoy.s b/libsrc/c128/joy/c128-ptvjoy.s
index 3490a0217..6f65ce5eb 100644
--- a/libsrc/c128/joy/c128-ptvjoy.s
+++ b/libsrc/c128/joy/c128-ptvjoy.s
@@ -13,11 +13,13 @@
         .include "c128.inc"
 
         .macpack generic
+        .macpack module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment "HEADER"
+        module_header   _c128_ptvjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/c128/joy/c128-stdjoy.s b/libsrc/c128/joy/c128-stdjoy.s
index 7694f23a0..119d3784f 100644
--- a/libsrc/c128/joy/c128-stdjoy.s
+++ b/libsrc/c128/joy/c128-stdjoy.s
@@ -13,12 +13,13 @@
         .include        "c128.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_stdjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/c128/mou/c128-1351.s b/libsrc/c128/mou/c128-1351.s
index 8469ba8e3..d06e942c4 100644
--- a/libsrc/c128/mou/c128-1351.s
+++ b/libsrc/c128/mou/c128-1351.s
@@ -12,11 +12,13 @@
         .include        "c128.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_1351_mou
 
 HEADER:
 
diff --git a/libsrc/c128/mou/c128-inkwell.s b/libsrc/c128/mou/c128-inkwell.s
index f7b844f4d..8583e4bfe 100644
--- a/libsrc/c128/mou/c128-inkwell.s
+++ b/libsrc/c128/mou/c128-inkwell.s
@@ -10,11 +10,13 @@
         .include        "c128.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table.
 
-.segment        "HEADER"
+        module_header   _c128_inkwell_mou
 
 HEADER:
 
diff --git a/libsrc/c128/mou/c128-joy.s b/libsrc/c128/mou/c128-joy.s
index 2bedd772e..7718b89b7 100644
--- a/libsrc/c128/mou/c128-joy.s
+++ b/libsrc/c128/mou/c128-joy.s
@@ -11,11 +11,13 @@
         .include        "c128.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_joy_mou
 
 HEADER:
 
diff --git a/libsrc/c128/mou/c128-pot.s b/libsrc/c128/mou/c128-pot.s
index 3d5dd6fe4..f61f88d5d 100644
--- a/libsrc/c128/mou/c128-pot.s
+++ b/libsrc/c128/mou/c128-pot.s
@@ -12,11 +12,13 @@
         .include        "c128.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_pot_mou
 
 HEADER:
 
diff --git a/libsrc/c128/ser/c128-swlink.s b/libsrc/c128/ser/c128-swlink.s
index 89bf2f072..98411d4f8 100644
--- a/libsrc/c128/ser/c128-swlink.s
+++ b/libsrc/c128/ser/c128-swlink.s
@@ -26,11 +26,13 @@
         .include        "ser-error.inc"
         .include        "c128.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c128_swlink_ser
 
 ; Driver signature
 
diff --git a/libsrc/c128/tgi/c128-vdc.s b/libsrc/c128/tgi/c128-vdc.s
index aaf022deb..5100f7f7d 100644
--- a/libsrc/c128/tgi/c128-vdc.s
+++ b/libsrc/c128/tgi/c128-vdc.s
@@ -25,8 +25,9 @@
         .include        "tgi-kernel.inc"
         .include        "tgi-error.inc"
 
-
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Constants
@@ -48,7 +49,7 @@ VDC_DATA          = 31
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _c128_vdc_tgi
 
 ; First part of the header is a structure that has a magic and defines the
 ; capabilities of the driver
diff --git a/libsrc/c128/tgi/c128-vdc2.s b/libsrc/c128/tgi/c128-vdc2.s
index 1f293da41..a7238e877 100644
--- a/libsrc/c128/tgi/c128-vdc2.s
+++ b/libsrc/c128/tgi/c128-vdc2.s
@@ -26,8 +26,9 @@
         .include        "tgi-kernel.inc"
         .include        "tgi-error.inc"
 
-
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Constants
@@ -49,7 +50,7 @@ VDC_DATA          = 31
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _c128_vdc2_tgi
 
 ; First part of the header is a structure that has a magic and defines the
 ; capabilities of the driver
diff --git a/libsrc/c16/emd/c16-ram.s b/libsrc/c16/emd/c16-ram.s
index fd1a16831..a8083aca4 100644
--- a/libsrc/c16/emd/c16-ram.s
+++ b/libsrc/c16/emd/c16-ram.s
@@ -12,12 +12,13 @@
         .include        "plus4.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c16_ram_emd
 
 ; Driver signature
 
diff --git a/libsrc/c16/joy/c16-stdjoy.s b/libsrc/c16/joy/c16-stdjoy.s
index 54ba47e19..0b99d93a3 100644
--- a/libsrc/c16/joy/c16-stdjoy.s
+++ b/libsrc/c16/joy/c16-stdjoy.s
@@ -5,5 +5,6 @@
 ; Ullrich von Bassewitz, 2002-12-21
 ;
 
-        .include        "../../plus4/joy/plus4-stdjoy.s"
+        .define         MODULE_LABEL    _c16_stdjoy_joy
 
+        .include        "../../plus4/joy/plus4-stdjoy.s"
diff --git a/libsrc/c64/emd/c64-c256k.s b/libsrc/c64/emd/c64-c256k.s
index 4996aca22..79706e8fb 100644
--- a/libsrc/c64/emd/c64-c256k.s
+++ b/libsrc/c64/emd/c64-c256k.s
@@ -10,12 +10,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_c256k_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/c64-dqbb.s b/libsrc/c64/emd/c64-dqbb.s
index 479f06b60..986c5939d 100644
--- a/libsrc/c64/emd/c64-dqbb.s
+++ b/libsrc/c64/emd/c64-dqbb.s
@@ -10,12 +10,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_dqbb_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/c64-georam.s b/libsrc/c64/emd/c64-georam.s
index 23ae86852..97f1a7cc4 100644
--- a/libsrc/c64/emd/c64-georam.s
+++ b/libsrc/c64/emd/c64-georam.s
@@ -15,12 +15,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_georam_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/c64-isepic.s b/libsrc/c64/emd/c64-isepic.s
index cb084864f..3764443e2 100644
--- a/libsrc/c64/emd/c64-isepic.s
+++ b/libsrc/c64/emd/c64-isepic.s
@@ -10,12 +10,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_isepic_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/c64-ram.s b/libsrc/c64/emd/c64-ram.s
index 54542636c..f8a4a1819 100644
--- a/libsrc/c64/emd/c64-ram.s
+++ b/libsrc/c64/emd/c64-ram.s
@@ -12,12 +12,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_ram_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/c64-ramcart.s b/libsrc/c64/emd/c64-ramcart.s
index 9c9c53e3b..8998bb6d6 100644
--- a/libsrc/c64/emd/c64-ramcart.s
+++ b/libsrc/c64/emd/c64-ramcart.s
@@ -14,12 +14,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_ramcart_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/c64-reu.s b/libsrc/c64/emd/c64-reu.s
index 4d9888e48..0779505be 100644
--- a/libsrc/c64/emd/c64-reu.s
+++ b/libsrc/c64/emd/c64-reu.s
@@ -12,12 +12,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_reu_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/c64-vdc.s b/libsrc/c64/emd/c64-vdc.s
index 3d9da3064..2448f09d4 100644
--- a/libsrc/c64/emd/c64-vdc.s
+++ b/libsrc/c64/emd/c64-vdc.s
@@ -15,12 +15,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_vdc_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/emd/dtv-himem.s b/libsrc/c64/emd/dtv-himem.s
index 1354ff12e..6dde874f7 100644
--- a/libsrc/c64/emd/dtv-himem.s
+++ b/libsrc/c64/emd/dtv-himem.s
@@ -14,12 +14,13 @@
 
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _dtv_himem_emd
 
 ; Driver signature
 
diff --git a/libsrc/c64/joy/c64-hitjoy.s b/libsrc/c64/joy/c64-hitjoy.s
index 0bde0b320..a798100a7 100644
--- a/libsrc/c64/joy/c64-hitjoy.s
+++ b/libsrc/c64/joy/c64-hitjoy.s
@@ -12,11 +12,13 @@
         .include "c64.inc"
 
         .macpack generic
+        .macpack module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment "HEADER"
+        module_header   _c64_hitjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/c64/joy/c64-numpad.s b/libsrc/c64/joy/c64-numpad.s
index 1d89dc051..5f6464215 100644
--- a/libsrc/c64/joy/c64-numpad.s
+++ b/libsrc/c64/joy/c64-numpad.s
@@ -13,12 +13,13 @@
         .include        "c64.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_numpad_joy
 
 ; Driver signature
 
diff --git a/libsrc/c64/joy/c64-ptvjoy.s b/libsrc/c64/joy/c64-ptvjoy.s
index 2bfe7fd5d..31850488c 100644
--- a/libsrc/c64/joy/c64-ptvjoy.s
+++ b/libsrc/c64/joy/c64-ptvjoy.s
@@ -12,11 +12,13 @@
         .include "c64.inc"
 
         .macpack generic
+        .macpack module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment "HEADER"
+        module_header   _c64_ptvjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/c64/joy/c64-stdjoy.s b/libsrc/c64/joy/c64-stdjoy.s
index b9d6845da..2932c77fd 100644
--- a/libsrc/c64/joy/c64-stdjoy.s
+++ b/libsrc/c64/joy/c64-stdjoy.s
@@ -12,12 +12,13 @@
         .include        "c64.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_stdjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/c64/mou/c64-1351.s b/libsrc/c64/mou/c64-1351.s
index 9fbbff296..a7d042c7b 100644
--- a/libsrc/c64/mou/c64-1351.s
+++ b/libsrc/c64/mou/c64-1351.s
@@ -29,11 +29,13 @@
         .include        "c64.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_1351_mou
 
 HEADER:
 
diff --git a/libsrc/c64/mou/c64-inkwell.s b/libsrc/c64/mou/c64-inkwell.s
index 52dd114a4..a48d7d15e 100644
--- a/libsrc/c64/mou/c64-inkwell.s
+++ b/libsrc/c64/mou/c64-inkwell.s
@@ -9,11 +9,13 @@
         .include        "c64.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table.
 
-.segment        "HEADER"
+        module_header   _c64_inkwell_mou
 
 HEADER:
 
diff --git a/libsrc/c64/mou/c64-joy.s b/libsrc/c64/mou/c64-joy.s
index 37276c792..f2a501000 100644
--- a/libsrc/c64/mou/c64-joy.s
+++ b/libsrc/c64/mou/c64-joy.s
@@ -28,11 +28,13 @@
         .include        "c64.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_joy_mou
 
 HEADER:
 
diff --git a/libsrc/c64/mou/c64-pot.s b/libsrc/c64/mou/c64-pot.s
index 0906b6245..102ca351c 100644
--- a/libsrc/c64/mou/c64-pot.s
+++ b/libsrc/c64/mou/c64-pot.s
@@ -11,11 +11,13 @@
         .include        "c64.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_pot_mou
 
 HEADER:
 
diff --git a/libsrc/c64/ser/c64-swlink.s b/libsrc/c64/ser/c64-swlink.s
index 4751a24ae..813067239 100644
--- a/libsrc/c64/ser/c64-swlink.s
+++ b/libsrc/c64/ser/c64-swlink.s
@@ -26,11 +26,13 @@
         .include        "ser-error.inc"
         .include        "c64.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _c64_swlink_ser
 
 ; Driver signature
 
diff --git a/libsrc/c64/tgi/c64-hi.s b/libsrc/c64/tgi/c64-hi.s
index a6f50649a..6d33f00a8 100644
--- a/libsrc/c64/tgi/c64-hi.s
+++ b/libsrc/c64/tgi/c64-hi.s
@@ -9,14 +9,14 @@
         .include        "tgi-kernel.inc"
         .include        "tgi-error.inc"
 
-
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _c64_hi_tgi
 
 ; First part of the header is a structure that has a magic and defines the
 ; capabilities of the driver
diff --git a/libsrc/cbm510/emd/cbm510-ram.s b/libsrc/cbm510/emd/cbm510-ram.s
index 063489cd0..f724c7360 100644
--- a/libsrc/cbm510/emd/cbm510-ram.s
+++ b/libsrc/cbm510/emd/cbm510-ram.s
@@ -12,12 +12,13 @@
         .include        "cbm510.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _cbm510_ram_emd
 
 ; Driver signature
 
diff --git a/libsrc/cbm510/joy/cbm510-std.s b/libsrc/cbm510/joy/cbm510-std.s
index a9fe7cb69..7133f9379 100644
--- a/libsrc/cbm510/joy/cbm510-std.s
+++ b/libsrc/cbm510/joy/cbm510-std.s
@@ -13,12 +13,13 @@
         .include        "cbm510.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _cbm510_std_joy
 
 ; Driver signature
 
diff --git a/libsrc/cbm510/mou/cbm510-inkwl.s b/libsrc/cbm510/mou/cbm510-inkwl.s
index 50af974dd..b17f6408a 100644
--- a/libsrc/cbm510/mou/cbm510-inkwl.s
+++ b/libsrc/cbm510/mou/cbm510-inkwl.s
@@ -13,11 +13,13 @@
         .include        "cbm510.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table.
 
-.segment        "HEADER"
+        module_header   _cbm510_inkwl_mou
 
 HEADER:
 
diff --git a/libsrc/cbm510/mou/cbm510-joy.s b/libsrc/cbm510/mou/cbm510-joy.s
index 3ea1b5e11..af53b7c23 100644
--- a/libsrc/cbm510/mou/cbm510-joy.s
+++ b/libsrc/cbm510/mou/cbm510-joy.s
@@ -12,11 +12,13 @@
         .include        "cbm510.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _cbm510_joy_mou
 
 HEADER:
 
diff --git a/libsrc/cbm510/ser/cbm510-std.s b/libsrc/cbm510/ser/cbm510-std.s
index d3067a9e9..7629892e0 100644
--- a/libsrc/cbm510/ser/cbm510-std.s
+++ b/libsrc/cbm510/ser/cbm510-std.s
@@ -27,11 +27,13 @@
         .include        "ser-error.inc"
         .include        "cbm510.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _cbm510_std_ser
 
 ; Driver signature
 
diff --git a/libsrc/cbm610/emd/cbm610-ram.s b/libsrc/cbm610/emd/cbm610-ram.s
index 5b8906cd2..5c67df7a4 100644
--- a/libsrc/cbm610/emd/cbm610-ram.s
+++ b/libsrc/cbm610/emd/cbm610-ram.s
@@ -12,12 +12,13 @@
         .include        "cbm610.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _cbm610_ram_emd
 
 ; Driver signature
 
diff --git a/libsrc/cbm610/ser/cbm610-std.s b/libsrc/cbm610/ser/cbm610-std.s
index 9e2992023..1b2d38aa5 100644
--- a/libsrc/cbm610/ser/cbm610-std.s
+++ b/libsrc/cbm610/ser/cbm610-std.s
@@ -27,11 +27,13 @@
         .include        "ser-error.inc"
         .include        "cbm610.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _cbm610_std_ser
 
 ; Driver signature
 
diff --git a/libsrc/geos-cbm/emd/geos-vdc.s b/libsrc/geos-cbm/emd/geos-vdc.s
index 0e94ce207..791d2a0a8 100644
--- a/libsrc/geos-cbm/emd/geos-vdc.s
+++ b/libsrc/geos-cbm/emd/geos-vdc.s
@@ -10,11 +10,13 @@
             .include "em-error.inc"
 
             .macpack generic
+            .macpack module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _geos_vdc_emd
 
 ; Driver signature
 
diff --git a/libsrc/geos-cbm/joy/geos-stdjoy.s b/libsrc/geos-cbm/joy/geos-stdjoy.s
index fd62d3306..6afe46092 100644
--- a/libsrc/geos-cbm/joy/geos-stdjoy.s
+++ b/libsrc/geos-cbm/joy/geos-stdjoy.s
@@ -11,12 +11,14 @@
             .include "geossym.inc"
 
             .macpack generic
+            .macpack module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
-                                             
+        module_header   _geos_stdjoy_joy
+
 ; Driver signature
 
         .byte $6A, $6F, $79     ; "joy"
diff --git a/libsrc/geos-cbm/tgi/geos-tgi.s b/libsrc/geos-cbm/tgi/geos-tgi.s
index de2bf51fc..5a1af65e4 100644
--- a/libsrc/geos-cbm/tgi/geos-tgi.s
+++ b/libsrc/geos-cbm/tgi/geos-tgi.s
@@ -10,8 +10,10 @@
             .include "jumptab.inc"
             .include "geossym.inc"
             .include "geossym2.inc"
-            
+
             .macpack generic
+            .macpack module
+
 
 ; ------------------------------------------------------------------------
 ; Constants
@@ -33,7 +35,7 @@ VDC_DATA        = 31
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _geos_tgi_tgi
 
 ; First part of the header is a structure that has a magic signature,
 ; and defines the capabilities of the driver.
diff --git a/libsrc/lynx/joy/lynx-stdjoy.s b/libsrc/lynx/joy/lynx-stdjoy.s
index 6535ce553..114647072 100644
--- a/libsrc/lynx/joy/lynx-stdjoy.s
+++ b/libsrc/lynx/joy/lynx-stdjoy.s
@@ -14,12 +14,13 @@
         .include        "lynx.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _lynx_stdjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/lynx/ser/lynx-comlynx.s b/libsrc/lynx/ser/lynx-comlynx.s
index 50c685db9..1fd24ad94 100644
--- a/libsrc/lynx/ser/lynx-comlynx.s
+++ b/libsrc/lynx/ser/lynx-comlynx.s
@@ -9,10 +9,13 @@
         .include        "ser-kernel.inc"
         .include        "ser-error.inc"
 
+        .macpack        module
+
+
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment        "HEADER"
+        module_header   _lynx_comlynx_ser
 
         ; Driver signature
         .byte   $73, $65, $72           ; "ser"
diff --git a/libsrc/lynx/tgi/lynx-160-102-16.s b/libsrc/lynx/tgi/lynx-160-102-16.s
index 2e5483b36..e6659631b 100644
--- a/libsrc/lynx/tgi/lynx-160-102-16.s
+++ b/libsrc/lynx/tgi/lynx-160-102-16.s
@@ -16,11 +16,13 @@
         .include        "lynx.inc"
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _lynx_160_102_16_tgi
 
 ; First part of the header is a structure that has a magic and defines the
 ; capabilities of the driver
diff --git a/libsrc/nes/joy/nes-stdjoy.s b/libsrc/nes/joy/nes-stdjoy.s
index abd213737..b50c2124d 100644
--- a/libsrc/nes/joy/nes-stdjoy.s
+++ b/libsrc/nes/joy/nes-stdjoy.s
@@ -12,11 +12,13 @@
         .include        "joy-error.inc"
         .include        "nes.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _nes_stdjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/nes/tgi/nes-64-56-2.s b/libsrc/nes/tgi/nes-64-56-2.s
index 23d7a0e47..70e23e119 100644
--- a/libsrc/nes/tgi/nes-64-56-2.s
+++ b/libsrc/nes/tgi/nes-64-56-2.s
@@ -15,11 +15,13 @@
         .import         paldata
 
         .macpack        generic
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table and constants.
 
-.segment        "HEADER"
+        module_header   _nes_64_56_2_tgi
 
 ; First part of the header is a structure that has a magic and defines the
 ; capabilities of the driver
diff --git a/libsrc/pet/joy/pet-ptvjoy.s b/libsrc/pet/joy/pet-ptvjoy.s
index 21dd7f153..229055fcb 100644
--- a/libsrc/pet/joy/pet-ptvjoy.s
+++ b/libsrc/pet/joy/pet-ptvjoy.s
@@ -10,14 +10,14 @@
 
         .include "joy-kernel.inc"
         .include "joy-error.inc"
-;       .include "pet.inc"
-VIA_PRA         := $E841                ; Port register A
-VIA_DDRA        := $E843                ; Data direction register A
+
+        .macpack module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment "HEADER"
+        module_header   _pet_ptvjoy_joy
 
 ; Driver signature
 
@@ -50,7 +50,10 @@ VIA_DDRA        := $E843                ; Data direction register A
 ; ------------------------------------------------------------------------
 ; Constants
 
-JOY_COUNT       = 2             ; Number of joysticks we support
+JOY_COUNT       = 2                     ; Number of joysticks we support
+
+VIA_PRA         := $E841                ; Port register A
+VIA_DDRA        := $E843                ; Data direction register A
 
 
 .code
diff --git a/libsrc/pet/joy/pet-stdjoy.s b/libsrc/pet/joy/pet-stdjoy.s
index c1b568fea..5847c2b09 100644
--- a/libsrc/pet/joy/pet-stdjoy.s
+++ b/libsrc/pet/joy/pet-stdjoy.s
@@ -10,11 +10,13 @@
         .include        "joy-error.inc"
         .include        "pet.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment "HEADER"
+        module_header   _pet_stdjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/plus4/joy/plus4-stdjoy.s b/libsrc/plus4/joy/plus4-stdjoy.s
index 283ea38cd..29316bf22 100644
--- a/libsrc/plus4/joy/plus4-stdjoy.s
+++ b/libsrc/plus4/joy/plus4-stdjoy.s
@@ -12,12 +12,17 @@
         .include        "plus4.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        .if .xmatch ("MODULE_LABEL", .string(MODULE_LABEL))
+        module_header   _plus4_stdjoy_joy
+        .else
+        module_header   MODULE_LABEL
+        .endif
 
 ; Driver signature
 
diff --git a/libsrc/plus4/ser/plus4-stdser.s b/libsrc/plus4/ser/plus4-stdser.s
index 4c720e3af..47dd96042 100644
--- a/libsrc/plus4/ser/plus4-stdser.s
+++ b/libsrc/plus4/ser/plus4-stdser.s
@@ -26,11 +26,13 @@
         .include        "ser-error.inc"
         .include        "plus4.inc"
 
+        .macpack        module
+
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _plus4_stdser_ser
 
 ; Driver signature
 
diff --git a/libsrc/vic20/joy/vic20-ptvjoy.s b/libsrc/vic20/joy/vic20-ptvjoy.s
index 07027c290..cdd4c274f 100644
--- a/libsrc/vic20/joy/vic20-ptvjoy.s
+++ b/libsrc/vic20/joy/vic20-ptvjoy.s
@@ -13,10 +13,13 @@
         .include "joy-error.inc"
         .include "vic20.inc"
 
+        .macpack module
+
+
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-        .segment "HEADER"
+        module_header   _vic20_ptvjoy_joy
 
 ; Driver signature
 
diff --git a/libsrc/vic20/joy/vic20-stdjoy.s b/libsrc/vic20/joy/vic20-stdjoy.s
index db1a0becc..56fb35ae4 100644
--- a/libsrc/vic20/joy/vic20-stdjoy.s
+++ b/libsrc/vic20/joy/vic20-stdjoy.s
@@ -13,12 +13,13 @@
         .include        "vic20.inc"
 
         .macpack        generic
+        .macpack        module
 
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
 
-.segment        "HEADER"
+        module_header   _vic20_stdjoy_joy
 
 ; Driver signature