diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 45a282d9e..a0759c5c6 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -728,7 +728,7 @@ allocation functions, or that has been free'd will give unpredicable results.
 <descrip>
 <tag/Function/Return the largest block that is available on the heap.
 <tag/Header/<tt/<ref id="stdlib.h" name="stdlib.h">/
-<tag/Declaration/<tt/size_t __fastcall__ _heapmaxavail (void);/
+<tag/Declaration/<tt/size_t _heapmaxavail (void);/
 <tag/Description/The function returns the size of the largest block that may
 be allocated from the heap using <tt/<ref id="malloc" name="malloc">/.
 <tag/Availability/cc65
@@ -1841,7 +1841,7 @@ ldiv
 <descrip>
 <tag/Function/Commit changes into extended memory.
 <tag/Header/<tt/<ref id="em.h" name="em.h">/
-<tag/Declaration/<tt/void __fastcall__ em_commit (void);/
+<tag/Declaration/<tt/void em_commit (void);/
 <tag/Description/Commit changes in the memory window to extended storage. If
 the contents of the memory window have been changed, these changes may be lost
 if <tt/<ref id="em_map" name="em_map">/, <tt/<ref id="em_use" name="em_use">/,
@@ -2015,7 +2015,7 @@ loaded.
 <descrip>
 <tag/Function/Return the number of available extended memory pages.
 <tag/Header/<tt/<ref id="em.h" name="em.h">/
-<tag/Declaration/<tt/unsigned __fastcall__ em_pagecount (void);/
+<tag/Declaration/<tt/unsigned em_pagecount (void);/
 <tag/Description/The function returns the size of the extended memory supported
 by the driver in 256 byte pages.
 <tag/Limits/<itemize>
@@ -2036,7 +2036,7 @@ by the driver in 256 byte pages.
 <descrip>
 <tag/Function/Uninstall an already loaded extended memory driver.
 <tag/Header/<tt/<ref id="em.h" name="em.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ em_install (void);/
+<tag/Declaration/<tt/unsigned char em_uninstall (void);/
 <tag/Description/The function uninstalls an already loaded extended memory
 driver but doesn't remove it from memory.
 <tag/Limits/<itemize>
@@ -2044,8 +2044,6 @@ driver but doesn't remove it from memory.
 name="em_load_driver">/, <tt/<ref id="em_unload" name="em_unload">/
 should be used instead of <tt/em_uninstall/ so the driver is also removed
 from memory.
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
 </itemize>
 <tag/Availability/cc65
 <tag/See also/
@@ -2063,7 +2061,7 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Unload an extended memory driver.
 <tag/Header/<tt/<ref id="em.h" name="em.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ em_unload (void);/
+<tag/Declaration/<tt/unsigned char em_unload (void);/
 <tag/Description/The function unloads a loaded extended memory driver and
 frees all memory allocated for the driver.
 <tag/Limits/<itemize>
@@ -3008,7 +3006,7 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Return the number of joysticks supported by the current driver.
 <tag/Header/<tt/<ref id="joystick.h" name="joystick.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ joy_count (void);/
+<tag/Declaration/<tt/unsigned char joy_count (void);/
 <tag/Description/The function returns a the number of joysticks supported
 by the current joystick driver.
 <tag/Limits/<itemize>
@@ -3016,8 +3014,6 @@ by the current joystick driver.
 name="joy_load_driver"> before calling this function.
 <item>The function returns the number of joysticks supported by the driver.
 There's no way to check for the number of actually connected joysticks.
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
 </itemize>
 <tag/Availability/cc65
 <tag/See also/
@@ -3108,15 +3104,13 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Uninstall the current joystick driver.
 <tag/Header/<tt/<ref id="joystick.h" name="joystick.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ joy_uninstall (void);/
+<tag/Declaration/<tt/unsigned char joy_uninstall (void);/
 <tag/Description/The function uninstalls the currently installed joystick
 driver. It does not remove the driver from memory. The function returns an
 error code, which is <tt/JOY_ERR_OK/ if the driver was successfully uninstalled.
 <tag/Limits/<itemize>
 <item>A joystick driver must be installed using <ref id="joy_install"
 name="joy_install"> before calling this function.
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
 </itemize>
 <tag/Availability/cc65
 <tag/See also/
@@ -3134,15 +3128,13 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Uninstall, then unload the current joystick driver.
 <tag/Header/<tt/<ref id="joystick.h" name="joystick.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ joy_unload (void);/
+<tag/Declaration/<tt/unsigned char joy_unload (void);/
 <tag/Description/The function uninstalls the currently installed joystick
 driver and removes it from memory. An error code is returned, which is
 <tt/JOY_ERR_OK/ if the driver was successfully uninstalled.
 <tag/Limits/<itemize>
 <item>A joystick driver must be loaded using <ref id="joy_load_driver"
 name="joy_load_driver"> before calling this function.
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
 </itemize>
 <tag/Availability/cc65
 <tag/See also/
