diff --git a/libsrc/c128/c128.inc b/libsrc/c128/c128.inc
index aed393980..49b808c8a 100644
--- a/libsrc/c128/c128.inc
+++ b/libsrc/c128/c128.inc
@@ -47,11 +47,6 @@ KBDREAD		= $C006
 NEWLINE		= $C363
 PRINT		= $C322
 
-; Extended jump table  
-C64MODE		= $FF4D
-SWAPPER		= $FF5F
-SETBNK          = $FF68
-
 ; ---------------------------------------------------------------------------
 ; Vectors
 
diff --git a/libsrc/c128/c64mode.s b/libsrc/c128/c64mode.s
index 88a632d36..bc3f9d36c 100644
--- a/libsrc/c128/c64mode.s
+++ b/libsrc/c128/c64mode.s
@@ -6,8 +6,7 @@
 ;
 
 	.export		_c64mode
-
-	.include	"c128.inc"
+        .import         C64MODE
 
        	_c64mode	= C64MODE
 
diff --git a/libsrc/c128/kernal.s b/libsrc/c128/kernal.s
index 4f7b20180..7a6ff2822 100644
--- a/libsrc/c128/kernal.s
+++ b/libsrc/c128/kernal.s
@@ -4,6 +4,10 @@
 ; C128 kernal functions
 ;
 
+        .export         C64MODE
+        .export         SWAPPER
+        .export         SETBNK
+
         .export         CINT
         .export         IOINIT
         .export         RAMTAS
@@ -47,7 +51,13 @@
 
 ;-----------------------------------------------------------------------------
 ; All functions are available in the kernal jump table
+ 
+; Extended jump table
+C64MODE		= $FF4D
+SWAPPER		= $FF5F
+SETBNK          = $FF68
 
+;
 CINT		= $FF81
 IOINIT		= $FF84
 RAMTAS		= $FF87
diff --git a/libsrc/c128/toggle_videomode.s b/libsrc/c128/toggle_videomode.s
index 873e38eb1..15931d60b 100644
--- a/libsrc/c128/toggle_videomode.s
+++ b/libsrc/c128/toggle_videomode.s
@@ -6,10 +6,9 @@
 ;
 
 	.export		_toggle_videomode
+        .import         SWAPPER, BSOUT
 
-	.include	"c128.inc"
-
-.proc   _toggle_videomode 
+.proc   _toggle_videomode
 
         jsr     SWAPPER                 ; Toggle the mode
  	lda     #14