Change-Id: Iaeb900134bfd5cdba2584c256ba04e0208f9ee84
#ifndef HWINFO_H
#define HWINFO_H
-#include "types/simple.h"
-#include "types/nbnxn_cuda_types_ext.h"
-#include "gmx_cpuid.h"
+#include "simple.h"
+#include "nbnxn_cuda_types_ext.h"
+#include "../gmx_cpuid.h"
#ifdef __cplusplus
extern "C" {
#ifndef _ifunc_h
#define _ifunc_h
-#include "types/idef.h"
-#include "types/mdatom.h"
-#include "types/fcdata.h"
-#include "types/graph.h"
-#include "types/pbc.h"
+#include "idef.h"
+#include "mdatom.h"
+#include "fcdata.h"
+#include "graph.h"
+#include "pbc.h"
#ifdef __cplusplus
extern "C" {