diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 3646002140..f88343bb6c 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* dv-cfi.c: Replace devices.h include with hw-base.h and hw-main.h.
+
 2011-10-04  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4 (SIM_AC_COMMON): Call AM_ZLIB, ACX_PKGVERSION, and
diff --git a/sim/common/dv-cfi.c b/sim/common/dv-cfi.c
index 52dcf45657..42d868c8f2 100644
--- a/sim/common/dv-cfi.c
+++ b/sim/common/dv-cfi.c
@@ -33,7 +33,8 @@
 #endif
 
 #include "sim-main.h"
-#include "devices.h"
+#include "hw-base.h"
+#include "hw-main.h"
 #include "dv-cfi.h"
 
 /* Flashes are simple state machines, so here we cover all the