@@ -3540,14 +3532,10 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Return a bit mask encoding the state of the mouse buttons.
 <tag/Header/<tt/<ref id="mouse.h" name="mouse.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ mouse_buttons (void);/
+<tag/Declaration/<tt/unsigned char mouse_buttons (void);/
 <tag/Description/The function returns a bit mask that encodes the state of the
 mouse buttons. You may use the <tt/MOUSE_BTN_XXX/ flags to decode the function
 return value.
-<tag/Limits/<itemize>
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
-</itemize>
 <tag/Availability/cc65
 <tag/See also/
 <ref id="mouse_info" name="mouse_info">,
@@ -3588,16 +3576,12 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Hide the mouse pointer.
 <tag/Header/<tt/<ref id="mouse.h" name="mouse.h">/
-<tag/Declaration/<tt/void __fastcall__ mouse_hide (void);/
+<tag/Declaration/<tt/void mouse_hide (void);/
 <tag/Description/The function hides the mouse pointer. It manages a counter
 that is shared between <tt/<ref id="mouse_show" name="mouse_show">/ and
 <tt/mouse_hide/ so that every call call to <tt/mouse_hide/ must be followed by
 a call to <tt/<ref id="mouse_show" name="mouse_show">/ to make the mouse cursor
 visible.
-<tag/Limits/<itemize>
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
-</itemize>
 <tag/Availability/cc65
 <tag/See also/
 <ref id="mouse_show" name="mouse_show">
@@ -3777,15 +3761,11 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Show the mouse pointer.
 <tag/Header/<tt/<ref id="mouse.h" name="mouse.h">/
-<tag/Declaration/<tt/void __fastcall__ mouse_show (void);/
+<tag/Declaration/<tt/void mouse_show (void);/
 <tag/Description/The function shows the mouse pointer. It manages a counter
 that is shared between <tt/<ref id="mouse_hide" name="mouse_hide">/ and
 <tt/mouse_show/. The mouse cursor is visible if there was one more call to
 <tt/mouse_show/ than to <tt/<ref id="mouse_hide" name="mouse_hide">/.
-<tag/Limits/<itemize>
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
-</itemize>
 <tag/Availability/cc65
 <tag/See also/
 <ref id="mouse_hide" name="mouse_hide">
@@ -3800,7 +3780,7 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Uninstall an already loaded mouse driver.
 <tag/Header/<tt/<ref id="mouse.h" name="mouse.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ mouse_install (void);/
+<tag/Declaration/<tt/unsigned char mouse_uninstall (void);/
 <tag/Description/The function uninstalls an already loaded mouse driver but
 don't removes it from memory.
 <tag/Limits/<itemize>
@@ -3808,8 +3788,6 @@ don't removes it from memory.
 name="mouse_load_driver">/, <tt/<ref id="mouse_unload" name="mouse_unload">/
 should be used instead of <tt/mouse_uninstall/ so the driver is also removed
 from memory.
-<item>The function is only available as fastcall function, so it may only be
-used in presence of a prototype.
 </itemize>
 <tag/Availability/cc65
 <tag/See also/
@@ -4531,12 +4509,8 @@ be used in presence of a prototype.
 <descrip>
 <tag/Function/Uninstall the currently loaded driver but do not unload it.
 <tag/Header/<tt/<ref id="serial.h" name="serial.h">/
-<tag/Declaration/<tt/void __fastcall__ ser_uninstall (void);/
+<tag/Declaration/<tt/void ser_uninstall (void);/
 <tag/Description/Uninstall the currently loaded driver but do not unload it.
-<tag/Limits/<itemize>
-<item>The function is only available as fastcall function, so it may only
-be used in presence of a prototype.
-</itemize>
 <tag/Availability/cc65
 <tag/See also/Other serial functions.
 <tag/Example/None.
diff --git a/libsrc/atmos/clrscr.s b/libsrc/atmos/clrscr.s
index 740235636..4f9a3486a 100644
--- a/libsrc/atmos/clrscr.s
+++ b/libsrc/atmos/clrscr.s
@@ -8,7 +8,7 @@
 	.include  	"atmos.inc"
 
 ; ------------------------------------------------------------------------
-; void __fastcall__ clrscr (void);
+; void clrscr (void);
 
 .proc	_clrscr
 
diff --git a/libsrc/c128/get_tv.s b/libsrc/c128/get_tv.s
index c62de3ead..084876d11 100644
--- a/libsrc/c128/get_tv.s
+++ b/libsrc/c128/get_tv.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2002-12-03
 ;
-; unsigned char __fastcall__ get_tv (void);
+; unsigned char get_tv (void);
 ; /* Return the video mode the machine is using */
 ;
 
