diff --git a/g2log/src/active.hpp b/g2log/src/active.hpp
index 115e03c..e4525c7 100644
--- a/g2log/src/active.hpp
+++ b/g2log/src/active.hpp
@@ -21,7 +21,7 @@
 #include <functional>
 #include <memory>
 
-#include "shared_queue.h"
+#include "shared_queue.hpp"
 
 namespace kjellkod {
 typedef std::function<void() > Callback;
diff --git a/g2log/src/g2future.h b/g2log/src/g2future.hpp
similarity index 98%
rename from g2log/src/g2future.h
rename to g2log/src/g2future.hpp
index 5ddea96..de04385 100644
--- a/g2log/src/g2future.h
+++ b/g2log/src/g2future.hpp
@@ -5,7 +5,7 @@
 * with no warranties. This code is yours to share, use and modify with no
 * strings attached and no restrictions or obligations.
 * ============================================================================
-* Filename:g2future.h
+* Filename:g2future.hpp
 *          Helper functionality to put packaged_tasks in standard container. This
 *          is especially helpful for background thread processing a la async but through
 *          an actor pattern (active object), thread pool or similar.
diff --git a/g2log/src/g2logworker.cpp b/g2log/src/g2logworker.cpp
index 03e7676..a9e641f 100644
--- a/g2log/src/g2logworker.cpp
+++ b/g2log/src/g2logworker.cpp
@@ -16,7 +16,7 @@
 #include "active.hpp"
 #include "g2log.hpp"
 #include "g2time.hpp"
-#include "g2future.h"
+#include "g2future.hpp"
 #include "crashhandler.hpp"
 
 #include <iostream> // remove
diff --git a/g2log/src/g2logworker.hpp b/g2log/src/g2logworker.hpp
index e3668fe..bc4340f 100644
--- a/g2log/src/g2logworker.hpp
+++ b/g2log/src/g2logworker.hpp
@@ -18,8 +18,8 @@
 #include <utility>
 
 #include "g2log.hpp"
-#include "g2sinkwrapper.h"
-#include "g2sinkhandle.h"
+#include "g2sinkwrapper.hpp"
+#include "g2sinkhandle.hpp"
 #include "g2filesink.hpp"
 #include "g2logmessage.hpp"
 #include "std2_make_unique.hpp"
diff --git a/g2log/src/g2sink.h b/g2log/src/g2sink.hpp
similarity index 97%
rename from g2log/src/g2sink.h
rename to g2log/src/g2sink.hpp
index f3a67fa..286fe26 100644
--- a/g2log/src/g2sink.h
+++ b/g2log/src/g2sink.hpp
@@ -11,9 +11,9 @@
 #include <memory>
 #include <functional>
 
-#include "g2sinkwrapper.h"
+#include "g2sinkwrapper.hpp"
 #include "active.hpp"
-#include "g2future.h"
+#include "g2future.hpp"
 #include "g2logmessage.hpp"
 
 namespace g2 {
diff --git a/g2log/src/g2sinkhandle.h b/g2log/src/g2sinkhandle.hpp
similarity index 96%
rename from g2log/src/g2sinkhandle.h
rename to g2log/src/g2sinkhandle.hpp
index ecdb62a..94d87fd 100644
--- a/g2log/src/g2sinkhandle.h
+++ b/g2log/src/g2sinkhandle.hpp
@@ -1,5 +1,5 @@
 /* 
- * File:   g2sinkhandle.h
+ * File:   g2sinkhandle.hpp
  * Author: kjell
  *
  * Created on July 21, 2013, 11:42 AM
@@ -10,7 +10,7 @@
 
 #include <memory>
 #include <functional>
-#include <g2sink.h>
+#include "g2sink.hpp"
 
 namespace g2 {
    
diff --git a/g2log/src/g2sinkwrapper.h b/g2log/src/g2sinkwrapper.hpp
similarity index 78%
rename from g2log/src/g2sinkwrapper.h
rename to g2log/src/g2sinkwrapper.hpp
index d7e2f95..2322bba 100644
--- a/g2log/src/g2sinkwrapper.h
+++ b/g2log/src/g2sinkwrapper.hpp
@@ -1,12 +1,12 @@
 /* 
- * File:   g2sinkwrapper.ipp
+ * File:   g2sinkwrapper.hpp
  * Author: kjell
  *
  * Created on July 21, 2013, 11:21 AM
  */
 
-#ifndef G2SINKWRAPPER_IPP
-#define	G2SINKWRAPPER_IPP
+#ifndef G2SINKWRAPPER_HPP
+#define	G2SINKWRAPPER_HPP
 
 #include "g2logmessage.hpp"
 
diff --git a/g2log/src/shared_queue.h b/g2log/src/shared_queue.hpp
similarity index 100%
rename from g2log/src/shared_queue.h
rename to g2log/src/shared_queue.hpp
diff --git a/g2log/test_unit/test_concept_sink.cpp b/g2log/test_unit/test_concept_sink.cpp
index 0f89a56..79a0668 100644
--- a/g2log/test_unit/test_concept_sink.cpp
+++ b/g2log/test_unit/test_concept_sink.cpp
@@ -9,9 +9,9 @@
 
 #include "testing_helpers.h"
 #include "std2_make_unique.hpp"
-#include "g2sink.h"
-#include "g2sinkwrapper.h"
-#include "g2sinkhandle.h"
+#include "g2sink.hpp"
+#include "g2sinkwrapper.hpp"
+#include "g2sinkhandle.hpp"
 #include "g2logmessage.hpp"
 
 
diff --git a/g2log/test_unit/test_configuration.cpp b/g2log/test_unit/test_configuration.cpp
index 3368c5a..28ff8a0 100644
--- a/g2log/test_unit/test_configuration.cpp
+++ b/g2log/test_unit/test_configuration.cpp
@@ -14,7 +14,7 @@
 #include <functional>
 #include <memory>
 #include "g2time.hpp"
-#include "g2future.h"
+#include "g2future.hpp"
 
 TEST(Configuration, LOG)
 { // ref: http://www.cplusplus.com/reference/clibrary/ctime/strftime/