diff --git a/libsrc/geos-common/common/zerobss.s b/libsrc/geos-common/common/zerobss.s
index e2a6cbe06..fc19c38c7 100644
--- a/libsrc/geos-common/common/zerobss.s
+++ b/libsrc/geos-common/common/zerobss.s
@@ -8,10 +8,8 @@
 	    .export zerobss
 	    .import __BSS_RUN__, __BSS_SIZE__
 	    
-            .include "jumptab.inc"
-            .include "geossym.inc"
-
-.code
+	    .include "jumptab.inc"
+	    .include "geossym.inc"
 
 zerobss:
 	lda #<__BSS_SIZE__
diff --git a/libsrc/geos-common/conio/color.s b/libsrc/geos-common/conio/color.s
index 168208802..fbf86e947 100644
--- a/libsrc/geos-common/conio/color.s
+++ b/libsrc/geos-common/conio/color.s
@@ -8,7 +8,6 @@
 ; unsigned char __fastcall__ bordercolor (unsigned char color);
 ;
 
-
  	    .export _textcolor, _bgcolor, _bordercolor
 
 ; for GEOS 2.0 there is no color support, perhaps Wheels has it
diff --git a/libsrc/geos-common/dlgbox/dbget2lines.s b/libsrc/geos-common/dlgbox/dbget2lines.s
index 67d72375c..bc0d68fae 100644
--- a/libsrc/geos-common/dlgbox/dbget2lines.s
+++ b/libsrc/geos-common/dlgbox/dbget2lines.s
@@ -7,8 +7,6 @@
 	    .importzp ptr3,ptr4
 	    .import popax
 
-.code
-
 DB_get2lines:
 	sta ptr4		; fetch line 2
 	stx ptr4+1
diff --git a/libsrc/geos-common/dlgbox/dlgboxfileselect.s b/libsrc/geos-common/dlgbox/dlgboxfileselect.s
index 53349ce58..284285d03 100644
--- a/libsrc/geos-common/dlgbox/dlgboxfileselect.s
+++ b/libsrc/geos-common/dlgbox/dlgboxfileselect.s
@@ -5,17 +5,15 @@
 
 ; char DlgBoxFileSelect       (char *class, char ftype, char *fname);
 
-		.export _DlgBoxFileSelect
-		.import popa, popax
-		.import _DoDlgBox
+	    .export _DlgBoxFileSelect
+	    .import popa, popax
+	    .import _DoDlgBox
 
-		.include "jumptab.inc"
-		.include "diskdrv.inc"
-		.include "geossym.inc"
-		.include "geosmac.inc"
-		.include "const.inc"
-
-.code
+	    .include "jumptab.inc"
+	    .include "diskdrv.inc"
+	    .include "geossym.inc"
+	    .include "geosmac.inc"
+	    .include "const.inc"
 
 _DlgBoxFileSelect:
 	sta tmp_r5
diff --git a/libsrc/geos-common/dlgbox/dlgboxgetstring.s b/libsrc/geos-common/dlgbox/dlgboxgetstring.s
index 4f0a25944..ec26c8433 100644
--- a/libsrc/geos-common/dlgbox/dlgboxgetstring.s
+++ b/libsrc/geos-common/dlgbox/dlgboxgetstring.s
@@ -13,8 +13,6 @@
 	    .include "geossym.inc"
 	    .include "const.inc"
 
-.code
-
 _DlgBoxGetString:
 	jsr DB_get2lines
 	jsr popa
diff --git a/libsrc/geos-common/dlgbox/dlgboxok.s b/libsrc/geos-common/dlgbox/dlgboxok.s
index 7cfdc6112..9ac094c43 100644
--- a/libsrc/geos-common/dlgbox/dlgboxok.s
+++ b/libsrc/geos-common/dlgbox/dlgboxok.s
@@ -12,8 +12,6 @@
 	    .include "geossym.inc"
 	    .include "const.inc"
 
-.code
-
 _DlgBoxOk:
 	jsr DB_get2lines
 	lda #<paramStrOk