@@ -23,5 +23,3 @@ pal:    txa
         rts
 
 .endproc
-
-
diff --git a/libsrc/c64/get_tv.s b/libsrc/c64/get_tv.s
index 0b9494ea6..97d53b698 100644
--- a/libsrc/c64/get_tv.s
+++ b/libsrc/c64/get_tv.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2002-12-03
 ;
-; unsigned char __fastcall__ get_tv (void);
+; unsigned char get_tv (void);
 ; /* Return the video mode the machine is using */
 ;
 
@@ -18,5 +18,3 @@
         rts
 
 .endproc
-
-
diff --git a/libsrc/cbm/c_acptr.s b/libsrc/cbm/c_acptr.s
index e5c9852b6..162ae84e8 100644
--- a/libsrc/cbm/c_acptr.s
+++ b/libsrc/cbm/c_acptr.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; unsigned char __fastcall__ cbm_acptr (void);
+; unsigned char cbm_acptr (void);
 ;
 
        	.export	       	_cbm_acptr
@@ -12,5 +12,3 @@ _cbm_acptr:
 	jsr	ACPTR
 	ldx	#0
 	rts
-
-
diff --git a/libsrc/cbm/c_basin.s b/libsrc/cbm/c_basin.s
index 5dc0c0f66..9b2a985df 100644
--- a/libsrc/cbm/c_basin.s
+++ b/libsrc/cbm/c_basin.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; unsigned char __fastcall__ cbm_k_basin (void);
+; unsigned char cbm_k_basin (void);
 ;
 
 	.export		_cbm_k_basin
diff --git a/libsrc/cbm/c_clall.s b/libsrc/cbm/c_clall.s
index b062c6ff3..e4d864692 100644
--- a/libsrc/cbm/c_clall.s
+++ b/libsrc/cbm/c_clall.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void __fastcall__ cbm_clall (void);
+; void cbm_clall (void);
 ;
 
        	.export	       	_cbm_clall
@@ -9,5 +9,3 @@
 
 
 _cbm_clall = CLALL
-
-
diff --git a/libsrc/cbm/c_clrch.s b/libsrc/cbm/c_clrch.s
index 7750fd811..d2ef11c60 100644
--- a/libsrc/cbm/c_clrch.s
+++ b/libsrc/cbm/c_clrch.s
@@ -1,11 +1,10 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void __fastcall__ cbm_k_clrch (void);
+; void cbm_k_clrch (void);
 ;
 
        	.export	       	_cbm_k_clrch
         .import         CLRCH
 
 _cbm_k_clrch = CLRCH
-
diff --git a/libsrc/cbm/c_iobase.s b/libsrc/cbm/c_iobase.s
index 2780b0ca3..942fd479a 100644
--- a/libsrc/cbm/c_iobase.s
+++ b/libsrc/cbm/c_iobase.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; unsigned __fastcall__ cbm_iobase (void);
+; unsigned cbm_iobase (void);
 ;
 
        	.export	       	_cbm_iobase
@@ -15,5 +15,3 @@ _cbm_iobase:
 	tax
 	pla
 	rts
-
-
diff --git a/libsrc/cbm/c_open.s b/libsrc/cbm/c_open.s
index b8f952781..9a1e08f91 100644
--- a/libsrc/cbm/c_open.s
+++ b/libsrc/cbm/c_open.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; unsigned char __fastcall__ cbm_k_open (void);
+; unsigned char cbm_k_open (void);
 ;
 
        	.export	       	_cbm_k_open
diff --git a/libsrc/cbm/c_readst.s b/libsrc/cbm/c_readst.s
index 4aeab41b3..6e4f02dea 100644
--- a/libsrc/cbm/c_readst.s
+++ b/libsrc/cbm/c_readst.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; unsigned char __fastcall__ cbm_k_readst (void);
+; unsigned char cbm_k_readst (void);
 ;
 
 	.export		_cbm_k_readst
diff --git a/libsrc/cbm/c_unlsn.s b/libsrc/cbm/c_unlsn.s
index 1b48cf9ab..d93102f86 100644
--- a/libsrc/cbm/c_unlsn.s
+++ b/libsrc/cbm/c_unlsn.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void __fastcall__ cbm_unlsn (void);
+; void cbm_unlsn (void);
 ;
 
        	.export	       	_cbm_unlsn
@@ -9,8 +9,3 @@
 
 
 _cbm_unlsn = UNLSN
-
-
-
-
-
diff --git a/libsrc/cbm/c_untlk.s b/libsrc/cbm/c_untlk.s
index b45997bb3..6a309406c 100644
--- a/libsrc/cbm/c_untlk.s
+++ b/libsrc/cbm/c_untlk.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void __fastcall__ cbm_untlk (void);
+; void cbm_untlk (void);
 ;
 
        	.export	       	_cbm_untlk
