diff --git a/Makefile.am b/Makefile.am
index 1e9d331..bf12174 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,13 @@
 # export these headers
-include_HEADERS = log.hpp elog.hpp elog-errors-HostEvent.hpp
+include_HEADERS = \
+	phosphor-logging/log.hpp \
+	phosphor-logging/elog.hpp \
+	phosphor-logging/elog-errors-HostEvent.hpp
+
+nobase_include_HEADERS = \
+	phosphor-logging/log.hpp \
+	phosphor-logging/elog.hpp \
+	phosphor-logging/elog-errors-HostEvent.hpp
 
 # Generate this header, don't export in a distro
 nodist_include_HEADERS = elog-gen.hpp
diff --git a/elog.cpp b/elog.cpp
index 81d29ad..67196e7 100644
--- a/elog.cpp
+++ b/elog.cpp
@@ -1,4 +1,4 @@
-#include "elog.hpp"
+#include <phosphor-logging/elog.hpp>
 
 namespace phosphor
 {
diff --git a/log_manager.cpp b/log_manager.cpp
index e84f27e..d779480 100644
--- a/log_manager.cpp
+++ b/log_manager.cpp
@@ -8,10 +8,10 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-journal.h>
 #include "elog-lookup.cpp"
-#include "elog-errors-HostEvent.hpp"
+#include <phosphor-logging/elog-errors-HostEvent.hpp>
 #include "config.h"
 #include "elog_entry.hpp"
-#include "log.hpp"
+#include <phosphor-logging/log.hpp>
 #include "log_manager.hpp"
 
 namespace phosphor
diff --git a/logging_test.cpp b/logging_test.cpp
index 1920f36..63b59b7 100644
--- a/logging_test.cpp
+++ b/logging_test.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <systemd/sd-journal.h>
 #include <sstream>
-#include "elog.hpp"
-#include "log.hpp"
+#include <phosphor-logging/elog.hpp>
+#include <phosphor-logging/log.hpp>
 #include "elog-gen.hpp"
 
 using namespace phosphor;
diff --git a/elog-errors-HostEvent.hpp b/phosphor-logging/elog-errors-HostEvent.hpp
similarity index 96%
rename from elog-errors-HostEvent.hpp
rename to phosphor-logging/elog-errors-HostEvent.hpp
index 322c9ff..0efb328 100644
--- a/elog-errors-HostEvent.hpp
+++ b/phosphor-logging/elog-errors-HostEvent.hpp
@@ -7,7 +7,7 @@
 #include <tuple>
 #include <type_traits>
 #include <vector>
-#include "log.hpp"
+#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {
diff --git a/elog.hpp b/phosphor-logging/elog.hpp
similarity index 98%
rename from elog.hpp
rename to phosphor-logging/elog.hpp
index e919b3d..8a35ba5 100644
--- a/elog.hpp
+++ b/phosphor-logging/elog.hpp
@@ -2,7 +2,7 @@
 
 #include <tuple>
 #include <utility>
-#include "log.hpp"
+#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {
diff --git a/log.hpp b/phosphor-logging/log.hpp
similarity index 100%
rename from log.hpp
rename to phosphor-logging/log.hpp
diff --git a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp
index b0dec60..f0b0818 100644
--- a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp
+++ b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <tuple>
 #include <type_traits>
-#include "log.hpp"
+#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {
diff --git a/tools/phosphor-logging/templates/elog-lookup-template.mako.cpp b/tools/phosphor-logging/templates/elog-lookup-template.mako.cpp
index 8e022ce..822d91d 100644
--- a/tools/phosphor-logging/templates/elog-lookup-template.mako.cpp
+++ b/tools/phosphor-logging/templates/elog-lookup-template.mako.cpp
@@ -4,7 +4,7 @@
 // See elog-gen.py for more details
 #include <map>
 #include <vector>
-#include "log.hpp"
+#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {