Remove unneeded headers identified by IWYU (#2007)

src/addhead.cpp

@@ -20,13 +20,16 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <sstream>
 #include <fstream>
+#include <strings.h>
+#include <vector>
 
-#include "common.h"
 #include "s3fs.h"
 #include "addhead.h"
 #include "curl_util.h"
+#include "s3fs_logger.h"
 
 //-------------------------------------------------------------------
 // Symbols

src/autolock.cpp

@@ -18,13 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cstdio>
 #include <cstdlib>
 #include <cerrno>
 
-#include "common.h"
-#include "s3fs.h"
 #include "autolock.h"
+#include "s3fs_logger.h"
 
 //-------------------------------------------------------------------
 // Class AutoLock

src/common_auth.cpp

@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <climits>
 #include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include <string>
 
 #include "common.h"

src/curl.cpp

@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <ctime>
+#include <errno.h>
 #include <unistd.h>
 #include <fstream>
 #include <sstream>

src/curl.h

@@ -21,17 +21,14 @@
 #ifndef S3FS_CURL_H_
 #define S3FS_CURL_H_
 
-#include <cassert>
 #include <curl/curl.h>
 #include <list>
 #include <map>
-#include <strings.h>
 #include <vector>
 
 #include "common.h"
 #include "curl_handlerpool.h"
 #include "bodydata.h"
-#include "psemaphore.h"
 #include "metaheader.h"
 #include "fdcache_page.h"
 #include "s3fs_cred.h"
@@ -80,6 +77,7 @@ typedef std::map<CURL*, progress_t> curlprogress_t;
 // class S3fsCurl
 //----------------------------------------------
 class S3fsCurl;
+class Semaphore;
 
 // Prototype function for lazy setup options for curl handle
 typedef bool (*s3fscurl_lazy_setup)(S3fsCurl* s3fscurl);

src/curl_handlerpool.cpp

@@ -19,7 +19,6 @@
  */
 
 #include <cstdio>
-#include <cstdlib>
 
 #include "common.h"
 #include "s3fs.h"

src/curl_multi.cpp

@@ -27,6 +27,7 @@
 #include "curl_multi.h"
 #include "curl.h"
 #include "autolock.h"
+#include "psemaphore.h"
 
 //-------------------------------------------------------------------
 // Class S3fsMultiCurl 

src/fdcache_auto.cpp

@@ -19,7 +19,6 @@
  */
 
 #include <cstdio>
-#include <cstdlib>
 
 #include "common.h"
 #include "s3fs.h"

src/fdcache_fdinfo.cpp

@@ -20,11 +20,8 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <errno.h>
 #include <unistd.h>
-#include <algorithm>
-#include <fstream>
-#include <iostream>
-#include <climits>
 
 #include "common.h"
 #include "s3fs.h"

src/fdcache_page.cpp

@@ -19,7 +19,6 @@
  */
 
 #include <cstdio>
-#include <cstdlib>
 #include <cerrno>
 #include <unistd.h>
 #include <sstream>

src/fdcache_pseudofd.cpp

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cstdio>
 #include <cstdlib>
 #include <algorithm>
 

src/fdcache_stat.cpp

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cstdio>
-#include <cstdlib>
 #include <cerrno>
 #include <unistd.h>
 #include <sys/file.h>

src/fdcache_stat.h

@@ -21,6 +21,8 @@
 #ifndef S3FS_FDCACHE_STAT_H_
 #define S3FS_FDCACHE_STAT_H_
 
+#include <string>
+
 //------------------------------------------------
 // CacheFileStat
 //------------------------------------------------

src/fdcache_untreated.cpp

@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cstdio>
 #include <cstdlib>
-#include <algorithm>
 
 #include "common.h"
 #include "s3fs.h"

src/metaheader.cpp

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cstdio>
-#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 

src/metaheader.h

@@ -23,7 +23,6 @@
 
 #include <string>
 #include <map>
-#include <list>
 
 //-------------------------------------------------------------------
 // headers_t

src/s3fs.cpp

@@ -20,14 +20,13 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <getopt.h>
 
-#include <fstream>
-
 #include "common.h"
 #include "s3fs.h"
 #include "metaheader.h"

src/s3fs_cred.cpp

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <errno.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/types.h>

src/s3fs_help.cpp

@@ -19,7 +19,6 @@
  */
 
 #include <cstdio>
-#include <cstdlib>
 
 #include <string>
 

src/s3fs_logger.h

@@ -23,6 +23,7 @@
 
 #include <cstdarg>
 #include <cstdio>
+#include <string>
 #include <syslog.h>
 #include <sys/time.h>
 

src/s3fs_xml.cpp

@@ -20,11 +20,13 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <libxml/xpathInternals.h>
 
 #include "common.h"
 #include "s3fs.h"
 #include "s3fs_xml.h"
 #include "s3fs_util.h"
+#include "s3objlist.h"
 #include "autolock.h"
 
 //-------------------------------------------------------------------

src/s3fs_xml.h

@@ -22,14 +22,13 @@
 #define S3FS_S3FS_XML_H_
 
 #include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-#include <libxml/tree.h>
 
 #include <string>
 
-#include "s3objlist.h"
 #include "mpu_util.h"
 
+class S3ObjList;
+
 //-------------------------------------------------------------------
 // Functions
 //-------------------------------------------------------------------

src/s3objlist.cpp

@@ -19,10 +19,8 @@
  */
 
 #include <cstdio>
-#include <cstdlib>
+#include <cstring>
 
-#include "common.h"
-#include "s3fs.h"
 #include "s3objlist.h"
 
 //-------------------------------------------------------------------

src/s3objlist.h

@@ -21,6 +21,10 @@
 #ifndef S3FS_S3OBJLIST_H_
 #define S3FS_S3OBJLIST_H_
 
+#include <list>
+#include <map>
+#include <string>
+
 //-------------------------------------------------------------------
 // Structure / Typedef
 //-------------------------------------------------------------------

src/sighandlers.cpp

@@ -19,7 +19,6 @@
  */
 
 #include <cstdio>
-#include <cstdlib>
 #include <csignal>
 #include <pthread.h>
 

src/sighandlers.h

@@ -21,7 +21,7 @@
 #ifndef S3FS_SIGHANDLERS_H_
 #define S3FS_SIGHANDLERS_H_
 
-#include "psemaphore.h"
+class Semaphore;
 
 //----------------------------------------------
 // class S3fsSignals

src/string_util.cpp

@@ -25,7 +25,6 @@
 #include <climits>
 #include <iomanip>
 
-#include <stdexcept>
 #include <sstream>
 
 #include "common.h"

src/test_page_list.cpp

@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <limits>
-#include <stdint.h>
-#include <string>
-
 #include "fdcache.h"
 #include "test_util.h"
 

src/test_string_util.cpp

@@ -21,9 +21,7 @@
 #include <cstdlib>
 #include <limits>
 #include <stdint.h>
-#include <strings.h>
 #include <string>
-#include <map>
 
 #include "common.h"
 #include "s3fs.h"

src/threadpoolman.cpp

@@ -20,7 +20,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <algorithm>
 #include <errno.h>
 
 #include "common.h"