diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index ef28d5e..546fb80 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -21,11 +21,11 @@
  *         Ilya Moiseenko <iliamo@ucla.edu>
  */
 
-#include "chronosharegui.h"
+#include "chronosharegui.hpp"
 #include "core/chronoshare-config.hpp"
 
-#include "logging.h"
-#include "ndnx-wrapper.h"
+#include "logging.hpp"
+#include "ccnx-wrapper.hpp"
 #include <QValidator>
 #include <QDir>
 #include <QFileInfo>
diff --git a/gui/chronosharegui.hpp b/gui/chronosharegui.hpp
index c56baa5..9a69d3d 100644
--- a/gui/chronosharegui.hpp
+++ b/gui/chronosharegui.hpp
@@ -23,11 +23,11 @@
 #ifndef CHRONOSHAREGUI_H
 #define CHRONOSHAREGUI_H
 
-#include "adhoc.h"
+#include "adhoc.hpp"
 
 #if __APPLE__ && HAVE_SPARKLE
 #define SPARKLE_SUPPORTED 1
-#include "sparkle-auto-update.h"
+#include "sparkle-auto-update.hpp"
 #endif
 
 #include <QtGui>
@@ -43,8 +43,8 @@
 #include <QMessageBox>
 #include <QApplication>
 
-#include "fs-watcher.h"
-#include "dispatcher.h"
+#include "fs-watcher.hpp"
+#include "dispatcher.hpp"
 #include "server.hpp"
 #include <boost/thread/thread.hpp>
 
diff --git a/gui/main.cpp b/gui/main.cpp
index 5939bab..b5f4f5f 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -18,8 +18,8 @@
  * Author: Jared Lindblom <lindblom@cs.ucla.edu>
  */
 
-#include "chronosharegui.h"
-#include "logging.h"
+#include "chronosharegui.hpp"
+#include "logging.hpp"
 #include <QApplication>
 
 int main(int argc, char *argv[])