#include <config.h>
#include "lisp.h"
-#include "mem/blocktype.h"
+#include <mem/blocktype.h>
#include "buffer.h"
#include "chartab.h"
#include "device.h"
#include "redisplay.h"
#include "specifier.h"
#include "window.h"
+#include <ent/ent-float.h>
#ifdef HAVE_XPM
#include <X11/xpm.h>