diff --git a/src/Facility.cpp b/src/Facility.cpp
index b155f5f..d9b279f 100644
--- a/src/Facility.cpp
+++ b/src/Facility.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 const std::string Facility::readFromStream(std::istream& src) {
     std::string ret;
     while (src) {
-        std::istream::char_type c = src.get();
+        auto c = src.get();
         if (c == '.') {
             break;
         } else {
diff --git a/src/Severity.cpp b/src/Severity.cpp
index 2374cd1..881f155 100644
--- a/src/Severity.cpp
+++ b/src/Severity.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 const std::string Severity::readFromStream(std::istream& src) {
     std::string ret;
     while (src) {
-        std::istream::char_type c = src.get();
+        auto c = src.get();
         if (c == ' ' || c == '\t') {
             break;
         } else {
diff --git a/src/SyslogMessage.cpp b/src/SyslogMessage.cpp
index e91a102..1a1d9e1 100644
--- a/src/SyslogMessage.cpp
+++ b/src/SyslogMessage.cpp
@@ -26,7 +26,7 @@ SOFTWARE.
 
 void skipWhitespace(std::istream& src) {
     while (src) {
-        std::istream::char_type c = src.peek();
+        auto c = src.peek();
         if (c == ' ' || c == '\t') {
             src.get();
             continue;
@@ -40,7 +40,7 @@ const boost::posix_time::ptime SyslogMessage::readTimestamp(std::istream& src) {
     int ws = 0;
     std::string ts;
     while (src) {
-        std::istream::char_type c = src.get();
+        auto c = src.get();
         if (c == ' ' || c == '\t') {
             ws++;
         }
@@ -66,7 +66,7 @@ const std::string SyslogMessage::readSource(std::istream& src) {
     std::string ret;
     skipWhitespace(src);
     while (src) {
-        std::istream::char_type c = src.get();
+        auto c = src.get();
         if (c == ' ' || c == '\t') {
             break;
         } else {
@@ -80,7 +80,7 @@ const std::string SyslogMessage::readMessage(std::istream & src) {
     std::string ret;
     skipWhitespace(src);
     while (src) {
-        std::istream::char_type c = src.get();
+        auto c = src.get();
         if (!src.eof()) {
             ret.push_back(c);
         }
diff --git a/test/SyslogBulkUploaderTests.cpp b/test/SyslogBulkUploaderTests.cpp
index 8069d4d..f0b3c52 100644
--- a/test/SyslogBulkUploaderTests.cpp
+++ b/test/SyslogBulkUploaderTests.cpp
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(test_run) {
     SyslogBulkUploader ul(r, w);
     ul.run();
     BOOST_CHECK_EQUAL(w._messages.size(), 3);
-    for (size_t i = 0; i < w._messages.size(); i++) {
+    for (auto i = 0; i < w._messages.size(); i++) {
         std::cout << *(w._messages[i].get()) << std::endl;
     }
 }