diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 966c72f119..35675f34ca 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -8,7 +8,6 @@ add_definitions(-DGERBVIEW)
 
 include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
-    ${CMAKE_SOURCE_DIR}/pcbnew
     dialogs
     ${CMAKE_SOURCE_DIR}/common
     ${CMAKE_SOURCE_DIR}/3d-viewer
@@ -49,6 +48,7 @@ set( GERBVIEW_SRCS
     gerbview_settings.cpp
     gerbview_frame.cpp
     job_file_reader.cpp
+    layer_widget.cpp
     menubar.cpp
     readgerb.cpp
     rs274_read_XY_and_IJ_coordinates.cpp
@@ -73,7 +73,6 @@ set( GERBVIEW_EXTRA_SRCS
     ${CMAKE_SOURCE_DIR}/common/eda_text.cpp
     ${CMAKE_SOURCE_DIR}/common/widgets/layer_box_selector.cpp
     ${CMAKE_SOURCE_DIR}/common/lset.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/layer_widget.cpp
     ${CMAKE_SOURCE_DIR}/common/page_info.cpp
 )
 
diff --git a/pcbnew/layer_widget.cpp b/gerbview/layer_widget.cpp
similarity index 100%
rename from pcbnew/layer_widget.cpp
rename to gerbview/layer_widget.cpp
diff --git a/pcbnew/layer_widget.h b/gerbview/layer_widget.h
similarity index 100%
rename from pcbnew/layer_widget.h
rename to gerbview/layer_widget.h
diff --git a/pcbnew/pcb_base_edit_frame.cpp b/pcbnew/pcb_base_edit_frame.cpp
index 079e3281da..aff000715a 100644
--- a/pcbnew/pcb_base_edit_frame.cpp
+++ b/pcbnew/pcb_base_edit_frame.cpp
@@ -37,7 +37,6 @@
 #include <dialogs/dialog_grid_settings.h>
 #include <widgets/appearance_controls.h>
 #include <dialogs/eda_view_switcher.h>
-#include <layer_widget.h>
 #include <class_dimension.h>
 #include <wildcards_and_files_ext.h>
 
diff --git a/pcbnew/pcb_edit_frame.h b/pcbnew/pcb_edit_frame.h
index c2a8a89385..01bd4efe26 100644
--- a/pcbnew/pcb_edit_frame.h
+++ b/pcbnew/pcb_edit_frame.h
@@ -437,7 +437,7 @@ public:
     /**
      * Function SetActiveLayer
      * will change the currently active layer to \a aLayer and also
-     * update the PCB_LAYER_WIDGET.
+     * update the APPEARANCE_CONTROLS.
      */
     void SetActiveLayer( PCB_LAYER_ID aLayer ) override;