diff --git a/src/main.c b/src/main.c
index 8cbb169..74282fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "teleportapp.h"
+#include "teleport.h"
 
 int
 main (int argc, char *argv[])
diff --git a/src/meson.build b/src/meson.build
index a989f1f..f247ab8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,12 +1,12 @@
 
 headers = files(
-  'browser.h',
-  'get.h',
-  'publish.h',
-  'server.h',
-  'teleportappwin.h',
-  'teleportpeer.h',
-  'teleportapp.h'
+  'teleport-browser.h',
+  'teleport-get.h',
+  'teleport-publish.h',
+  'teleport-server.h',
+  'teleport-window.h',
+  'teleport-peer.h',
+  'teleport.h'
 )
 
 install_headers(headers, subdir: meson.project_name())
@@ -17,13 +17,13 @@ install_headers(headers, subdir: meson.project_name())
 ################
 
 sources = files(
-  'browser.c',
-  'get.c',
-  'publish.c',
-  'server.c',
-  'teleportapp.c',
-  'teleportappwin.c',
-  'teleportpeer.c',
+  'teleport-browser.c',
+  'teleport-get.c',
+  'teleport-publish.c',
+  'teleport-server.c',
+  'teleport.c',
+  'teleport-window.c',
+  'teleport-peer.c',
   'main.c'
 )
 
diff --git a/src/teleport-browser.c b/src/teleport-browser.c
index 01658e5..8ac3303 100644
--- a/src/teleport-browser.c
+++ b/src/teleport-browser.c
@@ -12,9 +12,10 @@
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
 #include <avahi-common/thread-watch.h>
-#include "teleportapp.h"
-#include "teleportpeer.h"
-#include "browser.h"
+
+#include "teleport.h"
+#include "teleport-peer.h"
+#include "teleport-browser.h"
 
 //static AvahiSimplePoll *simple_poll = NULL;
 static AvahiThreadedPoll *threaded_poll = NULL;
diff --git a/src/teleport-browser.h b/src/teleport-browser.h
index c344645..7e6031a 100644
--- a/src/teleport-browser.h
+++ b/src/teleport-browser.h
@@ -1,7 +1,7 @@
-#ifndef __BROWSER_H
-#define __BROWSER_H
+#ifndef __TELEPORT_BROWSER_H
+#define __TELEPORT_BROWSER_H
 
 extern int run_avahi_service(TeleportPeer *);
 void avahi_shutdown(void);
 
-#endif /* __BROWSER_H */
+#endif /* __TELEPORT_BROWSER_H */
diff --git a/src/teleport-get.c b/src/teleport-get.c
index 4795dcc..0b392ff 100644
--- a/src/teleport-get.c
+++ b/src/teleport-get.c
@@ -7,8 +7,8 @@
 #include <string.h>
 
 #include <libsoup/soup.h>
-#include "teleportapp.h"
-#include "get.h"
+#include "teleport.h"
+#include "teleport-get.h"
 
 static gboolean debug;
 
diff --git a/src/teleport-get.h b/src/teleport-get.h
index 9621cdd..684278d 100644
--- a/src/teleport-get.h
+++ b/src/teleport-get.h
@@ -1,5 +1,5 @@
-#ifndef __GET_H
-#define __GET_H
+#ifndef __TELEPORT_GET_H
+#define __TELEPORT_GET_H
 
 #include <libsoup/soup.h>
 
@@ -10,4 +10,4 @@ int saveFile (SoupMessage *, const gchar *, const gchar *);
 gchar * getFilePath (const gchar *, const gchar *);
 int get (char *, const gchar *, const gchar *, const gchar *);
 
-#endif /* __GET_H */
+#endif /* __TELEPORT_GET_H */
diff --git a/src/teleport-peer.c b/src/teleport-peer.c
index f20e6a4..ecdf2be 100644
--- a/src/teleport-peer.c
+++ b/src/teleport-peer.c
@@ -1,5 +1,5 @@
 #include <gtk/gtk.h>