@@ -9,5 +9,3 @@
 
 
 _cbm_untlk = UNTLK
-
-
diff --git a/libsrc/cbm510/clrscr.s b/libsrc/cbm510/clrscr.s
index 8025a30c1..0a1ef3aaa 100644
--- a/libsrc/cbm510/clrscr.s
+++ b/libsrc/cbm510/clrscr.s
@@ -9,7 +9,7 @@
         .include        "extzp.inc"
 
 ; ------------------------------------------------------------------------
-; void __fastcall__ clrscr (void);
+; void clrscr (void);
 
 .proc	_clrscr
 
diff --git a/libsrc/cbm610/get_tv.s b/libsrc/cbm610/get_tv.s
index 044ee0543..2edc05399 100644
--- a/libsrc/cbm610/get_tv.s
+++ b/libsrc/cbm610/get_tv.s
@@ -1,7 +1,7 @@
 ;
 ; Stefan Haubenthal, 2009-08-02
 ;
-; unsigned char __fastcall__ get_tv (void);
+; unsigned char get_tv (void);
 ; /* Return the video mode the machine is using */
 ;
 
diff --git a/libsrc/common/_heapmaxavail.s b/libsrc/common/_heapmaxavail.s
index a606904ef..1fe5e0606 100644
--- a/libsrc/common/_heapmaxavail.s
+++ b/libsrc/common/_heapmaxavail.s
@@ -3,7 +3,7 @@
 ;
 ; Return the size of the largest free block on the heap.
 ;
-; size_t __fastcall__ _heapmaxavail (void);
+; size_t _heapmaxavail (void);
 ;
 ;
                             
@@ -74,4 +74,3 @@ __heapmaxavail:
 @L3:    lda     ptr2
         ldx     ptr2+1
         rts
-
diff --git a/libsrc/common/_heapmemavail.s b/libsrc/common/_heapmemavail.s
index 5c94305e4..b7a05a087 100644
--- a/libsrc/common/_heapmemavail.s
+++ b/libsrc/common/_heapmemavail.s
@@ -3,7 +3,7 @@
 ;
 ; Return the amount of free memory on the heap.
 ;
-; size_t __fastcall__ _heapmemavail (void);
+; size_t _heapmemavail (void);
 ;
 ;
 
@@ -76,6 +76,3 @@ __heapmemavail:
         lda     ptr2
 
         rts
-
-
-
diff --git a/libsrc/em/em-kernel.s b/libsrc/em/em-kernel.s
index 1c9591e28..7f15d258f 100644
--- a/libsrc/em/em-kernel.s
+++ b/libsrc/em/em-kernel.s
@@ -84,7 +84,7 @@ copy:   lda     (ptr1),y
         rts
 
 ;----------------------------------------------------------------------------
-; unsigned char __fastcall__ em_uninstall (void);
+; unsigned char em_uninstall (void);
 ; /* Uninstall the currently loaded driver and return an error code.
 ;  * Note: This call does not free allocated memory.
 ;  */
@@ -99,4 +99,3 @@ em_clear_ptr:                           ; External entry point
 
         tax
         rts                             ; Return zero
-
diff --git a/libsrc/em/em_commit.s b/libsrc/em/em_commit.s
index 0b8590179..a7d235c3f 100644
--- a/libsrc/em/em_commit.s
+++ b/libsrc/em/em_commit.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2002-12-01
 ;
-; void __fastcall__ em_commit (void);
+; void em_commit (void);
 ; /* Commit changes in the memory window to extended storage. If the contents
 ;  * of the memory window have been changed, these changes may be lost if
 ;  * em_map, em_copyfrom or em_copyto are called without calling em_commit
@@ -12,5 +12,3 @@
         .include        "em-kernel.inc"
 
        	_em_commit      = emd_commit            ; Use driver entry
-
-                                   
diff --git a/libsrc/em/em_unload.s b/libsrc/em/em_unload.s
index d5ce35e9e..74ee2f92a 100644
--- a/libsrc/em/em_unload.s
+++ b/libsrc/em/em_unload.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2002-11-29
 ;
-; unsigned char __fastcall__ em_unload (void);
+; unsigned char em_unload (void);
 ; /* Unload the currently loaded driver. */
 
 
@@ -28,4 +28,3 @@ no_driver:
 	tax				; X = 0
 	lda	#EM_ERR_NO_DRIVER
 	rts
-
diff --git a/libsrc/joystick/joy-kernel.s b/libsrc/joystick/joy-kernel.s
index d863b9c3d..46bf3fdaf 100644
--- a/libsrc/joystick/joy-kernel.s
+++ b/libsrc/joystick/joy-kernel.s
@@ -104,7 +104,7 @@ set:    sta     joy_vectors,x
         rts
 
 ;----------------------------------------------------------------------------
