diff --git a/libsrc/atari/cgetc.s b/libsrc/atari/cgetc.s
index 54fe85bb4..2e9ebcb31 100644
--- a/libsrc/atari/cgetc.s
+++ b/libsrc/atari/cgetc.s
@@ -14,10 +14,10 @@ _cgetc:
         jsr     setcursor
         lda     #12
         sta     ICAX1Z          ; fix problems with direct call to KEYBDV
-.ifndef __ATARIXL__
-        jsr     @1
-.else
+.ifdef __ATARIXL__
         jsr     KEYBDV_handler
+.else
+        jsr     @1
 .endif
         ldx     #0
         rts
diff --git a/libsrc/atari/chline.s b/libsrc/atari/chline.s
index b6ebba936..a096f35a0 100644
--- a/libsrc/atari/chline.s
+++ b/libsrc/atari/chline.s
@@ -9,10 +9,10 @@
         .import         popa, _gotoxy, cputdirect, setcursor
         .importzp       tmp1
 
-.ifndef __ATARI5200__
-CHRCODE =       $12+64
-.else
+.ifdef __ATARI5200__
 CHRCODE =       14
+.else
+CHRCODE =       $12+64
 .endif
 
 _chlinexy:
diff --git a/libsrc/atari/crt0.s b/libsrc/atari/crt0.s
index ec41565b5..f1c7b864e 100644
--- a/libsrc/atari/crt0.s
+++ b/libsrc/atari/crt0.s
@@ -53,7 +53,14 @@ start:
         tsx
         stx     SP_save
 
-.ifndef __ATARIXL__
+.ifdef __ATARIXL__
+
+        lda     #<(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
+        sta     sp
+        lda     #>(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
+        sta     sp+1
+
+.else
 
 ; Report memory usage
 
@@ -72,13 +79,6 @@ start:
         sta     APPMHI+1
         sta     sp+1                    ; setup runtime stack part 2
 
-.else
-
-        lda     #<(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
-        sta     sp
-        lda     #>(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
-        sta     sp+1
-
 .endif
 
 ; Call module constructors
diff --git a/libsrc/atari/cvline.s b/libsrc/atari/cvline.s
index 5b1c3fd09..da6c8dca4 100644
--- a/libsrc/atari/cvline.s
+++ b/libsrc/atari/cvline.s
@@ -10,10 +10,10 @@
         .import         popa, _gotoxy, putchar, setcursor
         .importzp       tmp1
 
-.ifndef __ATARI5200__
-CHRCODE =       $7C             ; Vertical bar
-.else
+.ifdef __ATARI5200__
 CHRCODE =       1               ; exclamation mark
+.else
+CHRCODE =       $7C             ; Vertical bar
 .endif
 
 _cvlinexy:
diff --git a/libsrc/atari/sysrename.s b/libsrc/atari/sysrename.s
index fef18bded..e526af5c8 100644
--- a/libsrc/atari/sysrename.s
+++ b/libsrc/atari/sysrename.s
@@ -45,13 +45,7 @@ iocbok: stx     tmp4            ; remember IOCB index
         ldy     #0
         sty     sspc+1          ; initialize stack space
 
-.ifndef  UCASE_FILENAME
-
-        sta     ptr3
-        stx     ptr3+1
-        sty     sspc
-
-.else
+.ifdef  UCASE_FILENAME
 
 ; uppercase first (old) name and prepend device if needed
 
@@ -100,6 +94,12 @@ ucok2:  sta     ptr2            ; remember pointer to uppercased new name
         inc     sspc+1
 ukok4:
 
+.else
+
+        sta     ptr3
+        stx     ptr3+1
+        sty     sspc
+
 .endif
 
 ; create a string on the stack with the old filename and the new filename separated by an invalid character (space in our case)