diff --git a/src/Makefile.am b/src/Makefile.am
index df2f98f8a8..ed1d285cd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -218,10 +218,10 @@ output-file.c output-file.h \
 output-filedata.c output-filedata.h \
 output-json-alert.c output-json-alert.h \
 output-json-file.c output-json-file.h \
+output-json-http.c output-json-http.h \
 output-packet.c output-packet.h \
 output-tx.c output-tx.h \
 output-droplog.c output-droplog.h \
-output-httplog.c output-httplog.h \
 output-json.c output-json.h \
 output-tlslog.c output-tlslog.h \
 output-dnslog.c output-dnslog.h \
diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 05c98d315f..1ee191b1ff 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -48,11 +48,6 @@
 #include "util-syslog.h"
 
 #include "output.h"
-#include "output-dnslog.h"
-#include "output-droplog.h"
-#include "output-httplog.h"
-#include "output-tlslog.h"
-#include "output-json-file.h"
 #include "output-json.h"
 
 #include "util-byte.h"
diff --git a/src/output-httplog.c b/src/output-json-http.c
similarity index 99%
rename from src/output-httplog.c
rename to src/output-json-http.c
index 3a4705021a..747d03b8ff 100644
--- a/src/output-httplog.c
+++ b/src/output-json-http.c
@@ -39,7 +39,6 @@
 #include "util-debug.h"
 
 #include "output.h"
-#include "output-httplog.h"
 #include "app-layer-htp.h"
 #include "app-layer.h"
 #include "app-layer-parser.h"
diff --git a/src/output-httplog.h b/src/output-json-http.h
similarity index 89%
rename from src/output-httplog.h
rename to src/output-json-http.h
index c054dd20e0..4145edcfa3 100644
--- a/src/output-httplog.h
+++ b/src/output-json-http.h
@@ -21,10 +21,10 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_HTTPLOG_H__
-#define __OUTPUT_HTTPLOG_H__
+#ifndef __OUTPUT_JSON_HTTP_H__
+#define __OUTPUT_JSON_HTTP_H__
 
 void TmModuleJsonHttpLogRegister (void);
 
-#endif /* __OUTPUT_HTTPLOG_H__ */
+#endif /* __OUTPUT_JSON_HTTP_H__ */
 
diff --git a/src/output-json.c b/src/output-json.c
index a78cf987fb..fb3ae4d6d1 100644
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -48,11 +48,6 @@
 #include "util-syslog.h"
 
 #include "output.h"
-#include "output-dnslog.h"
-#include "output-droplog.h"
-#include "output-httplog.h"
-#include "output-tlslog.h"
-#include "output-json-file.h"
 #include "output-json.h"
 
 #include "util-byte.h"
diff --git a/src/suricata.c b/src/suricata.c
index 2b2c88a133..8f31ea7476 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -83,7 +83,7 @@
 #include "log-droplog.h"
 #include "output-droplog.h"
 #include "log-httplog.h"
-#include "output-httplog.h"
+#include "output-json-http.h"
 #include "log-dnslog.h"
 #include "output-dnslog.h"
 #include "log-tlslog.h"