-; unsigned char __fastcall__ joy_uninstall (void);
+; unsigned char joy_uninstall (void);
 ; /* Uninstall the currently loaded driver. Note: This call does not free
 ;  * allocated memory.
 ;  */
@@ -122,4 +122,3 @@ _joy_clear_ptr:                         ; External entry point
 
         tax                             ; Return zero
         rts
-
diff --git a/libsrc/joystick/joy_count.s b/libsrc/joystick/joy_count.s
index c8b2b8325..753368d42 100644
--- a/libsrc/joystick/joy_count.s
+++ b/libsrc/joystick/joy_count.s
@@ -1,12 +1,10 @@
 ;
 ; Ullrich von Bassewitz, 2002-12-20
 ;
-; unsigned char __fastcall__ joy_count (void);
+; unsigned char joy_count (void);
 ; /* Return the number of joysticks supported by the driver */
 ;
 
         .include        "joy-kernel.inc"
 
        	_joy_count      = joy_count             ; Use driver entry
-
-
diff --git a/libsrc/joystick/joy_unload.s b/libsrc/joystick/joy_unload.s
index f9aa701ee..9b85abd26 100644
--- a/libsrc/joystick/joy_unload.s
+++ b/libsrc/joystick/joy_unload.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2002-11-29
 ;
-; unsigned char __fastcall__ joy_unload (void);
+; unsigned char joy_unload (void);
 ; /* Unload the currently loaded driver. */
 
 
@@ -35,5 +35,3 @@ no_driver:
         pla                             ; Remove pushed junk
 	lda	#JOY_ERR_NO_DRIVER
 	rts
-
-
diff --git a/libsrc/mouse/mouse-kernel.s b/libsrc/mouse/mouse-kernel.s
index b8d1db185..8844ba506 100644
--- a/libsrc/mouse/mouse-kernel.s
+++ b/libsrc/mouse/mouse-kernel.s
@@ -156,7 +156,7 @@ copycb: lda     (sreg),y
         rts
 
 ;----------------------------------------------------------------------------
-; unsigned char __fastcall__ mouse_uninstall (void);
+; unsigned char mouse_uninstall (void);
 ; /* Uninstall the currently loaded driver. Returns an error code. */
 
 _mouse_uninstall:
@@ -182,5 +182,3 @@ _mouse_clear_ptr:                       ; External entry point
 
         tax
         rts                             ; Return zero
-
-
diff --git a/libsrc/mouse/mouse_buttons.s b/libsrc/mouse/mouse_buttons.s
index 7c8bbfe24..459c0a8e6 100644
--- a/libsrc/mouse/mouse_buttons.s
+++ b/libsrc/mouse/mouse_buttons.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2003-12-30
 ;
-; unsigned char __fastcall__ mouse_buttons (void);
+; unsigned char mouse_buttons (void);
 ; /* Return a bit mask encoding the states of the mouse buttons. Use the
 ;  * MOUSE_BTN_XXX flags to decode a specific button.
 ;  */
@@ -10,5 +10,3 @@
         .include        "mouse-kernel.inc"
 
         _mouse_buttons  = mouse_buttons ; Call driver directly
-
-
diff --git a/libsrc/mouse/mouse_hide.s b/libsrc/mouse/mouse_hide.s
index f845db360..e50a12a8b 100644
--- a/libsrc/mouse/mouse_hide.s
+++ b/libsrc/mouse/mouse_hide.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2003-12-30
 ;
-; void __fastcall__ mouse_hide (void);
+; void mouse_hide (void);
 ; /* Hide the mouse. The function manages a counter and may be called more than
 ;  * once. For each call to mouse_hide there must be a call to mouse_show to make
 ;  * the mouse visible again.
@@ -19,5 +19,3 @@
 	rts
 
 .endproc
-
-
diff --git a/libsrc/mouse/mouse_show.s b/libsrc/mouse/mouse_show.s
index 5cb905a06..3941e9dc9 100644
--- a/libsrc/mouse/mouse_show.s
+++ b/libsrc/mouse/mouse_show.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2003-12-30
 ;
-; void __fastcall__ mouse_show (void);
+; void mouse_show (void);
 ; /* Show the mouse. See mouse_hide for more information. */
 ;
 
@@ -17,5 +17,3 @@
 @L1:	rts
 
 .endproc
-
-
diff --git a/libsrc/mouse/mouse_unload.s b/libsrc/mouse/mouse_unload.s
index 59ec94949..997451283 100644
--- a/libsrc/mouse/mouse_unload.s
+++ b/libsrc/mouse/mouse_unload.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2004-03-21
 ;
-; unsigned char __fastcall__ mouse_unload (void);
+; unsigned char mouse_unload (void);
 ; /* Uninstall, then unload the currently loaded driver. */
 
 
@@ -33,4 +33,3 @@ no_driver:
         pla                             ; Remove pushed junk
 	lda	#<MOUSE_ERR_NO_DRIVER
 	rts
