include reordering for XMP_AMIGA. add missing guards to unistd.h.

src/commands.c

@@ -6,10 +6,13 @@
  * file for more information.
  */
 
-#include <unistd.h>
+#include <xmp.h>
+#include "common.h"
+
 #if defined(_WIN32) || defined(__OS2__) || defined(__DJGPP__) || defined(_DOS)
 #include <conio.h>
 #endif
+
 #if defined(XMP_AMIGA)
 #ifdef __amigaos4__
 #define __USE_INLINE__
@@ -17,8 +20,10 @@
 #include <proto/exec.h>
 #include <proto/dos.h>
 #endif
-#include <xmp.h>
-#include "common.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #ifdef __CYGWIN__
 #include <sys/select.h>

src/options.c

@@ -13,12 +13,16 @@
 #include <strings.h>
 #endif
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG)
 #include <getopt.h>
 #else
 #include "getopt_long.h"
 #endif
+
 #include <xmp.h>
 
 #include "common.h"