removed several includes from Common.h

arangod/Aql/AstNode.h

@@ -37,6 +37,7 @@
 #include "Basics/JsonHelper.h"
 
 #include <functional>
+#include <iosfwd>
 
 namespace triagens {
   namespace basics {

arangod/Aql/ExecutionBlock.h

@@ -31,6 +31,8 @@
 #include "Aql/AqlItemBlock.h"
 #include "Aql/ExecutionNode.h"
 
+#include <deque>
+
 namespace triagens {
   namespace arango {
     class AqlTransaction;

arangod/Aql/Index.h

@@ -36,6 +36,7 @@
 #include "Basics/JsonHelper.h"
 #include "Indexes/Index.h"
 #include "Indexes/IndexIterator.h"
+#include <iosfwd>
 
 namespace triagens {
   namespace aql {

arangod/Aql/Optimizer.h

@@ -29,11 +29,11 @@
 #define ARANGOD_AQL_OPTIMIZER_H 1
 
 #include "Basics/Common.h"
+#include "Aql/ExecutionPlan.h"
 #include "Basics/MutexLocker.h"
 
-#include "Aql/ExecutionPlan.h"
-
 #include <velocypack/velocypack-aliases.h>
+#include <deque>
 
 namespace triagens {
   namespace aql {

arangod/Aql/QueryList.h

@@ -34,6 +34,8 @@
 #include "Basics/ReadWriteLock.h"
 #include "VocBase/voc-types.h"
 
+#include <list>
+
 struct TRI_vocbase_t;
 
 namespace triagens {

arangod/Cluster/AgencyComm.h

@@ -36,6 +36,8 @@
 #include "Basics/json.h"
 #include "Rest/HttpRequest.h"
 
+#include <list>
+
 namespace triagens {
   namespace httpclient {
     class GeneralClientConnection;

arangod/HttpServer/HttpCommTask.h

@@ -35,6 +35,8 @@
 #include "Basics/StringBuffer.h"
 #include "Scheduler/SocketTask.h"
 
+#include <deque>
+
 namespace triagens {
   namespace rest {
     class HttpCommTask;

arangod/Rest/AnyServer.cpp

@@ -43,6 +43,8 @@
 #include "Basics/logging.h"
 #include "Basics/process-utils.h"
 
+#include <fstream>
+
 using namespace std;
 using namespace triagens;
 using namespace triagens::basics;

arangod/Scheduler/SchedulerThread.h

@@ -38,6 +38,8 @@
 #include "Scheduler/Task.h"
 #include "Scheduler/TaskManager.h"
 
+#include <deque>
+
 // #define TRI_USE_SPIN_LOCK_SCHEDULER_THREAD 1
 
 // -----------------------------------------------------------------------------

arangod/V8Server/ApplicationV8.cpp

@@ -28,10 +28,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "ApplicationV8.h"
-#include <libplatform/libplatform.h>
-
-#include <thread>
-
 #include "Actions/actions.h"
 #include "Aql/QueryRegistry.h"
 #include "ApplicationServer/ApplicationServer.h"
@@ -63,8 +59,9 @@
 #include "V8Server/v8-vocbase.h"
 #include "VocBase/server.h"
 
-#include <libplatform/libplatform.h>
 #include "3rdParty/valgrind/valgrind.h"
+#include <libplatform/libplatform.h>
+#include <thread>
 
 using namespace triagens;
 using namespace triagens::basics;

arangod/VocBase/datafile.cpp

@@ -40,6 +40,8 @@
 #include "Basics/tri-strings.h"
 #include "VocBase/server.h"
 
+#include <sstream>
+
 // #define DEBUG_DATAFILE 1
 
 using namespace std;

arangosh/ArangoShell/ArangoClient.cpp

@@ -27,7 +27,6 @@
 /// @author Copyright 2012-2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <iostream>
 #include "ArangoClient.h"
 
 #include "Basics/files.h"
@@ -39,6 +38,9 @@
 #include "Basics/ProgramOptionsDescription.h"
 #include "Basics/ProgramOptions.h"
 
+#include <iostream>
+#include <sstream>
+
 using namespace std;
 using namespace triagens::basics;
 using namespace triagens::rest;
@@ -404,9 +406,9 @@ void ArangoClient::parse (ProgramOptions& options,
 
   if (! help.empty()) {
     if (! example.empty()) {
-      cout << "USAGE:  " << argv[0] << " " << example << endl << endl;
+      std::cout << "USAGE:  " << argv[0] << " " << example << endl << endl;
     }
-    cout << description.usage(help) << endl;
+    std::cout << description.usage(help) << endl;
 
     // check for program-specific help
     std::string const progname(argv[0]);
@@ -414,7 +416,7 @@ void ArangoClient::parse (ProgramOptions& options,
         progname.size() >= _specificHelp.progname.size() && 
         progname.substr(progname.size() - _specificHelp.progname.size(), _specificHelp.progname.size()) == _specificHelp.progname) {
       // found a program-specific help
-      cout << _specificHelp.message << endl;
+      std::cout << _specificHelp.message << endl;
     }
 
     // --help always returns success

config/generateMimetypes.py

@@ -97,6 +97,7 @@ def genCFile(types, filename):
 
   impl = prologue\
          + "#include \"Basics/Common.h\"\n"\
+         + "#include \"Basics/mimetypes.h\"\n"\
          + "#include \"" + headerfile + "\"\n"\
          + "\n"\
          + "////////////////////////////////////////////////////////////////////////////////\n"\

lib/Basics/AssocMulti.h

@@ -43,6 +43,8 @@
 #include "Basics/MutexLocker.h"
 #include "Basics/prime-numbers.h"
 
+#include <thread>
+
 namespace triagens {
   namespace basics {
 

lib/Basics/AssocUnique.h

@@ -29,8 +29,8 @@
 /// @author Copyright 2006-2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef ARANGODB_HASH_INDEX_HASH__ARRAY_H
-#define ARANGODB_HASH_INDEX_HASH__ARRAY_H 1
+#ifndef ARANGODB_BASICS_ASSOC_UNIQUE_H
+#define ARANGODB_BASICS_ASSOC_UNIQUE_H 1
 
 #include "Basics/Common.h"
 #include "Basics/gcd.h"
@@ -41,6 +41,8 @@
 #include "Basics/prime-numbers.h"
 #include "Basics/random.h"
 
+#include <thread>
+
 namespace triagens {
   namespace basics {
 

lib/Basics/AttributeNameParser.h

@@ -32,6 +32,7 @@
 #define ARANGODB_BASICS_ATTRIBUTENAMEPARSER_H 1
 
 #include "Common.h"
+#include <iosfwd>
 
 namespace triagens {
   namespace basics {

lib/Basics/Common.h

@@ -130,26 +130,15 @@ typedef long suseconds_t;
 // -----------------------------------------------------------------------------
 
 #include <algorithm>
-#include <deque>
-#include <list>
 #include <map>
-#include <queue>
 #include <set>
-#include <sstream>
-#include <fstream>
-#include <stack>
 #include <string>
 #include <vector>
-
 // C++11!!
-#include <array>
 #include <unordered_map>
 #include <unordered_set>
 #include <memory>
 #include <atomic>
-#include <mutex>
-#include <condition_variable>
-#include <thread>
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                            basic triAGENS headers
@@ -160,7 +149,6 @@ typedef long suseconds_t;
 #include "Basics/error.h"
 #include "Basics/debugging.h"
 #include "Basics/memory.h"
-#include "Basics/mimetypes.h"
 #include "Basics/structures.h"
 #undef TRI_WITHIN_COMMON
 

lib/Basics/JsonHelper.h

@@ -34,6 +34,7 @@
 #include "Basics/Exceptions.h"
 #include "Basics/json.h"
 #include "Basics/StringBuffer.h"
+#include <iosfwd>
 
 namespace triagens {
   namespace basics {

lib/Basics/StringBuffer.h

@@ -39,10 +39,11 @@
 
 #include "Basics/Common.h"
 #include "Basics/Exceptions.h"
-
 #include "Basics/string-buffer.h"
 #include "Zip/zip.h"
 
+#include <sstream>
+
 // -----------------------------------------------------------------------------
 // string buffer with formatting routines
 // -----------------------------------------------------------------------------

lib/Basics/ThreadPool.h

@@ -34,7 +34,9 @@
 #include "Basics/ConditionLocker.h"
 #include "Basics/ConditionVariable.h"
 #include "Basics/Mutex.h"
+
 #include <functional>
+#include <deque>
 
 namespace triagens {
   namespace basics {

lib/Basics/Traverser.h

@@ -34,8 +34,10 @@
 #include "Basics/Exceptions.h"
 #include "Basics/hashes.h"
 
-#include <mutex>
+#include <deque>
 #include <functional>
+#include <mutex>
+#include <thread>
 
 namespace triagens {
   namespace basics {

lib/Basics/debugging.h

@@ -34,6 +34,8 @@
 #error use <Basics/Common.h>
 #endif
 
+#include <ostream>
+
 // -----------------------------------------------------------------------------
 // --SECTION--                                                    public defines
 // -----------------------------------------------------------------------------

lib/Basics/init.cpp

@@ -32,6 +32,7 @@
 #include "Basics/files.h"
 #include "Basics/hashes.h"
 #include "Basics/logging.h"
+#include "Basics/mimetypes.h"
 #include "Basics/process-utils.h"
 #include "Basics/random.h"
 

lib/Basics/mimetypes.h

@@ -30,10 +30,6 @@
 #ifndef ARANGODB_BASICS_C_MIMETYPES_H
 #define ARANGODB_BASICS_C_MIMETYPES_H 1
 
-#ifndef TRI_WITHIN_COMMON
-#error use <Basics/Common.h>
-#endif
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                      public types
 // -----------------------------------------------------------------------------
@@ -46,13 +42,13 @@
 /// @brief register a mimetype for an extension
 ////////////////////////////////////////////////////////////////////////////////
 
-bool TRI_RegisterMimetype (const char*, const char*, bool);
+bool TRI_RegisterMimetype (char const*, char const*, bool);
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief gets the mimetype for an extension
 ////////////////////////////////////////////////////////////////////////////////
 
-char* TRI_GetMimetype (const char*);
+char* TRI_GetMimetype (char const*);
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                            MODULE
@@ -66,13 +62,13 @@ char* TRI_GetMimetype (const char*);
 /// @brief initializes mimetypes
 ////////////////////////////////////////////////////////////////////////////////
 
-void TRI_InitializeMimetypes (void);
+void TRI_InitializeMimetypes ();
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief shuts down mimetypes
 ////////////////////////////////////////////////////////////////////////////////
 
-void TRI_ShutdownMimetypes (void);
+void TRI_ShutdownMimetypes ();
 
 #endif
 

lib/Basics/voc-mimetypes.cpp

@@ -3,6 +3,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Basics/Common.h"
+#include "Basics/mimetypes.h"
 #include "./lib/Basics/voc-mimetypes.h"
 
 ////////////////////////////////////////////////////////////////////////////////

lib/Rest/Version.cpp

@@ -39,6 +39,7 @@
 #include "Basics/Utf8Helper.h"
 
 #include <openssl/ssl.h>
+#include <sstream>
 
 using namespace triagens::rest;
 

lib/SimpleHttpClient/ConnectionManager.h

@@ -33,6 +33,8 @@
 #include "Basics/ReadWriteLock.h"
 #include "SimpleHttpClient/GeneralClientConnection.h"
 
+#include <list>
+
 // TODO: change to constexpr when feasible
 #define CONNECTION_MANAGER_BUCKETS 8 
 

lib/V8/v8-shell.cpp

@@ -41,6 +41,8 @@
 #include "V8/v8-json.h"
 #include "V8/v8-utils.h"
 
+#include <fstream>
+
 using namespace std;
 
 // -----------------------------------------------------------------------------