summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--camlibs/barbie/barbie.c1
-rw-r--r--camlibs/canon/canon.c1
-rw-r--r--camlibs/canon/library.c1
-rw-r--r--camlibs/canon/ps350/renamejpg.c1
-rw-r--r--camlibs/canon/serial.c1
-rw-r--r--camlibs/canon/usb.c1
-rw-r--r--camlibs/casio/casio-qv.c1
-rw-r--r--camlibs/digita/serial.c1
-rw-r--r--camlibs/dimera/mesalib.c1
-rw-r--r--camlibs/directory/directory.c1
-rw-r--r--camlibs/enigma13/enigma13.c1
-rw-r--r--camlibs/gsmart300/gsmart300.c1
-rw-r--r--camlibs/hp215/hp215.c1
-rw-r--r--camlibs/jamcam/library.c1
-rw-r--r--camlibs/jd11/decomp.c1
-rw-r--r--camlibs/jd11/serial.c1
-rw-r--r--camlibs/jl2005a/jl2005a.h4
-rw-r--r--camlibs/kodak/dc120/dc120.c1
-rw-r--r--camlibs/kodak/dc120/library.c1
-rw-r--r--camlibs/kodak/dc210/library.c1
-rw-r--r--camlibs/kodak/dc240/library.c1
-rw-r--r--camlibs/kodak/dc3200/dc3200.c1
-rw-r--r--camlibs/kodak/dc3200/library.c1
-rw-r--r--camlibs/konica/qm150.c1
-rw-r--r--camlibs/largan/lmini/lmini.c1
-rw-r--r--camlibs/mars/mars.c2
-rw-r--r--camlibs/mars/mars.h4
-rw-r--r--camlibs/mustek/io.c1
-rw-r--r--camlibs/mustek/rs232.c1
-rw-r--r--camlibs/mustek/usb.c1
-rw-r--r--camlibs/panasonic/coolshot/library.c1
-rw-r--r--camlibs/panasonic/dc.c1
-rw-r--r--camlibs/panasonic/dc1000.c1
-rw-r--r--camlibs/panasonic/dc1580.c1
-rw-r--r--camlibs/pentax/library.c1
-rw-r--r--camlibs/pentax/pslr.c1
-rw-r--r--camlibs/ptp2/chdk.c1
-rw-r--r--camlibs/ptp2/config.c1
-rw-r--r--camlibs/ptp2/library.c1
-rw-r--r--camlibs/ptp2/ptp.c4
-rw-r--r--camlibs/ptp2/usb.c1
-rw-r--r--camlibs/ricoh/g3.c1
-rw-r--r--camlibs/ricoh/ricoh.c1
-rw-r--r--camlibs/sierra/library.c1
-rw-r--r--camlibs/sipix/blink2.c1
-rw-r--r--camlibs/sipix/xjpeg.c1
-rw-r--r--camlibs/sonydscf1/command.c1
-rw-r--r--camlibs/sonydscf55/sony.c1
-rw-r--r--camlibs/soundvision/agfa_cl18.c1
-rw-r--r--camlibs/soundvision/tiger_fastflicks.c1
-rw-r--r--camlibs/spca50x/spca50x-flash.c1
-rw-r--r--camlibs/spca50x/spca50x-sdram.c1
-rw-r--r--camlibs/spca50x/spca50x.c1
-rw-r--r--camlibs/topfield/puppy.c1
-rw-r--r--camlibs/topfield/usb_io.c1
-rw-r--r--camlibs/toshiba/pdrm11/pdrm11.c1
-rw-r--r--camlibs/tp6801/tp6801-dump.c1
-rw-r--r--camlibs/tp6801/tp6801.c1
-rw-r--r--examples/best-iso.c1
-rw-r--r--examples/lunkwill-canon-capture.c1
-rw-r--r--examples/preview.c1
-rw-r--r--examples/sample-capture.c1
-rw-r--r--examples/sample-justfocus.c1
-rw-r--r--examples/sample-tether.c1
-rw-r--r--examples/sample-trigger-capture.c1
-rw-r--r--libgphoto2/gphoto2-file.c1
-rw-r--r--libgphoto2/gphoto2-filesys.c1
-rw-r--r--libgphoto2/gphoto2-setting.c1
68 files changed, 9 insertions, 69 deletions
diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c
index 388c7d33a..2ee40f7e9 100644
--- a/camlibs/barbie/barbie.c
+++ b/camlibs/barbie/barbie.c
@@ -30,7 +30,6 @@
#include <stdlib.h>
#include <string.h>
#include <bayer.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#ifdef ENABLE_NLS
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index 53abda4e5..7ce3e8c85 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
-#include <unistd.h>
#include <ctype.h>
#ifdef TM_IN_SYS_TIME
diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c
index a5f4b516e..872a604a8 100644
--- a/camlibs/canon/library.c
+++ b/camlibs/canon/library.c
@@ -26,7 +26,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <sys/types.h>
diff --git a/camlibs/canon/ps350/renamejpg.c b/camlibs/canon/ps350/renamejpg.c
index 40b329157..34c15bb7b 100644
--- a/camlibs/canon/ps350/renamejpg.c
+++ b/camlibs/canon/ps350/renamejpg.c
@@ -4,7 +4,6 @@
#include <stdlib.h>
#include <time.h>
#include <sys/stat.h>
-#include <unistd.h>
void main (int argc, char **argv)
{
diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c
index 093bf8931..f9f729bbe 100644
--- a/camlibs/canon/serial.c
+++ b/camlibs/canon/serial.c
@@ -17,7 +17,6 @@
#include "config.h"
#include <stdio.h>
-#include <unistd.h>
#include <fcntl.h>
#include <string.h>
#include <sys/time.h>
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c
index bf441b91c..689b9f7bc 100644
--- a/camlibs/canon/usb.c
+++ b/camlibs/canon/usb.c
@@ -14,7 +14,6 @@
#include <string.h>
#include <time.h>
#include <sys/time.h>
-#include <unistd.h>
#include <ctype.h>
#ifdef CANON_EXPERIMENTAL_UPLOAD
/* For filestat to get file time for upload */
diff --git a/camlibs/casio/casio-qv.c b/camlibs/casio/casio-qv.c
index 65bffce23..0d625f2d7 100644
--- a/camlibs/casio/casio-qv.c
+++ b/camlibs/casio/casio-qv.c
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <unistd.h>
#include "casio-qv-commands.h"
#include "camtojpeg.h"
diff --git a/camlibs/digita/serial.c b/camlibs/digita/serial.c
index 2c1d950f6..056d7b3ad 100644
--- a/camlibs/digita/serial.c
+++ b/camlibs/digita/serial.c
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <errno.h>
#include <string.h>
-#include <unistd.h>
#ifdef OS2
#include <db.h>
#endif
diff --git a/camlibs/dimera/mesalib.c b/camlibs/dimera/mesalib.c
index 1368d9c09..8a39ab3a9 100644
--- a/camlibs/dimera/mesalib.c
+++ b/camlibs/dimera/mesalib.c
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <sys/time.h>
#include <string.h>
diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
index b33397657..05c8f976b 100644
--- a/camlibs/directory/directory.c
+++ b/camlibs/directory/directory.c
@@ -30,7 +30,6 @@
#include <string.h>
#include <sys/types.h>
#include <utime.h>
-#include <unistd.h>
#ifdef HAVE_SYS_STATVFS_H
# include <sys/statvfs.h>
#endif
diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c
index d00347e36..6cb2be286 100644
--- a/camlibs/enigma13/enigma13.c
+++ b/camlibs/enigma13/enigma13.c
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/gsmart300/gsmart300.c b/camlibs/gsmart300/gsmart300.c
index d85f1c506..23ade0b88 100644
--- a/camlibs/gsmart300/gsmart300.c
+++ b/camlibs/gsmart300/gsmart300.c
@@ -32,7 +32,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "gphoto2-endian.h"
diff --git a/camlibs/hp215/hp215.c b/camlibs/hp215/hp215.c
index e22a0f0c7..cd56b3b92 100644
--- a/camlibs/hp215/hp215.c
+++ b/camlibs/hp215/hp215.c
@@ -63,7 +63,6 @@
#include <sys/types.h>
#include <fcntl.h>
-#include <unistd.h>
#include <stdlib.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/jamcam/library.c b/camlibs/jamcam/library.c
index 68493cf54..3bdaa9b4b 100644
--- a/camlibs/jamcam/library.c
+++ b/camlibs/jamcam/library.c
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <gphoto2/gphoto2.h>
#include <time.h>
-#include <unistd.h>
#include <math.h>
#include "library.h"
diff --git a/camlibs/jd11/decomp.c b/camlibs/jd11/decomp.c
index 899dc1eab..b05956651 100644
--- a/camlibs/jd11/decomp.c
+++ b/camlibs/jd11/decomp.c
@@ -23,7 +23,6 @@
#include <string.h>
#include <assert.h>
#include <stdlib.h>
-#include <unistd.h>
#include "decomp.h"
diff --git a/camlibs/jd11/serial.c b/camlibs/jd11/serial.c
index 2613485ee..f8c6a2ebe 100644
--- a/camlibs/jd11/serial.c
+++ b/camlibs/jd11/serial.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
#include <gphoto2/gphoto2.h>
diff --git a/camlibs/jl2005a/jl2005a.h b/camlibs/jl2005a/jl2005a.h
index cbe554e7c..7b90cb7c8 100644
--- a/camlibs/jl2005a/jl2005a.h
+++ b/camlibs/jl2005a/jl2005a.h
@@ -21,7 +21,9 @@
#ifndef __jl2005a_H__
#define __jl2005a_H__
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <gphoto2/gphoto2-port.h>
struct _CameraPrivateLibrary {
diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c
index 0ef4b1441..35286e804 100644
--- a/camlibs/kodak/dc120/dc120.c
+++ b/camlibs/kodak/dc120/dc120.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <string.h>
#include <time.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c
index 86c6f64f0..8382144fc 100644
--- a/camlibs/kodak/dc120/library.c
+++ b/camlibs/kodak/dc120/library.c
@@ -26,7 +26,6 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "dc120.h"
diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c
index 5c0a010b2..9c1929ec4 100644
--- a/camlibs/kodak/dc210/library.c
+++ b/camlibs/kodak/dc210/library.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "dc210.h"
diff --git a/camlibs/kodak/dc240/library.c b/camlibs/kodak/dc240/library.c
index c103bfa3f..5eec9a5ef 100644
--- a/camlibs/kodak/dc240/library.c
+++ b/camlibs/kodak/dc240/library.c
@@ -30,7 +30,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c
index 3ca236963..36cc1e311 100644
--- a/camlibs/kodak/dc3200/dc3200.c
+++ b/camlibs/kodak/dc3200/dc3200.c
@@ -36,7 +36,6 @@
#include <stdio.h>
#include <string.h>
#include <time.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
diff --git a/camlibs/kodak/dc3200/library.c b/camlibs/kodak/dc3200/library.c
index 2e9c94f82..9da5b2d56 100644
--- a/camlibs/kodak/dc3200/library.c
+++ b/camlibs/kodak/dc3200/library.c
@@ -39,7 +39,6 @@
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
-#include <unistd.h>
#include <errno.h>
#include "dc3200.h"
diff --git a/camlibs/konica/qm150.c b/camlibs/konica/qm150.c
index 67fad500e..81446b2d8 100644
--- a/camlibs/konica/qm150.c
+++ b/camlibs/konica/qm150.c
@@ -43,7 +43,6 @@
#include <gphoto2/gphoto2-result.h>
#include <gphoto2/gphoto2-port-log.h>
#include <exif.h>
-#include <unistd.h>
#ifdef ENABLE_NLS
# include <libintl.h>
diff --git a/camlibs/largan/lmini/lmini.c b/camlibs/largan/lmini/lmini.c
index 9978551a7..b1d5cf587 100644
--- a/camlibs/largan/lmini/lmini.c
+++ b/camlibs/largan/lmini/lmini.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/mars/mars.c b/camlibs/mars/mars.c
index 72bc64643..f15b0e8cd 100644
--- a/camlibs/mars/mars.c
+++ b/camlibs/mars/mars.c
@@ -24,9 +24,7 @@
#include <config.h>
#include <stdio.h>
-#include <unistd.h>
#include <stdlib.h>
-#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <string.h>
diff --git a/camlibs/mars/mars.h b/camlibs/mars/mars.h
index 0e50ab654..b4a3f504c 100644
--- a/camlibs/mars/mars.h
+++ b/camlibs/mars/mars.h
@@ -21,7 +21,9 @@
#ifndef __mars_H__
#define __mars_H__
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <gphoto2/gphoto2-port.h>
typedef unsigned char Info;
diff --git a/camlibs/mustek/io.c b/camlibs/mustek/io.c
index 41b76133c..0436a9d71 100644
--- a/camlibs/mustek/io.c
+++ b/camlibs/mustek/io.c
@@ -35,7 +35,6 @@
#include "io.h"
#include <string.h>
#include <sys/time.h>
-#include <unistd.h>
#include "print.h"
#include "rs232.h"
#include "usb.h"
diff --git a/camlibs/mustek/rs232.c b/camlibs/mustek/rs232.c
index 5e4bde4b2..9f020b80f 100644
--- a/camlibs/mustek/rs232.c
+++ b/camlibs/mustek/rs232.c
@@ -31,7 +31,6 @@
#include <fcntl.h>
#include <sys/time.h>
-#include <unistd.h>
/*
diff --git a/camlibs/mustek/usb.c b/camlibs/mustek/usb.c
index 2e3c1681c..9c678656a 100644
--- a/camlibs/mustek/usb.c
+++ b/camlibs/mustek/usb.c
@@ -38,7 +38,6 @@
#include <fcntl.h>
#include <sys/time.h>
-#include <unistd.h>
/*
diff --git a/camlibs/panasonic/coolshot/library.c b/camlibs/panasonic/coolshot/library.c
index c03289537..ab4ad39e8 100644
--- a/camlibs/panasonic/coolshot/library.c
+++ b/camlibs/panasonic/coolshot/library.c
@@ -34,7 +34,6 @@
#include <gphoto2/gphoto2.h>
#include <time.h>
#include "library.h"
-#include <unistd.h>
#ifdef ENABLE_NLS
# include <libintl.h>
diff --git a/camlibs/panasonic/dc.c b/camlibs/panasonic/dc.c
index 3801fb29f..a1ffb99ea 100644
--- a/camlibs/panasonic/dc.c
+++ b/camlibs/panasonic/dc.c
@@ -25,7 +25,6 @@
#include <stdarg.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <unistd.h>
#include <string.h>
#ifdef HAVE_MEMORY_H
#include <memory.h>
diff --git a/camlibs/panasonic/dc1000.c b/camlibs/panasonic/dc1000.c
index d71029988..a56dbe5e6 100644
--- a/camlibs/panasonic/dc1000.c
+++ b/camlibs/panasonic/dc1000.c
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <unistd.h>
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
diff --git a/camlibs/panasonic/dc1580.c b/camlibs/panasonic/dc1580.c
index 63fc26182..be0d6b7fb 100644
--- a/camlibs/panasonic/dc1580.c
+++ b/camlibs/panasonic/dc1580.c
@@ -26,7 +26,6 @@
#include <stdarg.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <unistd.h>
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
diff --git a/camlibs/pentax/library.c b/camlibs/pentax/library.c
index b9ec267d0..c52991268 100644
--- a/camlibs/pentax/library.c
+++ b/camlibs/pentax/library.c
@@ -29,7 +29,6 @@
#include <stdio.h>
#include <sys/time.h>
#include <stdbool.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-result.h>
diff --git a/camlibs/pentax/pslr.c b/camlibs/pentax/pslr.c
index ef163c641..25abeb06f 100644
--- a/camlibs/pentax/pslr.c
+++ b/camlibs/pentax/pslr.c
@@ -27,7 +27,6 @@
#include <fcntl.h>
#include <stdlib.h>
#include <signal.h>
-#include <unistd.h>
#include <stdbool.h>
#ifndef LIBGPHOTO2
diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c
index 3b8a99501..5c27d5f43 100644
--- a/camlibs/ptp2/chdk.c
+++ b/camlibs/ptp2/chdk.c
@@ -27,7 +27,6 @@
#include <stdarg.h>
#include <time.h>
#include <sys/time.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 09b827763..e7b822b19 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -32,7 +32,6 @@
# include <arpa/inet.h>
#endif
#include <sys/types.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index d9122f468..f910e9b26 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -33,7 +33,6 @@
#if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
#include <langinfo.h>
#endif
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index 4ceb5da40..68158c197 100644
--- a/camlibs/ptp2/ptp.c
+++ b/camlibs/ptp2/ptp.c
@@ -34,7 +34,9 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef ENABLE_NLS
# include <libintl.h>
diff --git a/camlibs/ptp2/usb.c b/camlibs/ptp2/usb.c
index 64abb75db..cf840396e 100644
--- a/camlibs/ptp2/usb.c
+++ b/camlibs/ptp2/usb.c
@@ -30,7 +30,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/ricoh/g3.c b/camlibs/ricoh/g3.c
index 1f7a9a9fb..433d0453d 100644
--- a/camlibs/ricoh/g3.c
+++ b/camlibs/ricoh/g3.c
@@ -23,7 +23,6 @@
#include <time.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-result.h>
diff --git a/camlibs/ricoh/ricoh.c b/camlibs/ricoh/ricoh.c
index 08001f64f..c089a7a4e 100644
--- a/camlibs/ricoh/ricoh.c
+++ b/camlibs/ricoh/ricoh.c
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c
index 22cc6fb02..7ff86941f 100644
--- a/camlibs/sierra/library.c
+++ b/camlibs/sierra/library.c
@@ -25,7 +25,6 @@
#include <ctype.h>
#include <string.h>
#include <time.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/camlibs/sipix/blink2.c b/camlibs/sipix/blink2.c
index 7b9f68ab9..9147bd1af 100644
--- a/camlibs/sipix/blink2.c
+++ b/camlibs/sipix/blink2.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#ifdef HAVE_LIBJPEG
# include <jpeglib.h>
diff --git a/camlibs/sipix/xjpeg.c b/camlibs/sipix/xjpeg.c
index c2634dd25..e20eeb3f5 100644
--- a/camlibs/sipix/xjpeg.c
+++ b/camlibs/sipix/xjpeg.c
@@ -18,7 +18,6 @@
* Boston, MA 02110-1301 USA
*/
#include <stdio.h>
-#include <unistd.h>
#include <stdlib.h>
#include <string.h>
diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c
index e76aa0d86..9966d5a5d 100644
--- a/camlibs/sonydscf1/command.c
+++ b/camlibs/sonydscf1/command.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
diff --git a/camlibs/sonydscf55/sony.c b/camlibs/sonydscf55/sony.c
index a7e250860..bd1c43585 100644
--- a/camlibs/sonydscf55/sony.c
+++ b/camlibs/sonydscf55/sony.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "sony.h"
diff --git a/camlibs/soundvision/agfa_cl18.c b/camlibs/soundvision/agfa_cl18.c
index 3328346ef..d97bb331b 100644
--- a/camlibs/soundvision/agfa_cl18.c
+++ b/camlibs/soundvision/agfa_cl18.c
@@ -30,7 +30,6 @@
#ifdef OS2
#include <db.h>
#endif
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "gphoto2-endian.h"
diff --git a/camlibs/soundvision/tiger_fastflicks.c b/camlibs/soundvision/tiger_fastflicks.c
index 568052888..62f804565 100644
--- a/camlibs/soundvision/tiger_fastflicks.c
+++ b/camlibs/soundvision/tiger_fastflicks.c
@@ -45,7 +45,6 @@
#ifdef OS2
#include <db.h>
#endif
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "gphoto2-endian.h"
diff --git a/camlibs/spca50x/spca50x-flash.c b/camlibs/spca50x/spca50x-flash.c
index 3b60d9cb3..7df9b8ed8 100644
--- a/camlibs/spca50x/spca50x-flash.c
+++ b/camlibs/spca50x/spca50x-flash.c
@@ -32,7 +32,6 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include <gphoto2/gphoto2-port.h>
diff --git a/camlibs/spca50x/spca50x-sdram.c b/camlibs/spca50x/spca50x-sdram.c
index 1b1074e58..19b99519a 100644
--- a/camlibs/spca50x/spca50x-sdram.c
+++ b/camlibs/spca50x/spca50x-sdram.c
@@ -30,7 +30,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "gphoto2-endian.h"
diff --git a/camlibs/spca50x/spca50x.c b/camlibs/spca50x/spca50x.c
index 4aa04c81c..a98dd93fd 100644
--- a/camlibs/spca50x/spca50x.c
+++ b/camlibs/spca50x/spca50x.c
@@ -32,7 +32,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "gphoto2-endian.h"
diff --git a/camlibs/topfield/puppy.c b/camlibs/topfield/puppy.c
index 873ad3024..552ae0f41 100644
--- a/camlibs/topfield/puppy.c
+++ b/camlibs/topfield/puppy.c
@@ -53,7 +53,6 @@
#include <utime.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <unistd.h>
#include <fcntl.h>
#if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
diff --git a/camlibs/topfield/usb_io.c b/camlibs/topfield/usb_io.c
index 127c57bf1..87356d36f 100644
--- a/camlibs/topfield/usb_io.c
+++ b/camlibs/topfield/usb_io.c
@@ -26,7 +26,6 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <unistd.h>
#include "usb_io.h"
#include "tf_bytes.h"
#include "crc16.h"
diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c
index a936b347c..965d4fcd5 100644
--- a/camlibs/toshiba/pdrm11/pdrm11.c
+++ b/camlibs/toshiba/pdrm11/pdrm11.c
@@ -23,7 +23,6 @@
#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include <gphoto2/gphoto2.h>
#include "gphoto2-endian.h"
diff --git a/camlibs/tp6801/tp6801-dump.c b/camlibs/tp6801/tp6801-dump.c
index d5205be1b..663108db8 100644
--- a/camlibs/tp6801/tp6801-dump.c
+++ b/camlibs/tp6801/tp6801-dump.c
@@ -20,7 +20,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
diff --git a/camlibs/tp6801/tp6801.c b/camlibs/tp6801/tp6801.c
index 36b494224..baf8041e3 100644
--- a/camlibs/tp6801/tp6801.c
+++ b/camlibs/tp6801/tp6801.c
@@ -33,7 +33,6 @@
#ifdef HAVE_LIBGD
#include <gd.h>
#endif
-#include <unistd.h>
#include <gphoto2/gphoto2-result.h>
#include "tp6801.h"
diff --git a/examples/best-iso.c b/examples/best-iso.c
index f59cdbaee..e46220672 100644
--- a/examples/best-iso.c
+++ b/examples/best-iso.c
@@ -5,7 +5,6 @@
*
*/
-#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/examples/lunkwill-canon-capture.c b/examples/lunkwill-canon-capture.c
index b16739d96..630c2918c 100644
--- a/examples/lunkwill-canon-capture.c
+++ b/examples/lunkwill-canon-capture.c
@@ -10,7 +10,6 @@
* Taken from: http://credentiality2.blogspot.com/2008/07/linux-libgphoto2-image-capture-from.html
*/
-#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/examples/preview.c b/examples/preview.c
index 094df21f7..4157cf0d6 100644
--- a/examples/preview.c
+++ b/examples/preview.c
@@ -10,7 +10,6 @@
* Taken from: http://credentiality2.blogspot.com/2008/07/linux-libgphoto2-image-capture-from.html
*/
-#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/examples/sample-capture.c b/examples/sample-capture.c
index 6fbeb1d3c..952b434c7 100644
--- a/examples/sample-capture.c
+++ b/examples/sample-capture.c
@@ -12,7 +12,6 @@
* and condensed into simple capture sample
*/
-#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/examples/sample-justfocus.c b/examples/sample-justfocus.c
index a3a80c9a9..3b5b06bea 100644
--- a/examples/sample-justfocus.c
+++ b/examples/sample-justfocus.c
@@ -1,4 +1,3 @@
-#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/examples/sample-tether.c b/examples/sample-tether.c
index c8cea9212..7721ec550 100644
--- a/examples/sample-tether.c
+++ b/examples/sample-tether.c
@@ -6,7 +6,6 @@
*
*/
-#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/examples/sample-trigger-capture.c b/examples/sample-trigger-capture.c
index c5b13faa9..baa968905 100644
--- a/examples/sample-trigger-capture.c
+++ b/examples/sample-trigger-capture.c
@@ -1,7 +1,6 @@
/*
*/
-#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/time.h>
diff --git a/libgphoto2/gphoto2-file.c b/libgphoto2/gphoto2-file.c
index 349218d14..bc6a8edf5 100644
--- a/libgphoto2/gphoto2-file.c
+++ b/libgphoto2/gphoto2-file.c
@@ -33,7 +33,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
-#include <unistd.h>
#include <string.h>
#include <sys/stat.h>
#include <utime.h>
diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c
index 129bec5ca..ad8b419e9 100644
--- a/libgphoto2/gphoto2-filesys.c
+++ b/libgphoto2/gphoto2-filesys.c
@@ -31,7 +31,6 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-result.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/libgphoto2/gphoto2-setting.c b/libgphoto2/gphoto2-setting.c
index df3b2b0e8..4eeb89d1a 100644
--- a/libgphoto2/gphoto2-setting.c
+++ b/libgphoto2/gphoto2-setting.c
@@ -29,7 +29,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <gphoto2/gphoto2-result.h>
#include <gphoto2/gphoto2-port-log.h>