#include <libelfu/types.h>
-#include <libelfu/analysis.h>
-#include <libelfu/fixup.h>
-#include <libelfu/lookup.h>
-#include <libelfu/model.h>
+#include <libelfu/generic.h>
+#include <libelfu/elfops.h>
+#include <libelfu/modeltypes.h>
+#include <libelfu/modelops.h>
#endif