diff --git a/libsrc/geos-common/dlgbox/dlgboxokcancel.s b/libsrc/geos-common/dlgbox/dlgboxokcancel.s
index 828514fc5..e6267e128 100644
--- a/libsrc/geos-common/dlgbox/dlgboxokcancel.s
+++ b/libsrc/geos-common/dlgbox/dlgboxokcancel.s
@@ -12,8 +12,6 @@
 	    .include "geossym.inc"
 	    .include "const.inc"
 
-.code
-
 _DlgBoxOkCancel:
 	jsr DB_get2lines
 	lda #<paramStrOkCancel
diff --git a/libsrc/geos-common/dlgbox/dlgboxyesno.s b/libsrc/geos-common/dlgbox/dlgboxyesno.s
index 94eed142a..f895bb759 100644
--- a/libsrc/geos-common/dlgbox/dlgboxyesno.s
+++ b/libsrc/geos-common/dlgbox/dlgboxyesno.s
@@ -12,8 +12,6 @@
 	    .include "geossym.inc"
 	    .include "const.inc"
 
-.code
-
 _DlgBoxYesNo:
 	jsr DB_get2lines
 	lda #<paramStrYesNo
diff --git a/libsrc/geos-common/drivers/geos-stdmou.s b/libsrc/geos-common/drivers/geos-stdmou.s
index 50b6fe4d8..c2f610dc5 100644
--- a/libsrc/geos-common/drivers/geos-stdmou.s
+++ b/libsrc/geos-common/drivers/geos-stdmou.s
@@ -19,8 +19,6 @@
 	    .include "jumptab.inc"
 	    .include "geossym.inc"
 
-.code
-
 ; --------------------------------------------------------------------------
 ;
 ; unsigned char __fastcall__ mouse_init (unsigned char type);
diff --git a/libsrc/geos-common/drivers/mcbdefault.s b/libsrc/geos-common/drivers/mcbdefault.s
index 6fca43a0b..39658ebf6 100644
--- a/libsrc/geos-common/drivers/mcbdefault.s
+++ b/libsrc/geos-common/drivers/mcbdefault.s
@@ -22,8 +22,6 @@
 ; The functions below must be interrupt-safe,
 ; because they might be called from an interrupt-handler.
 
-.code
-
 ; --------------------------------------------------------------------------
 ; Hide the mouse pointer. Always called with interrupts disabled.
 
diff --git a/libsrc/geos-common/file/findftypes.s b/libsrc/geos-common/file/findftypes.s
index 765f47e40..2e6020b3a 100644
--- a/libsrc/geos-common/file/findftypes.s
+++ b/libsrc/geos-common/file/findftypes.s
@@ -12,8 +12,6 @@
 	    .include "diskdrv.inc"
 	    .include "geossym.inc"
 
-.code
-	
 _FindFTypes:
 	sta r10L
 	stx r10H
diff --git a/libsrc/geos-common/system/oserror.s b/libsrc/geos-common/system/oserror.s
index ffc907e86..2acfe1e9a 100644
--- a/libsrc/geos-common/system/oserror.s
+++ b/libsrc/geos-common/system/oserror.s
@@ -12,8 +12,6 @@
 	    .include "errno.inc"
 	    .include "const.inc"
 
-.code
-
 __osmaperrno:
 	ldx #ErrTabSize
 @L1:	cmp ErrTab-2,x		; Search for the error code
diff --git a/libsrc/geos-common/system/sysuname.s b/libsrc/geos-common/system/sysuname.s
index c750947f4..557ac4396 100644
--- a/libsrc/geos-common/system/sysuname.s
+++ b/libsrc/geos-common/system/sysuname.s
@@ -4,8 +4,8 @@
 ; unsigned char __fastcall__ _sysuname (struct utsname* buf);
 ;
 
-	.import utscopy
-	.export __sysuname, utsdata
+	    .import utscopy
+	    .export __sysuname, utsdata
 
 __sysuname	= utscopy