Merge remote-tracking branch 'origin/topic/timw/776-using-statements'

* origin/topic/timw/776-using-statements:
  Remove 'using namespace std' from SerialTypes.h
  Remove other using statements from headers
  GH-776: Remove using statements added by PR 770

Includes small fixes in files that changed since the merge request was
made.

Also includes a few small indentation fixes.

src/file_analysis/FileTimer.h

@@ -2,11 +2,8 @@
 
 #pragma once
 
-#include "Timer.h"
-
 #include <string>
-
-using std::string;
+#include "Timer.h"
 
 namespace file_analysis {
 
@@ -22,7 +19,7 @@ public:
 	 * @param id the file identifier which will be checked for inactivity.
 	 * @param interval amount of time after \a t to check for inactivity.
 	 */
-	FileTimer(double t, const string& id, double interval);
+	FileTimer(double t, const std::string& id, double interval);
 
 	/**
 	 * Check inactivity of file_analysis::File corresponding to #file_id,
@@ -33,7 +30,7 @@ public:
 	void Dispatch(double t, bool is_expire) override;
 
 private:
-	string file_id;
+	std::string file_id;
 };
 
 } // namespace file_analysis