diff --git a/src/Makefile.am b/src/Makefile.am
index ea3621b..8857a5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,4 +52,4 @@ endif
 EXTRA_DIST = \
 	calibrator.cpp \
 	calibrator.hh \
-	main_common.hpp
+	main_common.cpp
diff --git a/src/calibrator/calibratorEvdev.cpp b/src/calibrator/Evdev.cpp
similarity index 100%
rename from src/calibrator/calibratorEvdev.cpp
rename to src/calibrator/Evdev.cpp
diff --git a/src/calibrator/Makefile.am b/src/calibrator/Makefile.am
index 63f2924..ec773a6 100644
--- a/src/calibrator/Makefile.am
+++ b/src/calibrator/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
-	calibratorEvdev.cpp \
-	calibratorUsbtouchscreen.cpp \
-	calibratorXorgPrint.cpp
+	Evdev.cpp \
+	Usbtouchscreen.cpp \
+	XorgPrint.cpp
diff --git a/src/calibrator/calibratorUsbtouchscreen.cpp b/src/calibrator/Usbtouchscreen.cpp
similarity index 100%
rename from src/calibrator/calibratorUsbtouchscreen.cpp
rename to src/calibrator/Usbtouchscreen.cpp
diff --git a/src/calibrator/calibratorXorgPrint.cpp b/src/calibrator/XorgPrint.cpp
similarity index 100%
rename from src/calibrator/calibratorXorgPrint.cpp
rename to src/calibrator/XorgPrint.cpp
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 0e0870f..ddc3812 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST = \
-	gui_gtkmm.cpp \
-	gui_x11.cpp
+	gtkmm.cpp \
+	x11.cpp
diff --git a/src/gui/gui_gtkmm.cpp b/src/gui/gtkmm.cpp
similarity index 100%
rename from src/gui/gui_gtkmm.cpp
rename to src/gui/gtkmm.cpp
diff --git a/src/gui/gui_x11.cpp b/src/gui/x11.cpp
similarity index 100%
rename from src/gui/gui_x11.cpp
rename to src/gui/x11.cpp
diff --git a/src/main_common.hpp b/src/main_common.cpp
similarity index 99%
rename from src/main_common.hpp
rename to src/main_common.cpp
index 4ddd663..efacdcd 100644
--- a/src/main_common.hpp
+++ b/src/main_common.cpp
@@ -104,9 +104,9 @@ char* my_strdup(const char* s) {
 
 // all need struct XYinfo, and some the consts too
 #include "calibrator.cpp"
-#include "calibrator/calibratorXorgPrint.cpp"
-#include "calibrator/calibratorEvdev.cpp"
-#include "calibrator/calibratorUsbtouchscreen.cpp"
+#include "calibrator/XorgPrint.cpp"
+#include "calibrator/Evdev.cpp"
+#include "calibrator/Usbtouchscreen.cpp"
 
 
 /**
diff --git a/src/main_gtkmm.cpp b/src/main_gtkmm.cpp
index ec66494..5fc2dae 100644
--- a/src/main_gtkmm.cpp
+++ b/src/main_gtkmm.cpp
@@ -27,8 +27,8 @@
 #include <gtkmm/drawingarea.h>
 #include <cairomm/context.h>
 
-#include "main_common.hpp"
-#include "gui/gui_gtkmm.cpp"
+#include "main_common.cpp"
+#include "gui/gtkmm.cpp"
 
 int main(int argc, char** argv)
 {
diff --git a/src/main_x11.cpp b/src/main_x11.cpp
index 26c871d..24139e6 100644
--- a/src/main_x11.cpp
+++ b/src/main_x11.cpp
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "main_common.hpp"
-#include "gui/gui_x11.cpp"
+#include "main_common.cpp"
+#include "gui/x11.cpp"
 
 int main(int argc, char** argv)
 {