-#include "teleportpeer.h"
+#include "teleport-peer.h"
 
 enum {
   ADD, REMOVE, N_SIGNALS
diff --git a/src/teleport-peer.h b/src/teleport-peer.h
index ca189e9..f4e0610 100644
--- a/src/teleport-peer.h
+++ b/src/teleport-peer.h
@@ -1,5 +1,5 @@
-#ifndef __TELEPORTPEER_H
-#define __TELEPORTPEER_H
+#ifndef __TELEPORT_PEER_H
+#define __TELEPORT_PEER_H
 
 #include <gtk/gtk.h>
 
@@ -20,4 +20,4 @@ void teleport_peer_add_peer (TeleportPeer *self, gchar * name, gchar * ip, gint
 void teleport_peer_remove_peer (TeleportPeer *, Peer *);
 void teleport_peer_remove_peer_by_name (TeleportPeer *, gchar *);
 
-#endif /* __TELEPORTPEER_H */
+#endif /* __TELEPORT_PEER_H */
diff --git a/src/teleport-publish.c b/src/teleport-publish.c
index 5d2abef..bfbf082 100644
--- a/src/teleport-publish.c
+++ b/src/teleport-publish.c
@@ -17,9 +17,9 @@
 #include <avahi-common/timeval.h>
 #include <avahi-common/thread-watch.h>
 
-#include "teleportapp.h"
-#include "teleportpeer.h"
-#include "publish.h"
+#include "teleport.h"
+#include "teleport-peer.h"
+#include "teleport-publish.h"
 
 static AvahiThreadedPoll *threaded_poll = NULL;
 static AvahiEntryGroup *group = NULL;
diff --git a/src/teleport-publish.h b/src/teleport-publish.h
index 238ff07..14cf5e1 100644
--- a/src/teleport-publish.h
+++ b/src/teleport-publish.h
@@ -1,9 +1,9 @@
-#ifndef __PUBLISH_H
-#define __PUBLISH_H
+#ifndef __TELEPORT_PUBLISH_H
+#define __TELEPORT_PUBLISH_H
 
 
 extern int run_avahi_publish_service(char *);
 extern void shutdown_avahi_publish_service(void);
 extern void update_service(char *);
 
-#endif /* __PUBLISH_H */
+#endif /* __TELEPORT_PUBLISH_H */
diff --git a/src/teleport-server.c b/src/teleport-server.c
index 7098287..d53aa99 100644
--- a/src/teleport-server.c
+++ b/src/teleport-server.c
@@ -1,8 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2001-2003, Ximian, Inc.
- */
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,9 +7,9 @@
 #include <libsoup/soup.h>
 #include <glib/gstdio.h>
 
-#include "get.h"
-#include "server.h"
-#include "teleportapp.h"
+#include "teleport-get.h"
+#include "teleport-server.h"
+#include "teleport.h"
 
 static int port;
 static SoupServer *glob_server;
diff --git a/src/teleport-server.h b/src/teleport-server.h
index db5807b..f86c60d 100644
--- a/src/teleport-server.h
+++ b/src/teleport-server.h
@@ -1,8 +1,8 @@
-#ifndef __SERVER_H
-#define __SERVER_H
+#ifndef __TELEPORT_SERVER_H
+#define __TELEPORT_SERVER_H
 
 
 extern int run_http_server(void);
 extern int addRouteToServer(char *, char *, char *);
 
-#endif /* __SERVER_H */
+#endif /* __TELEPORT_SERVER_H */
diff --git a/src/teleport-window.c b/src/teleport-window.c
index 40aac15..4fde455 100644
--- a/src/teleport-window.c
+++ b/src/teleport-window.c
@@ -1,9 +1,9 @@
 #include <gtk/gtk.h>
 
-#include "teleportapp.h"
-#include "teleportappwin.h"
-#include "server.h"
-#include "teleportpeer.h"
+#include "teleport.h"
+#include "teleport-window.h"
+#include "teleport-server.h"
+#include "teleport-peer.h"
 
 GtkWidget *find_child(GtkWidget *, const gchar *);
 TeleportAppWindow *mainWin;
diff --git a/src/teleport-window.h b/src/teleport-window.h
index 65ea79d..cb3dbb1 100644
--- a/src/teleport-window.h
+++ b/src/teleport-window.h
@@ -1,9 +1,9 @@
-#ifndef __TELEPORTAPPWIN_H
-#define __TELEPORTAPPWIN_H
+#ifndef __TELEPORT_WINDOW_H
+#define __TELEPORT_WINDOW_H
 
 #include <gtk/gtk.h>
-#include "teleportapp.h"
-#include "teleportpeer.h"
+#include "teleport.h"
+#include "teleport-peer.h"
 
 
 #define TELEPORT_APP_WINDOW_TYPE (teleport_app_window_get_type ())
@@ -16,4 +16,4 @@ G_DECLARE_FINAL_TYPE (TeleportAppWindow, teleport_app_window, TELEPORT, APP_WIND
   extern void update_remote_device_list_remove(TeleportAppWindow *, Peer *);
 
 
-#endif /* __TELEPORTAPPWIN_H */
+#endif /* __TELEPORT_WINDOW_H */
diff --git a/src/teleport.c b/src/teleport.c
index 99d4907..c175fc0 100644
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -1,12 +1,12 @@
 #include <gtk/gtk.h>
 
-#include "teleportapp.h"
-#include "teleportpeer.h"
-#include "teleportappwin.h"
-#include "browser.h"
-#include "publish.h"
-#include "server.h"
-#include "get.h"
+#include "teleport.h"
+#include "teleport-peer.h"
+#include "teleport-window.h"
+#include "teleport-browser.h"
+#include "teleport-publish.h"
+#include "teleport-server.h"
+#include "teleport-get.h"
 
 
 void save_file_callback (GSimpleAction *simple,
diff --git a/src/teleport.h b/src/teleport.h
index 3db6763..de10b79 100644
--- a/src/teleport.h
+++ b/src/teleport.h
@@ -1,8 +1,8 @@
-#ifndef __TELEPORTAPP_H
-#define __TELEPORTAPP_H
+#ifndef __TELEPORT_H
+#define __TELEPORT_H
 
 #include <gtk/gtk.h>
-#include "teleportpeer.h"
+#include "teleport-peer.h"
 
 #define TELEPORT_APP_TYPE (teleport_app_get_type ())
 G_DECLARE_FINAL_TYPE (TeleportApp, teleport_app, TELEPORT, APP, GtkApplication)
@@ -33,4 +33,4 @@ void            callback_notify_user         (GObject *,
                                               gpointer);
 
 
-#endif /* __TELEPORTAPP_H */
+#endif /* __TELEPORT_H */