diff --git a/src/findfile.c b/src/findfile.c
index 008338cdae..c1318384e4 100644
--- a/src/findfile.c
+++ b/src/findfile.c
@@ -2979,9 +2979,12 @@ simplify_filename(char_u *filename)
 	    p = getnextcomp(p);
 	}
     } while (*p != NUL);
-#endif // !AMIGA
 
     return (size_t)(p_end - filename);
+#else
+    // Don't touch Amiga filenames
+    return STRLEN(filename);
+#endif // !AMIGA
 }
 
 #if defined(FEAT_EVAL) || defined(PROTO)
diff --git a/src/globals.h b/src/globals.h
index 653690b000..5e2f7b0f46 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -248,7 +248,7 @@ EXTERN int	did_wait_return INIT(= FALSE);	// wait_return() was used and
 EXTERN int	need_maketitle INIT(= TRUE); // call maketitle() soon
 
 EXTERN int	quit_more INIT(= FALSE);    // 'q' hit at "--more--" msg
-#if defined(UNIX) || defined(VMS) || defined(MACOS_X)
+#if defined(UNIX) || defined(VMS) || defined(MACOS_X) || defined(AMIGA)
 EXTERN int	newline_on_exit INIT(= FALSE);	// did msg in altern. screen
 EXTERN int	intr_char INIT(= 0);	    // extra interrupt character
 #endif
diff --git a/src/structs.h b/src/structs.h
index 72838bda2f..fd752109f5 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -5230,7 +5230,7 @@ typedef struct
 #define KEYVALUE_ENTRY(k, v) \
     {(k), {((char_u *)v), STRLEN_LITERAL(v)}}
 
-#if defined(UNIX) || defined(MSWIN) || defined(VMS)
+#if defined(UNIX) || defined(MSWIN) || defined(VMS) || defined(AMIGA)
 // Defined as signed, to return -1 on error
 struct cellsize {
     int cs_xpixel;
diff --git a/src/version.c b/src/version.c
index 4d03167a73..ecf543523a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1803,
 /**/
     1802,
 /**/