diff --git a/libsrc/atari/libref.s b/libsrc/atari/libref.s
index 4f7cbbef6..171bd6de6 100644
--- a/libsrc/atari/libref.s
+++ b/libsrc/atari/libref.s
@@ -2,19 +2,14 @@
 ; Oliver Schmidt, 2013-05-31
 ;
 
-        .export         em_libref, joy_libref, tgi_libref, ser_libref, mouse_libref
+        .export         em_libref, joy_libref, tgi_libref
         .import         _exit
-        .import         atari_ser_libref
 
 em_libref       := _exit
 joy_libref      := _exit
-ser_libref      := atari_ser_libref
 .ifdef __ATARIXL__
         .import CIO_handler
 tgi_libref      := CIO_handler
-        .import set_VTIMR1_handler
-mouse_libref    := set_VTIMR1_handler
 .else
-mouse_libref    := _exit
 tgi_libref      := _exit
 .endif
diff --git a/libsrc/atari/mouseref.s b/libsrc/atari/mouseref.s
new file mode 100644
index 000000000..b75df93d1
--- /dev/null
+++ b/libsrc/atari/mouseref.s
@@ -0,0 +1,13 @@
+;
+; Christian Groessler, 2014-04-22
+;
+
+        .export         mouse_libref
+
+.ifdef __ATARIXL__
+        .import set_VTIMR1_handler
+mouse_libref    := set_VTIMR1_handler
+.else
+        .import _exit
+mouse_libref    := _exit
+.endif
diff --git a/libsrc/atari/ser_libref.s b/libsrc/atari/ser_libref.s
index 4b5c58508..89ef1e519 100644
--- a/libsrc/atari/ser_libref.s
+++ b/libsrc/atari/ser_libref.s
@@ -1,7 +1,12 @@
+;
+; Christian Groessler, 2014-04-22
+;
 
-	.include	"atari.inc"
+        .include        "atari.inc"
 
-	.import	_close, pushax, popax
+        .export         ser_libref
+
+        .import         _close, pushax, popax
         .import         findfreeiocb
         .import         __do_oserror
         .import         fddecusage
@@ -10,19 +15,19 @@
         .import         clriocb
         .import         newfd
 
-	.export	atari_ser_libref
+ser_libref      := atari_ser_libref
 
 .rodata
 
 atari_ser_libref:
-	.word	newfd
-	.word	_close
-	.word	pushax
-	.word	popax
+        .word   newfd
+        .word   _close
+        .word   pushax
+        .word   popax
         .word   findfreeiocb
         .word   __do_oserror
         .word   fddecusage
         .word   fdtoiocb
         .word   __inviocb
         .word   clriocb
-	.word	CIOV
+        .word   CIOV