-
diff --git a/libsrc/nes/get_tv.s b/libsrc/nes/get_tv.s
index a82953c81..8d2c313b7 100644
--- a/libsrc/nes/get_tv.s
+++ b/libsrc/nes/get_tv.s
@@ -1,7 +1,7 @@
 ;
 ; Stefan Haubenthal, 2007-01-21
 ;
-; unsigned char __fastcall__ get_tv (void);
+; unsigned char get_tv (void);
 ; /* Return the video mode the machine is using */
 ;
 
diff --git a/libsrc/nes/waitvblank.s b/libsrc/nes/waitvblank.s
index a54607092..373a84629 100644
--- a/libsrc/nes/waitvblank.s
+++ b/libsrc/nes/waitvblank.s
@@ -2,7 +2,7 @@
 ; Written by Groepaz/Hitmen <groepaz@gmx.net>
 ; Cleanup by Ullrich von Bassewitz <uz@cc65.org>
 ;
-; void __fastcall__ waitvblank(void);
+; void waitvblank(void);
 ;
 
 	.export _waitvblank
@@ -16,5 +16,3 @@ wait:   lda     PPU_STATUS
         rts
 
 .endproc
-
-
diff --git a/libsrc/pet/get_tv.s b/libsrc/pet/get_tv.s
index 07e1fccad..8ac4377dc 100644
--- a/libsrc/pet/get_tv.s
+++ b/libsrc/pet/get_tv.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2004-10-26
 ;
-; unsigned char __fastcall__ get_tv (void);
+; unsigned char get_tv (void);
 ; /* Return the video mode the machine is using */
 ;
 
@@ -18,5 +18,3 @@
         rts
 
 .endproc
-
-
diff --git a/libsrc/plus4/get_tv.s b/libsrc/plus4/get_tv.s
index 84f09b12c..fb696020f 100644
--- a/libsrc/plus4/get_tv.s
+++ b/libsrc/plus4/get_tv.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2002-12-03
 ;
-; unsigned char __fastcall__ get_tv (void);
+; unsigned char get_tv (void);
 ; /* Return the video mode the machine is using */
 ;
 
@@ -23,5 +23,3 @@ pal:    txa
         rts
 
 .endproc
-
-
diff --git a/libsrc/serial/ser-kernel.s b/libsrc/serial/ser-kernel.s
index d666e9452..d96f8306a 100644
--- a/libsrc/serial/ser-kernel.s
+++ b/libsrc/serial/ser-kernel.s
@@ -92,7 +92,7 @@ copy:   lda     (ptr1),y
         rts
 
 ;----------------------------------------------------------------------------
-; unsigned char __fastcall__ ser_uninstall (void);
+; unsigned char ser_uninstall (void);
 ; /* Uninstall the currently loaded driver and return an error code.
 ;  * Note: This call does not free allocated memory.
 ;  */
@@ -110,4 +110,3 @@ _ser_clear_ptr:                         ; External entry point
 
         tax
         rts                             ; Return zero
-
diff --git a/libsrc/serial/ser_close.s b/libsrc/serial/ser_close.s
index b49419a49..0fcc24c60 100644
--- a/libsrc/serial/ser_close.s
+++ b/libsrc/serial/ser_close.s
@@ -1,12 +1,10 @@
 ;
 ; Ullrich von Bassewitz, 2003-08-22
 ;
-; unsigned char __fastcall__ ser_close (void);
+; unsigned char ser_close (void);
 ; /* "Close" the port. Clear buffers and and disable interrupts. */
 
 
         .include        "ser-kernel.inc"
 
         _ser_close      = ser_close
-
-                                   
diff --git a/libsrc/serial/ser_unload.s b/libsrc/serial/ser_unload.s
index 325c3d667..c97a4b3d3 100644
--- a/libsrc/serial/ser_unload.s
+++ b/libsrc/serial/ser_unload.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2003-04-15
 ;
-; unsigned char __fastcall__ ser_unload (void);
+; unsigned char ser_unload (void);
 ; /* Unload the currently loaded driver. */
 
 
@@ -35,4 +35,3 @@ no_driver:
         pla                             ; Remove pushed junk
 	lda	#<SER_ERR_NO_DRIVER
 	rts
-
diff --git a/libsrc/tgi/tgi-kernel.s b/libsrc/tgi/tgi-kernel.s
index c2e3f565d..74995412a 100644
--- a/libsrc/tgi/tgi-kernel.s
+++ b/libsrc/tgi/tgi-kernel.s
@@ -186,7 +186,7 @@ tgi_set_ptr:
         rts
 
 ;----------------------------------------------------------------------------
-; void __fastcall__ tgi_uninstall (void);
+; void tgi_uninstall (void);
 ; /* Uninstall the currently loaded driver but do not unload it. Will call
 ;  * tgi_done if necessary.
 ;  */
