diff --git a/Changes b/Changes
index 5601bc085..61ccb005b 100644
--- a/Changes
+++ b/Changes
@@ -8,11 +8,13 @@ The contributors that suggested a given feature are shown in []. Thanks!
 
 ***   Support restrict, bug1350. [Clifford Wolf]
 
-***   Fix Mac OSX 10.13.6 / LLVM 9.1  compile issues, bug1348. [Kevin Kiningham]
+***   Rename include/lxt2 to include/gtkwave.
 
-***   Fix MinGW compile issues, msg2636. [HyungKi Jeong]
+****  Fix replication of 64-bit signal change detects.
 
-***   Fix replication of 64-bit signal change detects.
+****  Fix Mac OSX 10.13.6 / LLVM 9.1 compile issues, bug1348. [Kevin Kiningham]
+
+****  Fix MinGW compile issues, msg2636. [HyungKi Jeong]
 
 
 * Verilator 4.002 2018-09-16
diff --git a/Makefile.in b/Makefile.in
index 47440a97e..e8621f844 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,7 +129,7 @@ DISTFILES_INC = $(INFOS) .gitignore Artistic COPYING COPYING.LESSER \
 	include/*.[chv]* \
 	include/*.in \
 	include/.*ignore \
-	include/lxt2/*.[chv]* \
+	include/gtkwave/*.[chv]* \
 	include/vltstd/*.[chv]* \
 	.*attributes */.*attributes  */*/.*attributes \
 	src/.*ignore src/*.in src/*.cpp src/*.[chly] \
@@ -162,7 +162,7 @@ INST_PROJ_FILES = \
 	bin/verilator_profcfunc \
 	include/verilated.mk \
 	include/*.[chv]* \
-	include/lxt2/*.[chv]* \
+	include/gtkwave/*.[chv]* \
 	include/vltstd/*.[chv]* \
 
 INST_PROJ_BIN_FILES = \
@@ -291,7 +291,7 @@ VL_INST_INC_BLDDIR_FILES = \
 # Files under srcdir, instead of build time
 VL_INST_INC_SRCDIR_FILES = \
 	include/*.[chv]* \
-	include/lxt2/*.[chv]* \
+	include/gtkwave/*.[chv]* \
 	include/vltstd/*.[chv]* \
 
 VL_INST_DATA_SRCDIR_FILES = \
@@ -318,7 +318,7 @@ installman: $(VL_INST_MAN_FILES)
 	done
 
 installdata:
-	$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/include/lxt2
+	$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/include/gtkwave
 	$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/include/vltstd
 	for p in $(VL_INST_INC_BLDDIR_FILES) ; do \
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
@@ -348,7 +348,7 @@ uninstall:
 	-cd $(DESTDIR)$(pkgdatadir) && rm -f $(VL_INST_DATA_SRCDIR_FILES)
 	-rm $(DESTDIR)$(pkgconfigdir)/verilator.pc
 	-rmdir $(DESTDIR)$(pkgdatadir)/bin
-	-rmdir $(DESTDIR)$(pkgdatadir)/include/lxt2
+	-rmdir $(DESTDIR)$(pkgdatadir)/include/gtkwave
 	-rmdir $(DESTDIR)$(pkgdatadir)/include/vltstd
 	-rmdir $(DESTDIR)$(pkgdatadir)/include
 	-rmdir $(DESTDIR)$(pkgdatadir)/examples/hello_world_c
@@ -413,7 +413,7 @@ ifeq ($(CFG_WITH_DEFENV),yes)
 	false
 endif
 	@echo "Install-cadtools-quick (no strip) to $(VERILATOR_CAD_DIR)"
-	$(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/include/lxt2
+	$(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/include/gtkwave
 	$(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/include/vltstd
 	$(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/bin
 	for p in $(INST_PROJ_FILES) ; do \
@@ -431,7 +431,10 @@ CPPCHECK = src/cppcheck_filtered
 CPPCHECK_FLAGS = --enable=all --inline-suppr \
 	--suppress=unusedScopedObject --suppress=cstyleCast --suppress=useInitializationList
 CPPCHECK_FLAGS += --xml
-CPPCHECK_CPP = $(wildcard $(srcdir)/include/*.cpp $(srcdir)/src/*.cpp)
+CPPCHECK_CPP = $(wildcard \
+	$(srcdir)/include/*.cpp \
+	$(srcdir)/include/gtkwave/*.cpp \
+	$(srcdir)/src/*.cpp)
 CPPCHECK_DEP = $(subst .cpp,.cppcheck,$(CPPCHECK_CPP))
 CPPCHECK_INC = -I$(srcdir)/include -I$(srcdir)/src/obj_dbg -I$(srcdir)/src
 
diff --git a/include/lxt2/lxt2_config.h b/include/gtkwave/lxt2_config.h
similarity index 100%
rename from include/lxt2/lxt2_config.h
rename to include/gtkwave/lxt2_config.h
diff --git a/include/lxt2/lxt2_write.cpp b/include/gtkwave/lxt2_write.cpp
similarity index 100%
rename from include/lxt2/lxt2_write.cpp
rename to include/gtkwave/lxt2_write.cpp
diff --git a/include/lxt2/lxt2_write.h b/include/gtkwave/lxt2_write.h
similarity index 100%
rename from include/lxt2/lxt2_write.h
rename to include/gtkwave/lxt2_write.h
diff --git a/include/lxt2/wavealloca.h b/include/gtkwave/wavealloca.h
similarity index 100%
rename from include/lxt2/wavealloca.h
rename to include/gtkwave/wavealloca.h
diff --git a/include/verilated_lxt2_c.cpp b/include/verilated_lxt2_c.cpp
index 849dc0cec..f968d6dfb 100644
--- a/include/verilated_lxt2_c.cpp
+++ b/include/verilated_lxt2_c.cpp
@@ -24,7 +24,7 @@
 #include "verilated.h"
 #include "verilated_lxt2_c.h"
 // Include the GTKWave implementation directly
-#include "lxt2/lxt2_write.cpp"
+#include "gtkwave/lxt2_write.cpp"
 
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/include/verilated_lxt2_c.h b/include/verilated_lxt2_c.h
index abac61b3f..59498bcc6 100644
--- a/include/verilated_lxt2_c.h
+++ b/include/verilated_lxt2_c.h
@@ -25,7 +25,7 @@
 
 #include "verilatedos.h"
 #include "verilated.h"
-#include "lxt2/lxt2_write.h"
+#include "gtkwave/lxt2_write.h"
 
 #include <string>
 #include <vector>
diff --git a/test_regress/t/t_dist_cinclude.pl b/test_regress/t/t_dist_cinclude.pl
index 7b8f0ffd2..da8063a75 100755
--- a/test_regress/t/t_dist_cinclude.pl
+++ b/test_regress/t/t_dist_cinclude.pl
@@ -25,7 +25,7 @@ if (!-r "$root/.git") {
     my $grep = `$cmd`;
     foreach my $line (split /\n/, $grep) {
         next if $line =~ m!include/vltstd/vpi_user.h!;  # IEEE Standard file - can't change it
-        next if $line =~ m!include/lxt2/!;  # Standard file - can't change it
+        next if $line =~ m!include/gtkwave/!;  # Standard file - can't change it
 	my $hit;
 	$hit = 1 if $line =~ /\bassert\.h/;
 	$hit = 1 if $line =~ /\bctype\.h/;