diff --git a/Libraries/LibCore/CGzip.cpp b/Libraries/LibCore/CGzip.cpp index 894cbfd331..4b0f76c9b0 100644 --- a/Libraries/LibCore/CGzip.cpp +++ b/Libraries/LibCore/CGzip.cpp @@ -1,12 +1,11 @@ #include "CGzip.h" - #include #include +#include +#include #include #include -#include - bool CGzip::is_compressed(const ByteBuffer& data) { return data.size() > 2 && data[0] == 0x1F && data[1] == 0x8b; @@ -120,4 +119,4 @@ Optional CGzip::decompress(const ByteBuffer& data) } return destination; -} \ No newline at end of file +} diff --git a/Libraries/LibDraw/puff.c b/Libraries/LibCore/puff.c similarity index 100% rename from Libraries/LibDraw/puff.c rename to Libraries/LibCore/puff.c diff --git a/Libraries/LibDraw/puff.h b/Libraries/LibCore/puff.h similarity index 100% rename from Libraries/LibDraw/puff.h rename to Libraries/LibCore/puff.h diff --git a/Libraries/LibDraw/PNGLoader.cpp b/Libraries/LibDraw/PNGLoader.cpp index 0112292e20..3c157df745 100644 --- a/Libraries/LibDraw/PNGLoader.cpp +++ b/Libraries/LibDraw/PNGLoader.cpp @@ -1,8 +1,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/Servers/ProtocolServer/Makefile b/Servers/ProtocolServer/Makefile index 3e84b1f12f..ba66275513 100644 --- a/Servers/ProtocolServer/Makefile +++ b/Servers/ProtocolServer/Makefile @@ -23,7 +23,7 @@ ProtocolClientEndpoint.h: ProtocolClient.ipc @echo "IPC $<"; $(IPCCOMPILER) $< > $@ $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -lipc -ldraw + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -lipc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Servers/WindowServer/Makefile b/Servers/WindowServer/Makefile index da66886329..f731caa25b 100644 --- a/Servers/WindowServer/Makefile +++ b/Servers/WindowServer/Makefile @@ -26,7 +26,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -ldraw -lthread -lpthread -laudio -lipc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -ldraw -lcore -lthread -lpthread -laudio -lipc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<