diff --git a/nonlib/OSC/Endpoint.C b/nonlib/OSC/Endpoint.cpp
similarity index 99%
rename from nonlib/OSC/Endpoint.C
rename to nonlib/OSC/Endpoint.cpp
index cb8c822..55f780d 100644
--- a/nonlib/OSC/Endpoint.C
+++ b/nonlib/OSC/Endpoint.cpp
@@ -24,9 +24,9 @@
 #include <string.h>
 #include <assert.h>
 
-#include "Endpoint.H"
+#include "Endpoint.hpp"
 
-#include "Thread.H"
+#include "Thread.hpp"
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 
diff --git a/nonlib/OSC/Endpoint.H b/nonlib/OSC/Endpoint.hpp
similarity index 99%
rename from nonlib/OSC/Endpoint.H
rename to nonlib/OSC/Endpoint.hpp
index 4e56960..75acad0 100644
--- a/nonlib/OSC/Endpoint.H
+++ b/nonlib/OSC/Endpoint.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <lo/lo.h>
-#include "Thread.H"
+#include "Thread.hpp"
 #include <list>
 #include <string>
 #include <stdlib.h>
diff --git a/nonlib/Thread.C b/nonlib/Thread.cpp
similarity index 99%
rename from nonlib/Thread.C
rename to nonlib/Thread.cpp
index 6e5b953..8a7395b 100644
--- a/nonlib/Thread.C
+++ b/nonlib/Thread.cpp
@@ -17,7 +17,7 @@
 /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /*******************************************************************************/
 
-#include "Thread.H"
+#include "Thread.hpp"
 #include <assert.h>
 #include <string.h>
 
diff --git a/nonlib/Thread.H b/nonlib/Thread.hpp
similarity index 100%
rename from nonlib/Thread.H
rename to nonlib/Thread.hpp
diff --git a/nonlib/debug.C b/nonlib/debug.cpp
similarity index 100%
rename from nonlib/debug.C
rename to nonlib/debug.cpp
diff --git a/nonlib/file.C b/nonlib/file.cpp
similarity index 100%
rename from nonlib/file.C
rename to nonlib/file.cpp
diff --git a/nonlib/wscript b/nonlib/wscript
index f9aaaa9..8a355d7 100644
--- a/nonlib/wscript
+++ b/nonlib/wscript
@@ -11,10 +11,10 @@ def build(bld):
     #File is for nsmd lockfiles
     bld.stlib(
         source = '''
-OSC/Endpoint.C
-Thread.C
-debug.C
-file.C
+OSC/Endpoint.cpp
+Thread.cpp
+debug.cpp
+file.cpp
 ''',
         includes = '.',
         export_incdirs = [ '.', 'nonlib'],
diff --git a/session-manager/src/nsmd.cpp b/session-manager/src/nsmd.cpp
index 5cf5b01..ecc9378 100644
--- a/session-manager/src/nsmd.cpp
+++ b/session-manager/src/nsmd.cpp
@@ -46,7 +46,7 @@
 #include <getopt.h>
 #include <sys/time.h>
 
-#include <OSC/Endpoint.H>
+#include <OSC/Endpoint.hpp>
 /* for locking */
 #include "file.h"