@@ -207,6 +207,3 @@ _tgi_uninstall:
         sta     _tgi_error
 
         rts
-
-
-
diff --git a/libsrc/tgi/tgi_clear.s b/libsrc/tgi/tgi_clear.s
index 7c4bd0be9..5058f0a85 100644
--- a/libsrc/tgi/tgi_clear.s
+++ b/libsrc/tgi/tgi_clear.s
@@ -1,15 +1,9 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; void __fastcall__ tgi_clear (void);
+; void tgi_clear (void);
 ; /* Clear the drawpage */
 
         .include        "tgi-kernel.inc"
 
 _tgi_clear      = tgi_clear               ; Call the driver
-
-
-
-
-
-
diff --git a/libsrc/tgi/tgi_done.s b/libsrc/tgi/tgi_done.s
index a5d1dce7a..8c2567792 100644
--- a/libsrc/tgi/tgi_done.s
+++ b/libsrc/tgi/tgi_done.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; void __fastcall__ tgi_done (void);
+; void tgi_done (void);
 ; /* End graphics mode, switch back to text mode. Will NOT unload the driver! */
 
         .include        "tgi-kernel.inc"
@@ -17,4 +17,3 @@
 @L1:    rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getaspectratio.s b/libsrc/tgi/tgi_getaspectratio.s
index 9c439953c..f6081b1ee 100644
--- a/libsrc/tgi/tgi_getaspectratio.s
+++ b/libsrc/tgi/tgi_getaspectratio.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 2011-05-01
 ;
-; unsigned __fastcall__ tgi_getaspectratio (void);
+; unsigned tgi_getaspectratio (void);
 ; /* Returns the aspect ratio for the loaded driver. The aspect ratio is an
 ;  * 8.8 fixed point value.
 ;  */
@@ -16,4 +16,3 @@
         rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getcolor.s b/libsrc/tgi/tgi_getcolor.s
index 9169b5423..c1c0022d0 100644
--- a/libsrc/tgi/tgi_getcolor.s
+++ b/libsrc/tgi/tgi_getcolor.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 22.06.2002
 ;
-; unsigned char __fastcall__ tgi_getcolor (void);
+; unsigned char tgi_getcolor (void);
 ; /* Return the current drawing color */
 
 
diff --git a/libsrc/tgi/tgi_getcolorcount.s b/libsrc/tgi/tgi_getcolorcount.s
index ae34220fd..b7a3562c7 100644
--- a/libsrc/tgi/tgi_getcolorcount.s
+++ b/libsrc/tgi/tgi_getcolorcount.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 22.06.2002
 ;
-; unsigned char __fastcall__ tgi_getcolorcount (void);
+; unsigned char tgi_getcolorcount (void);
 ; /* Get the number of available colors */
 
         .include        "tgi-kernel.inc"
@@ -13,4 +13,3 @@
         rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getdefpalette.s b/libsrc/tgi/tgi_getdefpalette.s
index 8b0325728..a95301389 100644
--- a/libsrc/tgi/tgi_getdefpalette.s
+++ b/libsrc/tgi/tgi_getdefpalette.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 23.06.2002
 ;
-; const unsigned char* __fastcall__ tgi_getdefpalette (void);
+; const unsigned char* tgi_getdefpalette (void);
 ; /* Return the default palette. Will return NULL for drivers that do not
 ;  * support palettes.
 ;  */
@@ -10,5 +10,3 @@
         .include        "tgi-kernel.inc"
 
 _tgi_getdefpalette      =       tgi_getdefpalette       ; Call the driver
-
-
diff --git a/libsrc/tgi/tgi_geterror.s b/libsrc/tgi/tgi_geterror.s
index c2426158b..c34b08ba9 100644
--- a/libsrc/tgi/tgi_geterror.s
+++ b/libsrc/tgi/tgi_geterror.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; unsigned char __fastcall__ tgi_geterror (void);
+; unsigned char tgi_geterror (void);
 ; /* Return the error code for the last operation. This will also clear the
 ;  * error.
 ;  */
@@ -22,4 +22,3 @@
 @L2:    rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getmaxcolor.s b/libsrc/tgi/tgi_getmaxcolor.s
index 2e2b2ad0e..d10ac0e3f 100644
--- a/libsrc/tgi/tgi_getmaxcolor.s
+++ b/libsrc/tgi/tgi_getmaxcolor.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 22.06.2002
 ;
-; unsigned char __fastcall__ tgi_getmaxcolor (void);
+; unsigned char tgi_getmaxcolor (void);
 ; /* Return the maximum supported color number (the number of colors would
 ;  * then be getmaxcolor()+1).
 ;  */
@@ -18,4 +18,3 @@
         rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getmaxx.s b/libsrc/tgi/tgi_getmaxx.s
index c6300a287..ccf0eb8d5 100644
--- a/libsrc/tgi/tgi_getmaxx.s
+++ b/libsrc/tgi/tgi_getmaxx.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; unsigned __fastcall__ tgi_getmaxx (void);
+; unsigned tgi_getmaxx (void);
 ; /* Return the maximum x coordinate. The resolution in x direction is
 ;  * getmaxx() + 1
 ;  */
@@ -16,5 +16,3 @@
         rts
 
 .endproc
-
-
diff --git a/libsrc/tgi/tgi_getmaxy.s b/libsrc/tgi/tgi_getmaxy.s
index 5dbddf1b2..3fc7bdb86 100644
--- a/libsrc/tgi/tgi_getmaxy.s
+++ b/libsrc/tgi/tgi_getmaxy.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; unsigned __fastcall__ tgi_getmaxy (void);
+; unsigned tgi_getmaxy (void);
 ; /* Return the maximum y coordinate. The resolution in y direction is
 ;  * getmaxy() + 1
 ;  */
@@ -15,4 +15,3 @@
         rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getpagecount.s b/libsrc/tgi/tgi_getpagecount.s
index 777b92c2d..ddca30ea9 100644
--- a/libsrc/tgi/tgi_getpagecount.s
+++ b/libsrc/tgi/tgi_getpagecount.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 23.06.2002
 ;
-; unsigned __fastcall__ tgi_getpagecount (void);
+; unsigned tgi_getpagecount (void);
 ; /* Returns the number of screen pages available. */
 ;
 
@@ -14,4 +14,3 @@
         rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getpalette.s b/libsrc/tgi/tgi_getpalette.s
index ec64ffbc4..a91aefb71 100644
--- a/libsrc/tgi/tgi_getpalette.s
+++ b/libsrc/tgi/tgi_getpalette.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 23.06.2002
 ;
-; const unsigned char* __fastcall__ tgi_getpalette (void);
+; const unsigned char* tgi_getpalette (void);
 ; /* Return the current palette. Will return NULL for drivers that do not
 ;  * support palettes.
 ;  */
@@ -10,5 +10,3 @@
         .include        "tgi-kernel.inc"
 
 _tgi_getpalette         =       tgi_getpalette          ; Call the driver
-
-
diff --git a/libsrc/tgi/tgi_getxres.s b/libsrc/tgi/tgi_getxres.s
index 62f828c60..4636b900a 100644
--- a/libsrc/tgi/tgi_getxres.s
+++ b/libsrc/tgi/tgi_getxres.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; unsigned __fastcall__ tgi_getxres (void);
+; unsigned tgi_getxres (void);
 ; /* Return the resolution in X direction */
 
 
@@ -14,4 +14,3 @@
         rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_getyres.s b/libsrc/tgi/tgi_getyres.s
index d018a3928..8bd182cb1 100644
--- a/libsrc/tgi/tgi_getyres.s
+++ b/libsrc/tgi/tgi_getyres.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; unsigned __fastcall__ tgi_getyres (void);
+; unsigned tgi_getyres (void);
 ; /* Return the resolution in Y direction */
 
 
@@ -14,4 +14,3 @@
         rts
 
 .endproc
-
diff --git a/libsrc/tgi/tgi_init.s b/libsrc/tgi/tgi_init.s
index 2100d06e1..44ab3d521 100644
--- a/libsrc/tgi/tgi_init.s
+++ b/libsrc/tgi/tgi_init.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; void __fastcall__ tgi_init (void);
+; void tgi_init (void);
 ; /* Initialize the already loaded graphics driver */
 
 
@@ -72,5 +72,3 @@
 @L9:    rts
 
 .endproc
-
-
diff --git a/libsrc/tgi/tgi_unload.s b/libsrc/tgi/tgi_unload.s
index 66a318fcd..1012969d2 100644
--- a/libsrc/tgi/tgi_unload.s
+++ b/libsrc/tgi/tgi_unload.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 21.06.2002
 ;
-; void __fastcall__ tgi_unload (void);
+; void tgi_unload (void);
 ; /* Unload the currently loaded driver. */
 
 
@@ -32,5 +32,3 @@ no_driver:
         lda     #<TGI_ERR_NO_DRIVER
         sta     _tgi_error
         rts
-
-
diff --git a/libsrc/vic20/get_tv.s b/libsrc/vic20/get_tv.s
index f1e3260ae..df75814d9 100644
--- a/libsrc/vic20/get_tv.s
+++ b/libsrc/vic20/get_tv.s
@@ -2,7 +2,7 @@
 ; Stefan Haubenthal, 2004-10-07
 ; Based on code from Pu-239
 ;
-; unsigned char __fastcall__ get_tv (void);
+; unsigned char get_tv (void);
 ; /* Return the video mode the machine is using */
 ;